From d55b54d5c0e6f469145f394d18e39156baa2ca79 Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 17 Jul 2014 13:12:03 +0200
Subject: asyncio, tulip issue 190: Process.communicate() now ignores
 ConnectionResetError too

---
 Doc/library/asyncio-subprocess.rst |  9 +++++----
 Lib/asyncio/subprocess.py          | 12 +++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Doc/library/asyncio-subprocess.rst b/Doc/library/asyncio-subprocess.rst
index f0ffbf0..b653261 100644
--- a/Doc/library/asyncio-subprocess.rst
+++ b/Doc/library/asyncio-subprocess.rst
@@ -191,9 +191,9 @@ Process
       process, or ``None``, if no data should be sent to the child.  The type
       of *input* must be bytes.
 
-      If a :exc:`BrokenPipeError` is raised when writing *input* into stdin,
-      the exception is ignored. It occurs when the process exits before all
-      data are written into stdin.
+      If a :exc:`BrokenPipeError` or :exc:`ConnectionResetError` exception is
+      raised when writing *input* into stdin, the exception is ignored. It
+      occurs when the process exits before all data are written into stdin.
 
       :meth:`communicate` returns a tuple ``(stdoutdata, stderrdata)``.
 
@@ -210,7 +210,8 @@ Process
       This method is a :ref:`coroutine <coroutine>`.
 
       .. versionchanged:: 3.4.2
-         The method now ignores :exc:`BrokenPipeError`.
+         The method now ignores :exc:`BrokenPipeError` and
+         :exc:`ConnectionResetError`.
 
    .. method:: kill()
 
diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py
index 23d6b4d..e4c1499 100644
--- a/Lib/asyncio/subprocess.py
+++ b/Lib/asyncio/subprocess.py
@@ -139,17 +139,19 @@ class Process:
 
     @coroutine
     def _feed_stdin(self, input):
+        debug = self._loop.get_debug()
         self.stdin.write(input)
-        if self._loop.get_debug():
+        if debug:
             logger.debug('%r communicate: feed stdin (%s bytes)',
                         self, len(input))
         try:
             yield from self.stdin.drain()
-        except BrokenPipeError:
-            # ignore BrokenPipeError
-            pass
+        except (BrokenPipeError, ConnectionResetError) as exc:
+            # communicate() ignores BrokenPipeError and ConnectionResetError
+            if debug:
+                logger.debug('%r communicate: stdin got %r', self, exc)
 
-        if self._loop.get_debug():
+        if debug:
             logger.debug('%r communicate: close stdin', self)
         self.stdin.close()
 
-- 
cgit v0.12

bianAction2(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$
 **
 ***********