From 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Wed, 7 Apr 2010 17:18:04 +0200 Subject: Fix EGLImage & re-enable its use in QtOpenGL Make sure we set the EGL_KHR_image_base define when we define the reset of the extension defines. This also makes eglCreateImageKHR get defined when previously it wasn't. Reviewed-By: TrustMe (cherry picked from commit 99c17c0efb1331f5d11260b08614c9dff9bbf2e1) --- src/gui/egl/qegl_p.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index 540cd3d..f81add6 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -139,6 +139,12 @@ QT_BEGIN_NAMESPACE typedef void *EGLImageKHR; #define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) #define EGL_IMAGE_PRESERVED_KHR 0x30D2 +#define EGL_KHR_image_base +#endif + +#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_pixmap) +#define EGL_NATIVE_PIXMAP_KHR 0x30B0 +#define EGL_KHR_image_pixmap #endif // It is possible that something has included eglext.h (like Symbian 10.1's broken egl.h), in @@ -154,9 +160,6 @@ extern Q_GUI_EXPORT _eglCreateImageKHR eglCreateImageKHR; extern Q_GUI_EXPORT _eglDestroyImageKHR eglDestroyImageKHR; #endif // (defined(EGL_KHR_image) || defined(EGL_KHR_image_base)) && !defined(EGL_EGLEXT_PROTOTYPES) -#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_pixmap) -#define EGL_NATIVE_PIXMAP_KHR 0x30B0 -#endif class QEglProperties; -- cgit v0.12 From 1c9cde4d2b9cc588890be7445ab4248cbd8f58aa Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 14 Apr 2010 09:30:03 +1000 Subject: Ensure view position is correct for highlight range modes that have a static highlight Task-number: QTBUG-9791 (cherry picked from commit 9416f29a3ee7511c182eaa68f5523132ff64921d) --- .../graphicsitems/qdeclarativegridview.cpp | 4 +-- .../graphicsitems/qdeclarativelistview.cpp | 4 +-- .../data/strictlyenforcerange.qml | 29 ++++++++++++++++ .../tst_qdeclarativelistview.cpp | 39 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 9be025a..5cd6de4 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -613,8 +613,6 @@ void QDeclarativeGridViewPrivate::updateTrackedItem() if (highlight) item = highlight; - FxGridItem *oldTracked = trackedItem; - if (trackedItem && item != trackedItem) { QObject::disconnect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged())); QObject::disconnect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged())); @@ -626,7 +624,7 @@ void QDeclarativeGridViewPrivate::updateTrackedItem() QObject::connect(trackedItem->item, SIGNAL(yChanged()), q, SLOT(trackedPositionChanged())); QObject::connect(trackedItem->item, SIGNAL(xChanged()), q, SLOT(trackedPositionChanged())); } - if (trackedItem && trackedItem != oldTracked) + if (trackedItem) q->trackedPositionChanged(); } diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index b4506ef..622da5b 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -770,8 +770,6 @@ void QDeclarativeListViewPrivate::updateTrackedItem() if (highlight) item = highlight; - FxListItem *oldTracked = trackedItem; - const char *notifier1 = orient == QDeclarativeListView::Vertical ? SIGNAL(yChanged()) : SIGNAL(xChanged()); const char *notifier2 = orient == QDeclarativeListView::Vertical ? SIGNAL(heightChanged()) : SIGNAL(widthChanged()); @@ -786,7 +784,7 @@ void QDeclarativeListViewPrivate::updateTrackedItem() QObject::connect(trackedItem->item, notifier1, q, SLOT(trackedPositionChanged())); QObject::connect(trackedItem->item, notifier2, q, SLOT(trackedPositionChanged())); } - if (trackedItem && trackedItem != oldTracked) + if (trackedItem) q->trackedPositionChanged(); } diff --git a/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml b/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml new file mode 100644 index 0000000..6fc41fa --- /dev/null +++ b/tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml @@ -0,0 +1,29 @@ +import Qt 4.7 + +ListView { + id: list + objectName: "list" + width: 320 + height: 480 + + function fillModel() { + list.model.append({"col": "red"}); + list.currentIndex = list.count-1 + list.model.append({"col": "blue"}); + list.currentIndex = list.count-1 + list.model.append({"col": "green"}); + list.currentIndex = list.count-1 + } + + model: ListModel { id: listModel } // empty model + delegate: Rectangle { id: wrapper; objectName: "wrapper"; color: col; width: 300; height: 400 } + orientation: "Horizontal" + snapMode: "SnapToItem" + cacheBuffer: 1000 + + preferredHighlightBegin: 10 + preferredHighlightEnd: 10 + + highlightRangeMode: "StrictlyEnforceRange" + focus: true +} diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp index 8d94804..5b81d75 100644 --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -88,6 +88,7 @@ private slots: void propertyChanges(); void componentChanges(); void modelChanges(); + void QTBUG_9791(); private: template void items(); @@ -1472,6 +1473,44 @@ void tst_QDeclarativeListView::modelChanges() delete canvas; } +void tst_QDeclarativeListView::QTBUG_9791() +{ + QDeclarativeView *canvas = createView(); + + QDeclarativeContext *ctxt = canvas->rootContext(); + + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/strictlyenforcerange.qml")); + qApp->processEvents(); + + QDeclarativeListView *listview = qobject_cast(canvas->rootObject()); + QTRY_VERIFY(listview != 0); + + QDeclarativeItem *viewport = listview->viewport(); + QTRY_VERIFY(viewport != 0); + QTRY_VERIFY(listview->delegate() != 0); + QTRY_VERIFY(listview->model() != 0); + + QMetaObject::invokeMethod(listview, "fillModel"); + qApp->processEvents(); + + // Confirm items positioned correctly + int itemCount = findItems(viewport, "wrapper").count(); + QVERIFY(itemCount == 3); + + for (int i = 0; i < itemCount; ++i) { + QDeclarativeItem *item = findItem(viewport, "wrapper", i); + if (!item) qWarning() << "Item" << i << "not found"; + QTRY_VERIFY(item); + QTRY_COMPARE(item->x(), i*300.0); + } + + // check that view is positioned correctly + QTRY_COMPARE(listview->contentX(), 590.0); + + delete canvas; +} + + void tst_QDeclarativeListView::qListModelInterface_items() { items(); -- cgit v0.12 From 7d9621652528fe292b2b3599ba389be61d916db4 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 14 Apr 2010 11:06:49 +1000 Subject: Complete item creation after its initial properties have been initialized. Task-number: QTBUG-9800 (cherry picked from commit 955daf47a350ad9eb84b30f50431482b16ecf22f) --- src/declarative/graphicsitems/qdeclarativepathview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 06e3540..4aaa28d 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1102,7 +1102,6 @@ void QDeclarativePathView::refill() // qDebug() << "append" << idx; QDeclarativeItem *item = d->getItem(idx); item->setZValue(idx+1); - d->model->completeItem(); if (d->currentIndex == idx) { item->setFocus(true); if (QDeclarativePathViewAttached *att = d->attached(item)) @@ -1115,6 +1114,7 @@ void QDeclarativePathView::refill() d->firstIndex = idx; d->items.append(item); d->updateItem(item, pos); + d->model->completeItem(); ++idx; if (idx >= d->model->count()) idx = 0; @@ -1129,7 +1129,6 @@ void QDeclarativePathView::refill() // qDebug() << "prepend" << idx; QDeclarativeItem *item = d->getItem(idx); item->setZValue(idx+1); - d->model->completeItem(); if (d->currentIndex == idx) { item->setFocus(true); if (QDeclarativePathViewAttached *att = d->attached(item)) @@ -1140,6 +1139,7 @@ void QDeclarativePathView::refill() } d->items.prepend(item); d->updateItem(item, pos); + d->model->completeItem(); d->firstIndex = idx; idx = d->firstIndex - 1; if (idx < 0) -- cgit v0.12 From 0ff9f2480e7337f5a9685f602c786614973ab7e9 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 14 Apr 2010 11:29:35 +1000 Subject: emit onMovementStarted/Ended/Changed on wheel events Task-number: QTBUG-9804 (cherry picked from commit d44b7f2faa8cdc3832eac40bc45102acc3e3146a) --- src/declarative/graphicsitems/qdeclarativeflickable.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index fc7a87b..951b171 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -816,6 +816,8 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event) d->vData.velocity = qMin(event->delta() - d->vData.smoothVelocity.value(), qreal(-250.0)); d->flicked = false; d->flickY(d->vData.velocity); + if (d->flicked) + movementStarting(); event->accept(); } else if (xflick()) { if (event->delta() > 0) @@ -824,6 +826,8 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event) d->hData.velocity = qMin(event->delta() - d->hData.smoothVelocity.value(), qreal(-250.0)); d->flicked = false; d->flickX(d->hData.velocity); + if (d->flicked) + movementStarting(); event->accept(); } else { QDeclarativeItem::wheelEvent(event); -- cgit v0.12 From b3d9d6e81cfafcc01a23ec0c524f91ba6db4536b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Wed, 14 Apr 2010 10:16:41 +1000 Subject: Don't crash when columns == 0 Task-number: QTBUG-9805 (cherry picked from commit 3469fe05e4b04567598202fecc16c1decfb3ab63) --- .../graphicsitems/qdeclarativepositioners.cpp | 9 ++--- .../data/gridzerocolumns.qml | 40 ++++++++++++++++++++++ .../tst_qdeclarativepositioners.cpp | 33 ++++++++++++++++++ 3 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index d33a8be..f436471 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -700,14 +700,15 @@ void QDeclarativeGrid::setRows(const int rows) void QDeclarativeGrid::doPositioning(QSizeF *contentSize) { - int c=_columns,r=_rows;//Actual number of rows/columns + int c = _columns; + int r = _rows; int numVisible = positionedItems.count(); - if (_columns==-1 && _rows==-1){ + if (_columns <= 0 && _rows <= 0){ c = 4; r = (numVisible+3)/4; - }else if (_rows==-1){ + } else if (_rows <= 0){ r = (numVisible+(_columns-1))/_columns; - }else if (_columns==-1){ + } else if (_columns <= 0){ c = (numVisible+(_rows-1))/_rows; } diff --git a/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml b/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml new file mode 100644 index 0000000..052d96b --- /dev/null +++ b/tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml @@ -0,0 +1,40 @@ +import Qt 4.6 + +Item { + width: 640 + height: 480 + Grid { + objectName: "grid" + columns: 0 + Rectangle { + objectName: "one" + color: "red" + width: 50 + height: 50 + } + Rectangle { + objectName: "two" + color: "green" + width: 20 + height: 50 + } + Rectangle { + objectName: "three" + color: "blue" + width: 50 + height: 20 + } + Rectangle { + objectName: "four" + color: "cyan" + width: 50 + height: 50 + } + Rectangle { + objectName: "five" + color: "magenta" + width: 10 + height: 10 + } + } +} diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp index 08eac0a..8692596 100644 --- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp +++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp @@ -63,6 +63,7 @@ private slots: void test_grid(); void test_grid_spacing(); void test_grid_animated(); + void test_grid_zero_columns(); void test_propertychanges(); void test_repeater(); void test_flow(); @@ -414,6 +415,38 @@ void tst_QDeclarativePositioners::test_grid_animated() QTRY_COMPARE(five->y(), 50.0); } + +void tst_QDeclarativePositioners::test_grid_zero_columns() +{ + QDeclarativeView *canvas = createView(SRCDIR "/data/gridzerocolumns.qml"); + + QDeclarativeRectangle *one = canvas->rootObject()->findChild("one"); + QVERIFY(one != 0); + QDeclarativeRectangle *two = canvas->rootObject()->findChild("two"); + QVERIFY(two != 0); + QDeclarativeRectangle *three = canvas->rootObject()->findChild("three"); + QVERIFY(three != 0); + QDeclarativeRectangle *four = canvas->rootObject()->findChild("four"); + QVERIFY(four != 0); + QDeclarativeRectangle *five = canvas->rootObject()->findChild("five"); + QVERIFY(five != 0); + + QCOMPARE(one->x(), 0.0); + QCOMPARE(one->y(), 0.0); + QCOMPARE(two->x(), 50.0); + QCOMPARE(two->y(), 0.0); + QCOMPARE(three->x(), 70.0); + QCOMPARE(three->y(), 0.0); + QCOMPARE(four->x(), 120.0); + QCOMPARE(four->y(), 0.0); + QCOMPARE(five->x(), 0.0); + QCOMPARE(five->y(), 50.0); + + QDeclarativeItem *grid = canvas->rootObject()->findChild("grid"); + QCOMPARE(grid->width(), 170.0); + QCOMPARE(grid->height(), 60.0); +} + void tst_QDeclarativePositioners::test_propertychanges() { QDeclarativeView *canvas = createView(SRCDIR "/data/propertychangestest.qml"); -- cgit v0.12 From 8a4474d66550bddf71b5a447435d37999772079f Mon Sep 17 00:00:00 2001 From: Leonardo Sobral Cunha Date: Tue, 13 Apr 2010 17:01:54 +1000 Subject: Add 'runtime' property to the rootContext of DeclarativeViewer The 'runtime' property is a singleton object that contains various info about the execution environment for the qml application. Currently it contains just one property 'isActiveWindow', which tells if the window of the declarative viewer is active or not. Task-number: QTBUG-8902 Reviewed-by: Martin Jones (cherry picked from commit ffd45093795e9481505af0ae9bf5df7b6c704c72) --- tools/qml/qmlruntime.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++ tools/qml/qmlruntime.h | 1 + 2 files changed, 45 insertions(+) diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index c4ebd80..40de100 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -134,6 +134,38 @@ signals: void orientationChanged(); }; +class Runtime : public QObject +{ + Q_OBJECT + Q_PROPERTY(bool isActiveWindow READ isActiveWindow NOTIFY isActiveWindowChanged) + +public: + static Runtime* instance() + { + static Runtime *instance = 0; + if (!instance) + instance = new Runtime; + return instance; + } + + bool isActiveWindow() const { return activeWindow; } + void setActiveWindow(bool active) + { + if (active == activeWindow) + return; + activeWindow = active; + emit isActiveWindowChanged(); + } + +signals: + void isActiveWindowChanged(); + +private: + Runtime(QObject *parent=0) : QObject(parent), activeWindow(false) {} + + bool activeWindow; +}; + QT_END_NAMESPACE QML_DECLARE_TYPE(Screen) @@ -1048,6 +1080,8 @@ void QDeclarativeViewer::openQml(const QString& file_or_url) ctxt->setContextProperty("qmlViewerFolder", QDir::currentPath()); #endif + ctxt->setContextProperty("runtime", Runtime::instance()); + QString fileName = url.toLocalFile(); if (!fileName.isEmpty()) { QFileInfo fi(fileName); @@ -1249,6 +1283,16 @@ void QDeclarativeViewer::keyPressEvent(QKeyEvent *event) QWidget::keyPressEvent(event); } +bool QDeclarativeViewer::event(QEvent *event) +{ + if (event->type() == QEvent::WindowActivate) { + Runtime::instance()->setActiveWindow(true); + } else if (event->type() == QEvent::WindowDeactivate) { + Runtime::instance()->setActiveWindow(false); + } + return QWidget::event(event); +} + void QDeclarativeViewer::senseImageMagick() { QProcess proc; diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 6f1e425..74a0f07 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -125,6 +125,7 @@ public slots: protected: virtual void keyPressEvent(QKeyEvent *); + virtual bool event(QEvent *); void createMenu(QMenuBar *menu, QMenu *flatmenu); -- cgit v0.12 From b85d0a69c909e65f97908d64a4a8caef55e6391a Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Wed, 14 Apr 2010 12:15:26 +1000 Subject: Reduce QML runtime capabilities to NetworkServices and ReadUserData Task-number: Reviewed-by: Martin Jones (cherry picked from commit 5a1a3ab59e96bb5b2968883160564eb24d011859) --- demos/declarative/minehunt/minehunt.pro | 2 +- tools/qml/qml.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 8a5667d..095fa42 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -26,7 +26,7 @@ symbian:{ load(data_caging_paths) TARGET.EPOCALLOWDLLDATA = 1 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - + TARGET.CAPABILITY = NetworkServices ReadUserData importFiles.sources = minehunt.dll \ MinehuntCore/Explosion.qml \ MinehuntCore/pics \ diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index bc6d032..1ed8b2c 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -56,7 +56,7 @@ symbian { INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 LIBS += -lesock -lcommdb -lconnmon -linsock - TARGET.CAPABILITY = "All -TCB" + TARGET.CAPABILITY = NetworkServices ReadUserData } mac { QMAKE_INFO_PLIST=Info_mac.plist -- cgit v0.12 From d005553b64db9a22d143ce1f43f30b58b1e81bc5 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Wed, 14 Apr 2010 21:45:36 +0200 Subject: Update to def files for 4.7.0-beta1 Frozen against qt-releases/4.7.0-beta1 commit 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa Task-number: QTBUG-9892 Reviewed-by: Trust Me (cherry picked from commit e40fea6a052f172d3eb3c0901ee502d1747c3817) --- src/s60installs/bwins/QtCoreu.def | 7 +- src/s60installs/bwins/QtDeclarativeu.def | 129 ++++++++++++++++++++++------- src/s60installs/bwins/QtGuiu.def | 5 +- src/s60installs/bwins/QtMultimediau.def | 2 + src/s60installs/eabi/QtCoreu.def | 13 +-- src/s60installs/eabi/QtDeclarativeu.def | 135 ++++++++++++++++++++++++------- src/s60installs/eabi/QtGuiu.def | 5 +- src/s60installs/eabi/QtMultimediau.def | 3 + 8 files changed, 234 insertions(+), 65 deletions(-) diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index cf7fe6f..c2692f6 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -382,7 +382,7 @@ EXPORTS ??1QDateTime@@QAE@XZ @ 381 NONAME ; QDateTime::~QDateTime(void) ??1QDateTimeParser@@UAE@XZ @ 382 NONAME ; QDateTimeParser::~QDateTimeParser(void) ??1QDebug@@QAE@XZ @ 383 NONAME ; QDebug::~QDebug(void) - ??1QDeclarativeData@@UAE@XZ @ 384 NONAME ; QDeclarativeData::~QDeclarativeData(void) + ??1QDeclarativeData@@UAE@XZ @ 384 NONAME ABSENT ; QDeclarativeData::~QDeclarativeData(void) ??1QDir@@QAE@XZ @ 385 NONAME ; QDir::~QDir(void) ??1QDirIterator@@UAE@XZ @ 386 NONAME ; QDirIterator::~QDirIterator(void) ??1QDynamicPropertyChangeEvent@@UAE@XZ @ 387 NONAME ; QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent(void) @@ -885,7 +885,7 @@ EXPORTS ??_EQCoreApplicationPrivate@@UAE@I@Z @ 884 NONAME ; QCoreApplicationPrivate::~QCoreApplicationPrivate(unsigned int) ??_EQDataStream@@UAE@I@Z @ 885 NONAME ; QDataStream::~QDataStream(unsigned int) ??_EQDateTimeParser@@UAE@I@Z @ 886 NONAME ; QDateTimeParser::~QDateTimeParser(unsigned int) - ??_EQDeclarativeData@@UAE@I@Z @ 887 NONAME ; QDeclarativeData::~QDeclarativeData(unsigned int) + ??_EQDeclarativeData@@UAE@I@Z @ 887 NONAME ABSENT ; QDeclarativeData::~QDeclarativeData(unsigned int) ??_EQDirIterator@@UAE@I@Z @ 888 NONAME ; QDirIterator::~QDirIterator(unsigned int) ??_EQDynamicPropertyChangeEvent@@UAE@I@Z @ 889 NONAME ; QDynamicPropertyChangeEvent::~QDynamicPropertyChangeEvent(unsigned int) ??_EQEvent@@UAE@I@Z @ 890 NONAME ; QEvent::~QEvent(unsigned int) @@ -4457,4 +4457,7 @@ EXPORTS ?toEasingCurve@QVariant@@QBE?AVQEasingCurve@@XZ @ 4456 NONAME ; class QEasingCurve QVariant::toEasingCurve(void) const ?toMSecsSinceEpoch@QDateTime@@QBE_JXZ @ 4457 NONAME ; long long QDateTime::toMSecsSinceEpoch(void) const ?transitions@QState@@QBE?AV?$QList@PAVQAbstractTransition@@@@XZ @ 4458 NONAME ; class QList QState::transitions(void) const + ?validCodecs@QTextCodec@@CA_NXZ @ 4459 NONAME ; bool QTextCodec::validCodecs(void) + ?destroyed@QDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4460 NONAME ; void (*QDeclarativeData::destroyed)(class QDeclarativeData *, class QObject *) + ?parentChanged@QDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4461 NONAME ; void (*QDeclarativeData::parentChanged)(class QDeclarativeData *, class QObject *, class QObject *) diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index 89049a9..3eba5e7 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -98,7 +98,7 @@ EXPORTS ??0QDeclarativeFontLoader@@QAE@PAVQObject@@@Z @ 97 NONAME ; QDeclarativeFontLoader::QDeclarativeFontLoader(class QObject *) ??0QDeclarativeGradient@@QAE@PAVQObject@@@Z @ 98 NONAME ; QDeclarativeGradient::QDeclarativeGradient(class QObject *) ??0QDeclarativeGradientStop@@QAE@PAVQObject@@@Z @ 99 NONAME ; QDeclarativeGradientStop::QDeclarativeGradientStop(class QObject *) - ??0QDeclarativeGraphicsObjectContainer@@QAE@PAVQDeclarativeItem@@@Z @ 100 NONAME ; QDeclarativeGraphicsObjectContainer::QDeclarativeGraphicsObjectContainer(class QDeclarativeItem *) + ??0QDeclarativeGraphicsObjectContainer@@QAE@PAVQDeclarativeItem@@@Z @ 100 NONAME ABSENT ; QDeclarativeGraphicsObjectContainer::QDeclarativeGraphicsObjectContainer(class QDeclarativeItem *) ??0QDeclarativeGrid@@QAE@PAVQDeclarativeItem@@@Z @ 101 NONAME ; QDeclarativeGrid::QDeclarativeGrid(class QDeclarativeItem *) ??0QDeclarativeGridScaledImage@@QAE@ABV0@@Z @ 102 NONAME ; QDeclarativeGridScaledImage::QDeclarativeGridScaledImage(class QDeclarativeGridScaledImage const &) ??0QDeclarativeGridScaledImage@@QAE@PAVQIODevice@@@Z @ 103 NONAME ; QDeclarativeGridScaledImage::QDeclarativeGridScaledImage(class QIODevice *) @@ -268,7 +268,7 @@ EXPORTS ??1QDeclarativeFontLoader@@UAE@XZ @ 267 NONAME ; QDeclarativeFontLoader::~QDeclarativeFontLoader(void) ??1QDeclarativeGradient@@UAE@XZ @ 268 NONAME ; QDeclarativeGradient::~QDeclarativeGradient(void) ??1QDeclarativeGradientStop@@UAE@XZ @ 269 NONAME ; QDeclarativeGradientStop::~QDeclarativeGradientStop(void) - ??1QDeclarativeGraphicsObjectContainer@@UAE@XZ @ 270 NONAME ; QDeclarativeGraphicsObjectContainer::~QDeclarativeGraphicsObjectContainer(void) + ??1QDeclarativeGraphicsObjectContainer@@UAE@XZ @ 270 NONAME ABSENT ; QDeclarativeGraphicsObjectContainer::~QDeclarativeGraphicsObjectContainer(void) ??1QDeclarativeGrid@@UAE@XZ @ 271 NONAME ; QDeclarativeGrid::~QDeclarativeGrid(void) ??1QDeclarativeGridScaledImage@@QAE@XZ @ 272 NONAME ; QDeclarativeGridScaledImage::~QDeclarativeGridScaledImage(void) ??1QDeclarativeGridView@@UAE@XZ @ 273 NONAME ; QDeclarativeGridView::~QDeclarativeGridView(void) @@ -449,7 +449,7 @@ EXPORTS ??_EQDeclarativeFontLoader@@UAE@I@Z @ 448 NONAME ; QDeclarativeFontLoader::~QDeclarativeFontLoader(unsigned int) ??_EQDeclarativeGradient@@UAE@I@Z @ 449 NONAME ; QDeclarativeGradient::~QDeclarativeGradient(unsigned int) ??_EQDeclarativeGradientStop@@UAE@I@Z @ 450 NONAME ; QDeclarativeGradientStop::~QDeclarativeGradientStop(unsigned int) - ??_EQDeclarativeGraphicsObjectContainer@@UAE@I@Z @ 451 NONAME ; QDeclarativeGraphicsObjectContainer::~QDeclarativeGraphicsObjectContainer(unsigned int) + ??_EQDeclarativeGraphicsObjectContainer@@UAE@I@Z @ 451 NONAME ABSENT ; QDeclarativeGraphicsObjectContainer::~QDeclarativeGraphicsObjectContainer(unsigned int) ??_EQDeclarativeGrid@@UAE@I@Z @ 452 NONAME ; QDeclarativeGrid::~QDeclarativeGrid(unsigned int) ??_EQDeclarativeGridView@@UAE@I@Z @ 453 NONAME ; QDeclarativeGridView::~QDeclarativeGridView(unsigned int) ??_EQDeclarativeImage@@UAE@I@Z @ 454 NONAME ; QDeclarativeImage::~QDeclarativeImage(unsigned int) @@ -910,8 +910,8 @@ EXPORTS ?d_func@QDeclarativeFlow@@ABEPBVQDeclarativeFlowPrivate@@XZ @ 909 NONAME ; class QDeclarativeFlowPrivate const * QDeclarativeFlow::d_func(void) const ?d_func@QDeclarativeFontLoader@@AAEPAVQDeclarativeFontLoaderPrivate@@XZ @ 910 NONAME ; class QDeclarativeFontLoaderPrivate * QDeclarativeFontLoader::d_func(void) ?d_func@QDeclarativeFontLoader@@ABEPBVQDeclarativeFontLoaderPrivate@@XZ @ 911 NONAME ; class QDeclarativeFontLoaderPrivate const * QDeclarativeFontLoader::d_func(void) const - ?d_func@QDeclarativeGraphicsObjectContainer@@AAEPAVQDeclarativeGraphicsObjectContainerPrivate@@XZ @ 912 NONAME ; class QDeclarativeGraphicsObjectContainerPrivate * QDeclarativeGraphicsObjectContainer::d_func(void) - ?d_func@QDeclarativeGraphicsObjectContainer@@ABEPBVQDeclarativeGraphicsObjectContainerPrivate@@XZ @ 913 NONAME ; class QDeclarativeGraphicsObjectContainerPrivate const * QDeclarativeGraphicsObjectContainer::d_func(void) const + ?d_func@QDeclarativeGraphicsObjectContainer@@AAEPAVQDeclarativeGraphicsObjectContainerPrivate@@XZ @ 912 NONAME ABSENT ; class QDeclarativeGraphicsObjectContainerPrivate * QDeclarativeGraphicsObjectContainer::d_func(void) + ?d_func@QDeclarativeGraphicsObjectContainer@@ABEPBVQDeclarativeGraphicsObjectContainerPrivate@@XZ @ 913 NONAME ABSENT ; class QDeclarativeGraphicsObjectContainerPrivate const * QDeclarativeGraphicsObjectContainer::d_func(void) const ?d_func@QDeclarativeGridView@@AAEPAVQDeclarativeGridViewPrivate@@XZ @ 914 NONAME ; class QDeclarativeGridViewPrivate * QDeclarativeGridView::d_func(void) ?d_func@QDeclarativeGridView@@ABEPBVQDeclarativeGridViewPrivate@@XZ @ 915 NONAME ; class QDeclarativeGridViewPrivate const * QDeclarativeGridView::d_func(void) const ?d_func@QDeclarativeImage@@AAEPAVQDeclarativeImagePrivate@@XZ @ 916 NONAME ; class QDeclarativeImagePrivate * QDeclarativeImage::d_func(void) @@ -1096,7 +1096,7 @@ EXPORTS ?event@QDeclarativeSystemPalette@@EAE_NPAVQEvent@@@Z @ 1095 NONAME ; bool QDeclarativeSystemPalette::event(class QEvent *) ?event@QDeclarativeTextEdit@@MAE_NPAVQEvent@@@Z @ 1096 NONAME ; bool QDeclarativeTextEdit::event(class QEvent *) ?event@QDeclarativeTextInput@@MAE_NPAVQEvent@@@Z @ 1097 NONAME ; bool QDeclarativeTextInput::event(class QEvent *) - ?eventFilter@QDeclarativeGraphicsObjectContainer@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 1098 NONAME ; bool QDeclarativeGraphicsObjectContainer::eventFilter(class QObject *, class QEvent *) + ?eventFilter@QDeclarativeGraphicsObjectContainer@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 1098 NONAME ABSENT ; bool QDeclarativeGraphicsObjectContainer::eventFilter(class QObject *, class QEvent *) ?eventFilter@QDeclarativeLoader@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 1099 NONAME ; bool QDeclarativeLoader::eventFilter(class QObject *, class QEvent *) ?eventFilter@QDeclarativeSystemPalette@@EAE_NPAVQObject@@PAVQEvent@@@Z @ 1100 NONAME ; bool QDeclarativeSystemPalette::eventFilter(class QObject *, class QEvent *) ?execute@QDeclarativeAnchorChanges@@UAEXXZ @ 1101 NONAME ; void QDeclarativeAnchorChanges::execute(void) @@ -1223,7 +1223,7 @@ EXPORTS ?getStaticMetaObject@QDeclarativeFontLoader@@SAABUQMetaObject@@XZ @ 1222 NONAME ; struct QMetaObject const & QDeclarativeFontLoader::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeGradient@@SAABUQMetaObject@@XZ @ 1223 NONAME ; struct QMetaObject const & QDeclarativeGradient::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeGradientStop@@SAABUQMetaObject@@XZ @ 1224 NONAME ; struct QMetaObject const & QDeclarativeGradientStop::getStaticMetaObject(void) - ?getStaticMetaObject@QDeclarativeGraphicsObjectContainer@@SAABUQMetaObject@@XZ @ 1225 NONAME ; struct QMetaObject const & QDeclarativeGraphicsObjectContainer::getStaticMetaObject(void) + ?getStaticMetaObject@QDeclarativeGraphicsObjectContainer@@SAABUQMetaObject@@XZ @ 1225 NONAME ABSENT ; struct QMetaObject const & QDeclarativeGraphicsObjectContainer::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeGrid@@SAABUQMetaObject@@XZ @ 1226 NONAME ; struct QMetaObject const & QDeclarativeGrid::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeGridView@@SAABUQMetaObject@@XZ @ 1227 NONAME ; struct QMetaObject const & QDeclarativeGridView::getStaticMetaObject(void) ?getStaticMetaObject@QDeclarativeImage@@SAABUQMetaObject@@XZ @ 1228 NONAME ; struct QMetaObject const & QDeclarativeImage::getStaticMetaObject(void) @@ -1282,7 +1282,7 @@ EXPORTS ?getStaticMetaObject@QPacketProtocol@@SAABUQMetaObject@@XZ @ 1281 NONAME ; struct QMetaObject const & QPacketProtocol::getStaticMetaObject(void) ?gradient@QDeclarativeGradient@@QBEPBVQGradient@@XZ @ 1282 NONAME ; class QGradient const * QDeclarativeGradient::gradient(void) const ?gradient@QDeclarativeRectangle@@QBEPAVQDeclarativeGradient@@XZ @ 1283 NONAME ; class QDeclarativeGradient * QDeclarativeRectangle::gradient(void) const - ?graphicsObject@QDeclarativeGraphicsObjectContainer@@QBEPAVQGraphicsObject@@XZ @ 1284 NONAME ; class QGraphicsObject * QDeclarativeGraphicsObjectContainer::graphicsObject(void) const + ?graphicsObject@QDeclarativeGraphicsObjectContainer@@QBEPAVQGraphicsObject@@XZ @ 1284 NONAME ABSENT ; class QGraphicsObject * QDeclarativeGraphicsObjectContainer::graphicsObject(void) const ?gridBottom@QDeclarativeGridScaledImage@@QBEHXZ @ 1285 NONAME ; int QDeclarativeGridScaledImage::gridBottom(void) const ?gridLeft@QDeclarativeGridScaledImage@@QBEHXZ @ 1286 NONAME ; int QDeclarativeGridScaledImage::gridLeft(void) const ?gridRight@QDeclarativeGridScaledImage@@QBEHXZ @ 1287 NONAME ; int QDeclarativeGridScaledImage::gridRight(void) const @@ -1350,7 +1350,7 @@ EXPORTS ?imageProvider@QDeclarativeEngine@@QBEPAVQDeclarativeImageProvider@@ABVQString@@@Z @ 1349 NONAME ; class QDeclarativeImageProvider * QDeclarativeEngine::imageProvider(class QString const &) const ?implicitHeight@QDeclarativeItem@@QBEMXZ @ 1350 NONAME ; float QDeclarativeItem::implicitHeight(void) const ?implicitWidth@QDeclarativeItem@@QBEMXZ @ 1351 NONAME ; float QDeclarativeItem::implicitWidth(void) const - ?importExtension@QDeclarativeEngine@@QAE_NABVQString@@0@Z @ 1352 NONAME ; bool QDeclarativeEngine::importExtension(class QString const &, class QString const &) + ?importExtension@QDeclarativeEngine@@QAE_NABVQString@@0@Z @ 1352 NONAME ABSENT ; bool QDeclarativeEngine::importExtension(class QString const &, class QString const &) ?imports@QDeclarativeDomDocument@@QBE?AV?$QList@VQDeclarativeDomImport@@@@XZ @ 1353 NONAME ; class QList QDeclarativeDomDocument::imports(void) const ?inSync@QDeclarativeSpringFollow@@QBE_NXZ @ 1354 NONAME ; bool QDeclarativeSpringFollow::inSync(void) const ?incrementCurrentIndex@QDeclarativeListView@@QAEXXZ @ 1355 NONAME ; void QDeclarativeListView::incrementCurrentIndex(void) @@ -1484,7 +1484,7 @@ EXPORTS ?item@QDeclarativeVisualDataModel@@UAEPAVQDeclarativeItem@@H_N@Z @ 1483 NONAME ; class QDeclarativeItem * QDeclarativeVisualDataModel::item(int, bool) ?item@QDeclarativeVisualItemModel@@UAEPAVQDeclarativeItem@@H_N@Z @ 1484 NONAME ; class QDeclarativeItem * QDeclarativeVisualItemModel::item(int, bool) ?itemChange@QDeclarativeBasePositioner@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1485 NONAME ; class QVariant QDeclarativeBasePositioner::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) - ?itemChange@QDeclarativeGraphicsObjectContainer@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1486 NONAME ; class QVariant QDeclarativeGraphicsObjectContainer::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) + ?itemChange@QDeclarativeGraphicsObjectContainer@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1486 NONAME ABSENT ; class QVariant QDeclarativeGraphicsObjectContainer::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) ?itemChange@QDeclarativeItem@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1487 NONAME ; class QVariant QDeclarativeItem::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) ?itemChange@QDeclarativeLoader@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1488 NONAME ; class QVariant QDeclarativeLoader::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) ?itemChange@QDeclarativeRepeater@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 1489 NONAME ; class QVariant QDeclarativeRepeater::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &) @@ -1625,7 +1625,7 @@ EXPORTS ?metaObject@QDeclarativeFontLoader@@UBEPBUQMetaObject@@XZ @ 1624 NONAME ; struct QMetaObject const * QDeclarativeFontLoader::metaObject(void) const ?metaObject@QDeclarativeGradient@@UBEPBUQMetaObject@@XZ @ 1625 NONAME ; struct QMetaObject const * QDeclarativeGradient::metaObject(void) const ?metaObject@QDeclarativeGradientStop@@UBEPBUQMetaObject@@XZ @ 1626 NONAME ; struct QMetaObject const * QDeclarativeGradientStop::metaObject(void) const - ?metaObject@QDeclarativeGraphicsObjectContainer@@UBEPBUQMetaObject@@XZ @ 1627 NONAME ; struct QMetaObject const * QDeclarativeGraphicsObjectContainer::metaObject(void) const + ?metaObject@QDeclarativeGraphicsObjectContainer@@UBEPBUQMetaObject@@XZ @ 1627 NONAME ABSENT ; struct QMetaObject const * QDeclarativeGraphicsObjectContainer::metaObject(void) const ?metaObject@QDeclarativeGrid@@UBEPBUQMetaObject@@XZ @ 1628 NONAME ; struct QMetaObject const * QDeclarativeGrid::metaObject(void) const ?metaObject@QDeclarativeGridView@@UBEPBUQMetaObject@@XZ @ 1629 NONAME ; struct QMetaObject const * QDeclarativeGridView::metaObject(void) const ?metaObject@QDeclarativeImage@@UBEPBUQMetaObject@@XZ @ 1630 NONAME ; struct QMetaObject const * QDeclarativeImage::metaObject(void) const @@ -1988,7 +1988,7 @@ EXPORTS ?qt_metacall@QDeclarativeFontLoader@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1987 NONAME ; int QDeclarativeFontLoader::qt_metacall(enum QMetaObject::Call, int, void * *) ?qt_metacall@QDeclarativeGradient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1988 NONAME ; int QDeclarativeGradient::qt_metacall(enum QMetaObject::Call, int, void * *) ?qt_metacall@QDeclarativeGradientStop@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1989 NONAME ; int QDeclarativeGradientStop::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacall@QDeclarativeGraphicsObjectContainer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1990 NONAME ; int QDeclarativeGraphicsObjectContainer::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacall@QDeclarativeGraphicsObjectContainer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1990 NONAME ABSENT ; int QDeclarativeGraphicsObjectContainer::qt_metacall(enum QMetaObject::Call, int, void * *) ?qt_metacall@QDeclarativeGrid@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1991 NONAME ; int QDeclarativeGrid::qt_metacall(enum QMetaObject::Call, int, void * *) ?qt_metacall@QDeclarativeGridView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1992 NONAME ; int QDeclarativeGridView::qt_metacall(enum QMetaObject::Call, int, void * *) ?qt_metacall@QDeclarativeImage@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1993 NONAME ; int QDeclarativeImage::qt_metacall(enum QMetaObject::Call, int, void * *) @@ -2083,7 +2083,7 @@ EXPORTS ?qt_metacast@QDeclarativeFontLoader@@UAEPAXPBD@Z @ 2082 NONAME ; void * QDeclarativeFontLoader::qt_metacast(char const *) ?qt_metacast@QDeclarativeGradient@@UAEPAXPBD@Z @ 2083 NONAME ; void * QDeclarativeGradient::qt_metacast(char const *) ?qt_metacast@QDeclarativeGradientStop@@UAEPAXPBD@Z @ 2084 NONAME ; void * QDeclarativeGradientStop::qt_metacast(char const *) - ?qt_metacast@QDeclarativeGraphicsObjectContainer@@UAEPAXPBD@Z @ 2085 NONAME ; void * QDeclarativeGraphicsObjectContainer::qt_metacast(char const *) + ?qt_metacast@QDeclarativeGraphicsObjectContainer@@UAEPAXPBD@Z @ 2085 NONAME ABSENT ; void * QDeclarativeGraphicsObjectContainer::qt_metacast(char const *) ?qt_metacast@QDeclarativeGrid@@UAEPAXPBD@Z @ 2086 NONAME ; void * QDeclarativeGrid::qt_metacast(char const *) ?qt_metacast@QDeclarativeGridView@@UAEPAXPBD@Z @ 2087 NONAME ; void * QDeclarativeGridView::qt_metacast(char const *) ?qt_metacast@QDeclarativeImage@@UAEPAXPBD@Z @ 2088 NONAME ; void * QDeclarativeImage::qt_metacast(char const *) @@ -2430,7 +2430,7 @@ EXPORTS ?setFromState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 2429 NONAME ; void QDeclarativeTransition::setFromState(class QString const &) ?setFront@QDeclarativeFlipable@@QAEXPAVQDeclarativeItem@@@Z @ 2430 NONAME ABSENT ; void QDeclarativeFlipable::setFront(class QDeclarativeItem *) ?setGradient@QDeclarativeRectangle@@QAEXPAVQDeclarativeGradient@@@Z @ 2431 NONAME ; void QDeclarativeRectangle::setGradient(class QDeclarativeGradient *) - ?setGraphicsObject@QDeclarativeGraphicsObjectContainer@@QAEXPAVQGraphicsObject@@@Z @ 2432 NONAME ; void QDeclarativeGraphicsObjectContainer::setGraphicsObject(class QGraphicsObject *) + ?setGraphicsObject@QDeclarativeGraphicsObjectContainer@@QAEXPAVQGraphicsObject@@@Z @ 2432 NONAME ABSENT ; void QDeclarativeGraphicsObjectContainer::setGraphicsObject(class QGraphicsObject *) ?setGridScaledImage@QDeclarativeBorderImage@@AAEXABVQDeclarativeGridScaledImage@@@Z @ 2433 NONAME ; void QDeclarativeBorderImage::setGridScaledImage(class QDeclarativeGridScaledImage const &) ?setHAlign@QDeclarativeText@@QAEXW4HAlignment@1@@Z @ 2434 NONAME ; void QDeclarativeText::setHAlign(enum QDeclarativeText::HAlignment) ?setHAlign@QDeclarativeTextEdit@@QAEXW4HAlignment@1@@Z @ 2435 NONAME ; void QDeclarativeTextEdit::setHAlign(enum QDeclarativeTextEdit::HAlignment) @@ -2587,7 +2587,7 @@ EXPORTS ?setSourceComponent@QDeclarativeLoader@@QAEXPAVQDeclarativeComponent@@@Z @ 2586 NONAME ; void QDeclarativeLoader::setSourceComponent(class QDeclarativeComponent *) ?setSourceLocation@QDeclarativeExpression@@QAEXABVQString@@H@Z @ 2587 NONAME ; void QDeclarativeExpression::setSourceLocation(class QString const &, int) ?setSourceValue@QDeclarativeEaseFollow@@QAEXM@Z @ 2588 NONAME ABSENT ; void QDeclarativeEaseFollow::setSourceValue(float) - ?setSourceValue@QDeclarativeSpringFollow@@QAEXM@Z @ 2589 NONAME ; void QDeclarativeSpringFollow::setSourceValue(float) + ?setSourceValue@QDeclarativeSpringFollow@@QAEXM@Z @ 2589 NONAME ABSENT ; void QDeclarativeSpringFollow::setSourceValue(float) ?setSpacing@QDeclarativeBasePositioner@@QAEXH@Z @ 2590 NONAME ; void QDeclarativeBasePositioner::setSpacing(int) ?setSpacing@QDeclarativeListView@@QAEXM@Z @ 2591 NONAME ; void QDeclarativeListView::setSpacing(float) ?setSpring@QDeclarativeSpringFollow@@QAEXM@Z @ 2592 NONAME ; void QDeclarativeSpringFollow::setSpring(float) @@ -2605,7 +2605,7 @@ EXPORTS ?setStyle@QDeclarativeText@@QAEXW4TextStyle@1@@Z @ 2604 NONAME ; void QDeclarativeText::setStyle(enum QDeclarativeText::TextStyle) ?setStyleColor@QDeclarativeText@@QAEXABVQColor@@@Z @ 2605 NONAME ; void QDeclarativeText::setStyleColor(class QColor const &) ?setSuperClass@QMetaObjectBuilder@@QAEXPBUQMetaObject@@@Z @ 2606 NONAME ; void QMetaObjectBuilder::setSuperClass(struct QMetaObject const *) - ?setSynchronizedResizing@QDeclarativeGraphicsObjectContainer@@QAEX_N@Z @ 2607 NONAME ; void QDeclarativeGraphicsObjectContainer::setSynchronizedResizing(bool) + ?setSynchronizedResizing@QDeclarativeGraphicsObjectContainer@@QAEX_N@Z @ 2607 NONAME ABSENT ; void QDeclarativeGraphicsObjectContainer::setSynchronizedResizing(bool) ?setTag@QMetaMethodBuilder@@QAEXABVQByteArray@@@Z @ 2608 NONAME ; void QMetaMethodBuilder::setTag(class QByteArray const &) ?setTarget@QDeclarativeBehavior@@UAEXABVQDeclarativeProperty@@@Z @ 2609 NONAME ; void QDeclarativeBehavior::setTarget(class QDeclarativeProperty const &) ?setTarget@QDeclarativeConnections@@QAEXPAVQObject@@@Z @ 2610 NONAME ; void QDeclarativeConnections::setTarget(class QObject *) @@ -2703,7 +2703,7 @@ EXPORTS ?sourceComponent@QDeclarativeLoader@@QBEPAVQDeclarativeComponent@@XZ @ 2702 NONAME ; class QDeclarativeComponent * QDeclarativeLoader::sourceComponent(void) const ?sourceFile@QDeclarativeExpression@@QBE?AVQString@@XZ @ 2703 NONAME ; class QString QDeclarativeExpression::sourceFile(void) const ?sourceValue@QDeclarativeEaseFollow@@QBEMXZ @ 2704 NONAME ABSENT ; float QDeclarativeEaseFollow::sourceValue(void) const - ?sourceValue@QDeclarativeSpringFollow@@QBEMXZ @ 2705 NONAME ; float QDeclarativeSpringFollow::sourceValue(void) const + ?sourceValue@QDeclarativeSpringFollow@@QBEMXZ @ 2705 NONAME ABSENT ; float QDeclarativeSpringFollow::sourceValue(void) const ?spacing@QDeclarativeBasePositioner@@QBEHXZ @ 2706 NONAME ; int QDeclarativeBasePositioner::spacing(void) const ?spacing@QDeclarativeListView@@QBEMXZ @ 2707 NONAME ; float QDeclarativeListView::spacing(void) const ?spacingChanged@QDeclarativeBasePositioner@@IAEXXZ @ 2708 NONAME ; void QDeclarativeBasePositioner::spacingChanged(void) @@ -2756,7 +2756,7 @@ EXPORTS ?styleColorChanged@QDeclarativeText@@IAEXABVQColor@@@Z @ 2755 NONAME ; void QDeclarativeText::styleColorChanged(class QColor const &) ?superClass@QMetaObjectBuilder@@QBEPBUQMetaObject@@XZ @ 2756 NONAME ; struct QMetaObject const * QMetaObjectBuilder::superClass(void) const ?syncChanged@QDeclarativeSpringFollow@@IAEXXZ @ 2757 NONAME ; void QDeclarativeSpringFollow::syncChanged(void) - ?synchronizedResizing@QDeclarativeGraphicsObjectContainer@@QBE_NXZ @ 2758 NONAME ; bool QDeclarativeGraphicsObjectContainer::synchronizedResizing(void) const + ?synchronizedResizing@QDeclarativeGraphicsObjectContainer@@QBE_NXZ @ 2758 NONAME ABSENT ; bool QDeclarativeGraphicsObjectContainer::synchronizedResizing(void) const ?tag@QMetaMethodBuilder@@QBE?AVQByteArray@@XZ @ 2759 NONAME ; class QByteArray QMetaMethodBuilder::tag(void) const ?target@QDeclarativeConnections@@QBEPAVQObject@@XZ @ 2760 NONAME ; class QObject * QDeclarativeConnections::target(void) const ?target@QDeclarativeDrag@@QBEPAVQDeclarativeItem@@XZ @ 2761 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeDrag::target(void) const @@ -2892,8 +2892,8 @@ EXPORTS ?tr@QDeclarativeGradient@@SA?AVQString@@PBD0H@Z @ 2891 NONAME ; class QString QDeclarativeGradient::tr(char const *, char const *, int) ?tr@QDeclarativeGradientStop@@SA?AVQString@@PBD0@Z @ 2892 NONAME ; class QString QDeclarativeGradientStop::tr(char const *, char const *) ?tr@QDeclarativeGradientStop@@SA?AVQString@@PBD0H@Z @ 2893 NONAME ; class QString QDeclarativeGradientStop::tr(char const *, char const *, int) - ?tr@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0@Z @ 2894 NONAME ; class QString QDeclarativeGraphicsObjectContainer::tr(char const *, char const *) - ?tr@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0H@Z @ 2895 NONAME ; class QString QDeclarativeGraphicsObjectContainer::tr(char const *, char const *, int) + ?tr@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0@Z @ 2894 NONAME ABSENT ; class QString QDeclarativeGraphicsObjectContainer::tr(char const *, char const *) + ?tr@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0H@Z @ 2895 NONAME ABSENT ; class QString QDeclarativeGraphicsObjectContainer::tr(char const *, char const *, int) ?tr@QDeclarativeGrid@@SA?AVQString@@PBD0@Z @ 2896 NONAME ; class QString QDeclarativeGrid::tr(char const *, char const *) ?tr@QDeclarativeGrid@@SA?AVQString@@PBD0H@Z @ 2897 NONAME ; class QString QDeclarativeGrid::tr(char const *, char const *, int) ?tr@QDeclarativeGridView@@SA?AVQString@@PBD0@Z @ 2898 NONAME ; class QString QDeclarativeGridView::tr(char const *, char const *) @@ -3082,8 +3082,8 @@ EXPORTS ?trUtf8@QDeclarativeGradient@@SA?AVQString@@PBD0H@Z @ 3081 NONAME ; class QString QDeclarativeGradient::trUtf8(char const *, char const *, int) ?trUtf8@QDeclarativeGradientStop@@SA?AVQString@@PBD0@Z @ 3082 NONAME ; class QString QDeclarativeGradientStop::trUtf8(char const *, char const *) ?trUtf8@QDeclarativeGradientStop@@SA?AVQString@@PBD0H@Z @ 3083 NONAME ; class QString QDeclarativeGradientStop::trUtf8(char const *, char const *, int) - ?trUtf8@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0@Z @ 3084 NONAME ; class QString QDeclarativeGraphicsObjectContainer::trUtf8(char const *, char const *) - ?trUtf8@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0H@Z @ 3085 NONAME ; class QString QDeclarativeGraphicsObjectContainer::trUtf8(char const *, char const *, int) + ?trUtf8@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0@Z @ 3084 NONAME ABSENT ; class QString QDeclarativeGraphicsObjectContainer::trUtf8(char const *, char const *) + ?trUtf8@QDeclarativeGraphicsObjectContainer@@SA?AVQString@@PBD0H@Z @ 3085 NONAME ABSENT ; class QString QDeclarativeGraphicsObjectContainer::trUtf8(char const *, char const *, int) ?trUtf8@QDeclarativeGrid@@SA?AVQString@@PBD0@Z @ 3086 NONAME ; class QString QDeclarativeGrid::trUtf8(char const *, char const *) ?trUtf8@QDeclarativeGrid@@SA?AVQString@@PBD0H@Z @ 3087 NONAME ; class QString QDeclarativeGrid::trUtf8(char const *, char const *, int) ?trUtf8@QDeclarativeGridView@@SA?AVQString@@PBD0@Z @ 3088 NONAME ; class QString QDeclarativeGridView::trUtf8(char const *, char const *) @@ -3309,8 +3309,8 @@ EXPORTS ?windowText@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 3308 NONAME ; class QColor QDeclarativeSystemPalette::windowText(void) const ?wrap@QDeclarativeText@@QBE_NXZ @ 3309 NONAME ; bool QDeclarativeText::wrap(void) const ?wrap@QDeclarativeTextEdit@@QBE_NXZ @ 3310 NONAME ; bool QDeclarativeTextEdit::wrap(void) const - ?wrapChanged@QDeclarativeText@@IAEX_N@Z @ 3311 NONAME ; void QDeclarativeText::wrapChanged(bool) - ?wrapChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 3312 NONAME ; void QDeclarativeTextEdit::wrapChanged(bool) + ?wrapChanged@QDeclarativeText@@IAEX_N@Z @ 3311 NONAME ABSENT ; void QDeclarativeText::wrapChanged(bool) + ?wrapChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 3312 NONAME ABSENT ; void QDeclarativeTextEdit::wrapChanged(bool) ?write@QDeclarativeBehavior@@UAEXABVQVariant@@@Z @ 3313 NONAME ; void QDeclarativeBehavior::write(class QVariant const &) ?write@QDeclarativeProperty@@QBE_NABVQVariant@@@Z @ 3314 NONAME ; bool QDeclarativeProperty::write(class QVariant const &) const ?write@QDeclarativeProperty@@SA_NPAVQObject@@ABVQString@@ABVQVariant@@@Z @ 3315 NONAME ; bool QDeclarativeProperty::write(class QObject *, class QString const &, class QVariant const &) @@ -3320,7 +3320,7 @@ EXPORTS ?x@QDeclarativeParentChange@@QBEMXZ @ 3319 NONAME ; float QDeclarativeParentChange::x(void) const ?xAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3320 NONAME ABSENT ; float QDeclarativeParticleMotionGravity::xAttractor(void) const ?xIsSet@QDeclarativeParentChange@@QBE_NXZ @ 3321 NONAME ; bool QDeclarativeParentChange::xIsSet(void) const - ?xToPos@QDeclarativeTextInput@@QAEHH@Z @ 3322 NONAME ; int QDeclarativeTextInput::xToPos(int) + ?xToPos@QDeclarativeTextInput@@QAEHH@Z @ 3322 NONAME ABSENT ; int QDeclarativeTextInput::xToPos(int) ?xVariance@QDeclarativeParticleMotionWander@@QBEMXZ @ 3323 NONAME ABSENT ; float QDeclarativeParticleMotionWander::xVariance(void) const ?xattractorChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 3324 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::xattractorChanged(void) ?xflick@QDeclarativeFlickable@@IBE_NXZ @ 3325 NONAME ; bool QDeclarativeFlickable::xflick(void) const @@ -3351,7 +3351,7 @@ EXPORTS ?staticMetaObject@QDeclarativeItem@@2UQMetaObject@@B @ 3350 NONAME ; struct QMetaObject const QDeclarativeItem::staticMetaObject ?staticMetaObject@QDeclarativeColumn@@2UQMetaObject@@B @ 3351 NONAME ; struct QMetaObject const QDeclarativeColumn::staticMetaObject ?staticMetaObject@QDeclarativeGradient@@2UQMetaObject@@B @ 3352 NONAME ; struct QMetaObject const QDeclarativeGradient::staticMetaObject - ?staticMetaObject@QDeclarativeGraphicsObjectContainer@@2UQMetaObject@@B @ 3353 NONAME ; struct QMetaObject const QDeclarativeGraphicsObjectContainer::staticMetaObject + ?staticMetaObject@QDeclarativeGraphicsObjectContainer@@2UQMetaObject@@B @ 3353 NONAME ABSENT ; struct QMetaObject const QDeclarativeGraphicsObjectContainer::staticMetaObject ?staticMetaObject@QDeclarativeDebugWatch@@2UQMetaObject@@B @ 3354 NONAME ; struct QMetaObject const QDeclarativeDebugWatch::staticMetaObject ?staticMetaObject@QDeclarativeStateGroup@@2UQMetaObject@@B @ 3355 NONAME ; struct QMetaObject const QDeclarativeStateGroup::staticMetaObject ?staticMetaObject@QPacketProtocol@@2UQMetaObject@@B @ 3356 NONAME ; struct QMetaObject const QPacketProtocol::staticMetaObject @@ -3749,7 +3749,7 @@ EXPORTS ?setSize@QDeclarativeItem@@QAEXABVQSizeF@@@Z @ 3748 NONAME ; void QDeclarativeItem::setSize(class QSizeF const &) ?setSnapMode@QDeclarativeGridView@@QAEXW4SnapMode@1@@Z @ 3749 NONAME ; void QDeclarativeGridView::setSnapMode(enum QDeclarativeGridView::SnapMode) ?setSource@QDeclarativeWorkerScript@@QAEXABVQUrl@@@Z @ 3750 NONAME ; void QDeclarativeWorkerScript::setSource(class QUrl const &) - ?setSourceSize@QDeclarativeImageBase@@QAEXABVQSize@@@Z @ 3751 NONAME ; void QDeclarativeImageBase::setSourceSize(class QSize const &) + ?setSourceSize@QDeclarativeImageBase@@QAEXABVQSize@@@Z @ 3751 NONAME ABSENT ; void QDeclarativeImageBase::setSourceSize(class QSize const &) ?setTarget@QDeclarativeDrag@@QAEXPAVQGraphicsObject@@@Z @ 3752 NONAME ; void QDeclarativeDrag::setTarget(class QGraphicsObject *) ?setTop@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3753 NONAME ; void QDeclarativeAnchors::setTop(struct QDeclarativeAnchorLine const &) ?setVelocity@QDeclarativeSmoothedAnimation@@QAEXM@Z @ 3754 NONAME ; void QDeclarativeSmoothedAnimation::setVelocity(float) @@ -3818,4 +3818,79 @@ EXPORTS ?staticMetaObject@QDeclarativeSmoothedAnimation@@2UQMetaObject@@B @ 3817 NONAME ; struct QMetaObject const QDeclarativeSmoothedAnimation::staticMetaObject ?staticMetaObject@QDeclarativeTranslate@@2UQMetaObject@@B @ 3818 NONAME ; struct QMetaObject const QDeclarativeTranslate::staticMetaObject ?consistentTime@QDeclarativeItemPrivate@@2HA @ 3819 NONAME ; int QDeclarativeItemPrivate::consistentTime + ??0QDeclarativeAction@@QAE@PAVQObject@@ABVQString@@PAVQDeclarativeContext@@ABVQVariant@@@Z @ 3820 NONAME ; QDeclarativeAction::QDeclarativeAction(class QObject *, class QString const &, class QDeclarativeContext *, class QVariant const &) + ??0QDeclarativeSmoothedFollow@@QAE@PAVQObject@@@Z @ 3821 NONAME ; QDeclarativeSmoothedFollow::QDeclarativeSmoothedFollow(class QObject *) + ??1QDeclarativeSmoothedFollow@@UAE@XZ @ 3822 NONAME ; QDeclarativeSmoothedFollow::~QDeclarativeSmoothedFollow(void) + ??_EQDeclarativeSmoothedFollow@@UAE@I@Z @ 3823 NONAME ; QDeclarativeSmoothedFollow::~QDeclarativeSmoothedFollow(unsigned int) + ?addPluginPath@QDeclarativeEngine@@QAEXABVQString@@@Z @ 3824 NONAME ; void QDeclarativeEngine::addPluginPath(class QString const &) + ?autoScroll@QDeclarativeTextInput@@QBE_NXZ @ 3825 NONAME ; bool QDeclarativeTextInput::autoScroll(void) const + ?autoScrollChanged@QDeclarativeTextInput@@IAEX_N@Z @ 3826 NONAME ; void QDeclarativeTextInput::autoScrollChanged(bool) + ?createFunction@QDeclarativeType@@QBEP6AXPAX@ZXZ @ 3827 NONAME ; void (*)(void *) QDeclarativeType::createFunction(void) const + ?createSize@QDeclarativeType@@QBEHXZ @ 3828 NONAME ; int QDeclarativeType::createSize(void) const + ?d_func@QDeclarativeSmoothedFollow@@AAEPAVQDeclarativeSmoothedFollowPrivate@@XZ @ 3829 NONAME ; class QDeclarativeSmoothedFollowPrivate * QDeclarativeSmoothedFollow::d_func(void) + ?d_func@QDeclarativeSmoothedFollow@@ABEPBVQDeclarativeSmoothedFollowPrivate@@XZ @ 3830 NONAME ; class QDeclarativeSmoothedFollowPrivate const * QDeclarativeSmoothedFollow::d_func(void) const + ?displayText@QDeclarativeTextInput@@QBE?AVQString@@XZ @ 3831 NONAME ; class QString QDeclarativeTextInput::displayText(void) const + ?displayTextChanged@QDeclarativeTextInput@@IAEXABVQString@@@Z @ 3832 NONAME ; void QDeclarativeTextInput::displayTextChanged(class QString const &) + ?duration@QDeclarativeSmoothedFollow@@QBEHXZ @ 3833 NONAME ; int QDeclarativeSmoothedFollow::duration(void) const + ?durationChanged@QDeclarativeSmoothedFollow@@IAEXXZ @ 3834 NONAME ; void QDeclarativeSmoothedFollow::durationChanged(void) + ?enabled@QDeclarativeSmoothedFollow@@QBE_NXZ @ 3835 NONAME ; bool QDeclarativeSmoothedFollow::enabled(void) const + ?enabledChanged@QDeclarativeSmoothedFollow@@IAEXXZ @ 3836 NONAME ; void QDeclarativeSmoothedFollow::enabledChanged(void) + ?getStaticMetaObject@QDeclarativeSmoothedFollow@@SAABUQMetaObject@@XZ @ 3837 NONAME ; struct QMetaObject const & QDeclarativeSmoothedFollow::getStaticMetaObject(void) + ?highlightMoveDuration@QDeclarativeGridView@@QBEHXZ @ 3838 NONAME ; int QDeclarativeGridView::highlightMoveDuration(void) const + ?highlightMoveDuration@QDeclarativeListView@@QBEHXZ @ 3839 NONAME ; int QDeclarativeListView::highlightMoveDuration(void) const + ?highlightMoveDuration@QDeclarativePathView@@QBEHXZ @ 3840 NONAME ; int QDeclarativePathView::highlightMoveDuration(void) const + ?highlightMoveDurationChanged@QDeclarativeGridView@@IAEXXZ @ 3841 NONAME ; void QDeclarativeGridView::highlightMoveDurationChanged(void) + ?highlightMoveDurationChanged@QDeclarativeListView@@IAEXXZ @ 3842 NONAME ; void QDeclarativeListView::highlightMoveDurationChanged(void) + ?highlightMoveDurationChanged@QDeclarativePathView@@IAEXXZ @ 3843 NONAME ; void QDeclarativePathView::highlightMoveDurationChanged(void) + ?highlightResizeDuration@QDeclarativeListView@@QBEHXZ @ 3844 NONAME ; int QDeclarativeListView::highlightResizeDuration(void) const + ?highlightResizeDurationChanged@QDeclarativeListView@@IAEXXZ @ 3845 NONAME ; void QDeclarativeListView::highlightResizeDurationChanged(void) + ?importPlugin@QDeclarativeEngine@@QAE_NABVQString@@0@Z @ 3846 NONAME ; bool QDeclarativeEngine::importPlugin(class QString const &, class QString const &) + ?isExtendedType@QDeclarativeType@@QBE_NXZ @ 3847 NONAME ; bool QDeclarativeType::isExtendedType(void) const + ?maximumEasingTime@QDeclarativeSmoothedFollow@@QBEHXZ @ 3848 NONAME ; int QDeclarativeSmoothedFollow::maximumEasingTime(void) const + ?maximumEasingTimeChanged@QDeclarativeSmoothedFollow@@IAEXXZ @ 3849 NONAME ; void QDeclarativeSmoothedFollow::maximumEasingTimeChanged(void) + ?metaObject@QDeclarativeSmoothedFollow@@UBEPBUQMetaObject@@XZ @ 3850 NONAME ; struct QMetaObject const * QDeclarativeSmoothedFollow::metaObject(void) const + ?mouseMoveEvent@QDeclarativeTextInput@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 3851 NONAME ; void QDeclarativeTextInput::mouseMoveEvent(class QGraphicsSceneMouseEvent *) + ?moveCursorSelection@QDeclarativeTextInput@@QAEXH@Z @ 3852 NONAME ; void QDeclarativeTextInput::moveCursorSelection(int) + ?passwordCharacter@QDeclarativeTextInput@@QBE?AVQString@@XZ @ 3853 NONAME ; class QString QDeclarativeTextInput::passwordCharacter(void) const + ?passwordCharacterChanged@QDeclarativeTextInput@@IAEXXZ @ 3854 NONAME ; void QDeclarativeTextInput::passwordCharacterChanged(void) + ?pluginPathList@QDeclarativeEngine@@QBE?AVQStringList@@XZ @ 3855 NONAME ; class QStringList QDeclarativeEngine::pluginPathList(void) const + ?qt_metacall@QDeclarativeSmoothedFollow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3856 NONAME ; int QDeclarativeSmoothedFollow::qt_metacall(enum QMetaObject::Call, int, void * *) + ?qt_metacast@QDeclarativeSmoothedFollow@@UAEPAXPBD@Z @ 3857 NONAME ; void * QDeclarativeSmoothedFollow::qt_metacast(char const *) + ?resetTarget@QDeclarativeDrag@@QAEXXZ @ 3858 NONAME ; void QDeclarativeDrag::resetTarget(void) + ?reversingMode@QDeclarativeSmoothedFollow@@QBE?AW4ReversingMode@1@XZ @ 3859 NONAME ; enum QDeclarativeSmoothedFollow::ReversingMode QDeclarativeSmoothedFollow::reversingMode(void) const + ?reversingModeChanged@QDeclarativeSmoothedFollow@@IAEXXZ @ 3860 NONAME ; void QDeclarativeSmoothedFollow::reversingModeChanged(void) + ?setAutoScroll@QDeclarativeTextInput@@QAEX_N@Z @ 3861 NONAME ; void QDeclarativeTextInput::setAutoScroll(bool) + ?setDuration@QDeclarativeSmoothedFollow@@QAEXH@Z @ 3862 NONAME ; void QDeclarativeSmoothedFollow::setDuration(int) + ?setEnabled@QDeclarativeSmoothedFollow@@QAEX_N@Z @ 3863 NONAME ; void QDeclarativeSmoothedFollow::setEnabled(bool) + ?setHighlightMoveDuration@QDeclarativeGridView@@QAEXH@Z @ 3864 NONAME ; void QDeclarativeGridView::setHighlightMoveDuration(int) + ?setHighlightMoveDuration@QDeclarativeListView@@QAEXH@Z @ 3865 NONAME ; void QDeclarativeListView::setHighlightMoveDuration(int) + ?setHighlightMoveDuration@QDeclarativePathView@@QAEXH@Z @ 3866 NONAME ; void QDeclarativePathView::setHighlightMoveDuration(int) + ?setHighlightResizeDuration@QDeclarativeListView@@QAEXH@Z @ 3867 NONAME ; void QDeclarativeListView::setHighlightResizeDuration(int) + ?setMaximumEasingTime@QDeclarativeSmoothedFollow@@QAEXH@Z @ 3868 NONAME ; void QDeclarativeSmoothedFollow::setMaximumEasingTime(int) + ?setPasswordCharacter@QDeclarativeTextInput@@QAEXABVQString@@@Z @ 3869 NONAME ; void QDeclarativeTextInput::setPasswordCharacter(class QString const &) + ?setPluginPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 3870 NONAME ; void QDeclarativeEngine::setPluginPathList(class QStringList const &) + ?setReversingMode@QDeclarativeSmoothedFollow@@QAEXW4ReversingMode@1@@Z @ 3871 NONAME ; void QDeclarativeSmoothedFollow::setReversingMode(enum QDeclarativeSmoothedFollow::ReversingMode) + ?setSourceSize@QDeclarativeImageBase@@UAEXABVQSize@@@Z @ 3872 NONAME ; void QDeclarativeImageBase::setSourceSize(class QSize const &) + ?setTarget@QDeclarativeSmoothedFollow@@UAEXABVQDeclarativeProperty@@@Z @ 3873 NONAME ; void QDeclarativeSmoothedFollow::setTarget(class QDeclarativeProperty const &) + ?setTo@QDeclarativeSmoothedFollow@@QAEXM@Z @ 3874 NONAME ; void QDeclarativeSmoothedFollow::setTo(float) + ?setTo@QDeclarativeSpringFollow@@QAEXM@Z @ 3875 NONAME ; void QDeclarativeSpringFollow::setTo(float) + ?setVelocity@QDeclarativeSmoothedFollow@@QAEXM@Z @ 3876 NONAME ; void QDeclarativeSmoothedFollow::setVelocity(float) + ?setWrapMode@QDeclarativeText@@QAEXW4WrapMode@1@@Z @ 3877 NONAME ; void QDeclarativeText::setWrapMode(enum QDeclarativeText::WrapMode) + ?setWrapMode@QDeclarativeTextEdit@@QAEXW4WrapMode@1@@Z @ 3878 NONAME ; void QDeclarativeTextEdit::setWrapMode(enum QDeclarativeTextEdit::WrapMode) + ?sourceSizeChanged@QDeclarativeAnimatedImage@@IAEXXZ @ 3879 NONAME ; void QDeclarativeAnimatedImage::sourceSizeChanged(void) + ?to@QDeclarativeSmoothedFollow@@QBEMXZ @ 3880 NONAME ; float QDeclarativeSmoothedFollow::to(void) const + ?to@QDeclarativeSpringFollow@@QBEMXZ @ 3881 NONAME ; float QDeclarativeSpringFollow::to(void) const + ?tr@QDeclarativeCompiler@@AAE?AVQString@@PBD@Z @ 3882 NONAME ; class QString QDeclarativeCompiler::tr(char const *) + ?tr@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0@Z @ 3883 NONAME ; class QString QDeclarativeSmoothedFollow::tr(char const *, char const *) + ?tr@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0H@Z @ 3884 NONAME ; class QString QDeclarativeSmoothedFollow::tr(char const *, char const *, int) + ?trUtf8@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0@Z @ 3885 NONAME ; class QString QDeclarativeSmoothedFollow::trUtf8(char const *, char const *) + ?trUtf8@QDeclarativeSmoothedFollow@@SA?AVQString@@PBD0H@Z @ 3886 NONAME ; class QString QDeclarativeSmoothedFollow::trUtf8(char const *, char const *, int) + ?velocity@QDeclarativeSmoothedFollow@@QBEMXZ @ 3887 NONAME ; float QDeclarativeSmoothedFollow::velocity(void) const + ?velocityChanged@QDeclarativeSmoothedFollow@@IAEXXZ @ 3888 NONAME ; void QDeclarativeSmoothedFollow::velocityChanged(void) + ?wrapMode@QDeclarativeText@@QBE?AW4WrapMode@1@XZ @ 3889 NONAME ; enum QDeclarativeText::WrapMode QDeclarativeText::wrapMode(void) const + ?wrapMode@QDeclarativeTextEdit@@QBE?AW4WrapMode@1@XZ @ 3890 NONAME ; enum QDeclarativeTextEdit::WrapMode QDeclarativeTextEdit::wrapMode(void) const + ?wrapModeChanged@QDeclarativeText@@IAEXXZ @ 3891 NONAME ; void QDeclarativeText::wrapModeChanged(void) + ?wrapModeChanged@QDeclarativeTextEdit@@IAEXXZ @ 3892 NONAME ; void QDeclarativeTextEdit::wrapModeChanged(void) + ?xToPosition@QDeclarativeTextInput@@QAEHH@Z @ 3893 NONAME ; int QDeclarativeTextInput::xToPosition(int) + ?staticMetaObject@QDeclarativeSmoothedFollow@@2UQMetaObject@@B @ 3894 NONAME ; struct QMetaObject const QDeclarativeSmoothedFollow::staticMetaObject diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 1c33477..c34690e 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12724,7 +12724,7 @@ EXPORTS ?visibilityChanged@QToolBar@@IAEX_N@Z @ 12723 NONAME ; void QToolBar::visibilityChanged(bool) ??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12724 NONAME ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &) ??0QStaticText@@QAE@ABVQString@@@Z @ 12725 NONAME ; QStaticText::QStaticText(class QString const &) - ?append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12726 NONAME ; void QGraphicsItemPrivate::append(class QDeclarativeListProperty *, class QGraphicsObject *) + ?append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12726 NONAME ABSENT ; void QGraphicsItemPrivate::append(class QDeclarativeListProperty *, class QGraphicsObject *) ?bitPlaneCount@QImage@@QBEHXZ @ 12727 NONAME ; int QImage::bitPlaneCount(void) const ?childrenChanged@QGraphicsObject@@IAEXXZ @ 12728 NONAME ; void QGraphicsObject::childrenChanged(void) ?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12729 NONAME ; class QDeclarativeListProperty QGraphicsItemPrivate::childrenList(void) @@ -12767,4 +12767,7 @@ EXPORTS ?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12766 NONAME ; void QGraphicsObject::updateMicroFocus(void) ?width@QGraphicsItemPrivate@@UBEMXZ @ 12767 NONAME ; float QGraphicsItemPrivate::width(void) const ?widthChanged@QGraphicsObject@@IAEXXZ @ 12768 NONAME ; void QGraphicsObject::widthChanged(void) + ?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12769 NONAME ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty *, class QGraphicsObject *) + ?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12770 NONAME ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty *, int) + ?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12771 NONAME ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty *) diff --git a/src/s60installs/bwins/QtMultimediau.def b/src/s60installs/bwins/QtMultimediau.def index 6c98fdf..ad33993 100644 --- a/src/s60installs/bwins/QtMultimediau.def +++ b/src/s60installs/bwins/QtMultimediau.def @@ -946,4 +946,6 @@ EXPORTS ?volume@QSoundEffect@@QBEHXZ @ 945 NONAME ; int QSoundEffect::volume(void) const ?volumeChanged@QSoundEffect@@IAEXXZ @ 946 NONAME ; void QSoundEffect::volumeChanged(void) ?staticMetaObject@QSoundEffect@@2UQMetaObject@@B @ 947 NONAME ; struct QMetaObject const QSoundEffect::staticMetaObject + ?event@QGraphicsVideoItem@@MAE_NPAVQEvent@@@Z @ 948 NONAME ; bool QGraphicsVideoItem::event(class QEvent *) + ?sceneEvent@QGraphicsVideoItem@@MAE_NPAVQEvent@@@Z @ 949 NONAME ; bool QGraphicsVideoItem::sceneEvent(class QEvent *) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index 79fd0ce..e54e03f 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -803,9 +803,9 @@ EXPORTS _ZN16QCoreApplicationD0Ev @ 802 NONAME _ZN16QCoreApplicationD1Ev @ 803 NONAME _ZN16QCoreApplicationD2Ev @ 804 NONAME - _ZN16QDeclarativeDataD0Ev @ 805 NONAME - _ZN16QDeclarativeDataD1Ev @ 806 NONAME - _ZN16QDeclarativeDataD2Ev @ 807 NONAME + _ZN16QDeclarativeDataD0Ev @ 805 NONAME ABSENT + _ZN16QDeclarativeDataD1Ev @ 806 NONAME ABSENT + _ZN16QDeclarativeDataD2Ev @ 807 NONAME ABSENT _ZN16QEventTransition11qt_metacallEN11QMetaObject4CallEiPPv @ 808 NONAME _ZN16QEventTransition11qt_metacastEPKc @ 809 NONAME _ZN16QEventTransition12onTransitionEP6QEvent @ 810 NONAME @@ -3332,7 +3332,7 @@ EXPORTS _ZTI15QPauseAnimation @ 3331 NONAME _ZTI15QSocketNotifier @ 3332 NONAME _ZTI16QCoreApplication @ 3333 NONAME - _ZTI16QDeclarativeData @ 3334 NONAME + _ZTI16QDeclarativeData @ 3334 NONAME ABSENT _ZTI16QEventTransition @ 3335 NONAME _ZTI16QIODevicePrivate @ 3336 NONAME _ZTI16QTextCodecPlugin @ 3337 NONAME @@ -3407,7 +3407,7 @@ EXPORTS _ZTV15QPauseAnimation @ 3406 NONAME _ZTV15QSocketNotifier @ 3407 NONAME _ZTV16QCoreApplication @ 3408 NONAME - _ZTV16QDeclarativeData @ 3409 NONAME + _ZTV16QDeclarativeData @ 3409 NONAME ABSENT _ZTV16QEventTransition @ 3410 NONAME _ZTV16QIODevicePrivate @ 3411 NONAME _ZTV16QTextCodecPlugin @ 3412 NONAME @@ -3692,4 +3692,7 @@ EXPORTS _ZN9QDateTime18setMSecsSinceEpochEx @ 3691 NONAME _ZN9QDateTime19fromMSecsSinceEpochEx @ 3692 NONAME _ZNK9QDateTime17toMSecsSinceEpochEv @ 3693 NONAME + _ZN10QTextCodec11validCodecsEv @ 3694 NONAME + _ZN16QDeclarativeData13parentChangedE @ 3695 NONAME DATA 4 + _ZN16QDeclarativeData9destroyedE @ 3696 NONAME DATA 4 diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index 17a57d0..0f0e886 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -179,7 +179,7 @@ EXPORTS _ZN16QDeclarativeText11qt_metacallEN11QMetaObject4CallEiPPv @ 178 NONAME _ZN16QDeclarativeText11qt_metacastEPKc @ 179 NONAME _ZN16QDeclarativeText11textChangedERK7QString @ 180 NONAME - _ZN16QDeclarativeText11wrapChangedEb @ 181 NONAME + _ZN16QDeclarativeText11wrapChangedEb @ 181 NONAME ABSENT _ZN16QDeclarativeText12colorChangedERK6QColor @ 182 NONAME _ZN16QDeclarativeText12setElideModeENS_13TextElideModeE @ 183 NONAME _ZN16QDeclarativeText12styleChangedENS_9TextStyleE @ 184 NONAME @@ -337,7 +337,7 @@ EXPORTS _ZN18QDeclarativeEngine11qt_metacastEPKc @ 336 NONAME _ZN18QDeclarativeEngine11rootContextEv @ 337 NONAME _ZN18QDeclarativeEngine13addImportPathERK7QString @ 338 NONAME - _ZN18QDeclarativeEngine15importExtensionERK7QStringS2_ @ 339 NONAME + _ZN18QDeclarativeEngine15importExtensionERK7QStringS2_ @ 339 NONAME ABSENT _ZN18QDeclarativeEngine15objectOwnershipEP7QObject @ 340 NONAME _ZN18QDeclarativeEngine16addImageProviderERK7QStringP25QDeclarativeImageProvider @ 341 NONAME _ZN18QDeclarativeEngine16contextForObjectEPK7QObject @ 342 NONAME @@ -897,7 +897,7 @@ EXPORTS _ZN20QDeclarativeTextEdit11qt_metacastEPKc @ 896 NONAME _ZN20QDeclarativeTextEdit11setReadOnlyEb @ 897 NONAME _ZN20QDeclarativeTextEdit11textChangedERK7QString @ 898 NONAME - _ZN20QDeclarativeTextEdit11wrapChangedEb @ 899 NONAME + _ZN20QDeclarativeTextEdit11wrapChangedEb @ 899 NONAME ABSENT _ZN20QDeclarativeTextEdit12colorChangedERK6QColor @ 900 NONAME _ZN20QDeclarativeTextEdit12drawContentsEP8QPainterRK5QRect @ 901 NONAME _ZN20QDeclarativeTextEdit13keyPressEventEP9QKeyEvent @ 902 NONAME @@ -1234,7 +1234,7 @@ EXPORTS _ZN21QDeclarativeTextInput24selectedTextColorChangedERK6QColor @ 1233 NONAME _ZN21QDeclarativeTextInput26horizontalAlignmentChangedENS_10HAlignmentE @ 1234 NONAME _ZN21QDeclarativeTextInput5eventEP6QEvent @ 1235 NONAME - _ZN21QDeclarativeTextInput6xToPosEi @ 1236 NONAME + _ZN21QDeclarativeTextInput6xToPosEi @ 1236 NONAME ABSENT _ZN21QDeclarativeTextInput7setFontERK5QFont @ 1237 NONAME _ZN21QDeclarativeTextInput7setTextERK7QString @ 1238 NONAME _ZN21QDeclarativeTextInput8acceptedEv @ 1239 NONAME @@ -1652,7 +1652,7 @@ EXPORTS _ZN24QDeclarativeSpringFollow11syncChangedEv @ 1651 NONAME _ZN24QDeclarativeSpringFollow12valueChangedEf @ 1652 NONAME _ZN24QDeclarativeSpringFollow14modulusChangedEv @ 1653 NONAME - _ZN24QDeclarativeSpringFollow14setSourceValueEf @ 1654 NONAME + _ZN24QDeclarativeSpringFollow14setSourceValueEf @ 1654 NONAME ABSENT _ZN24QDeclarativeSpringFollow16staticMetaObjectE @ 1655 NONAME DATA 16 _ZN24QDeclarativeSpringFollow19getStaticMetaObjectEv @ 1656 NONAME _ZN24QDeclarativeSpringFollow7setMassEf @ 1657 NONAME @@ -2130,19 +2130,19 @@ EXPORTS _ZN34QDeclarativeDebugPropertyReferenceC2ERKS_ @ 2129 NONAME _ZN34QDeclarativeDebugPropertyReferenceC2Ev @ 2130 NONAME _ZN34QDeclarativeDebugPropertyReferenceaSERKS_ @ 2131 NONAME - _ZN35QDeclarativeGraphicsObjectContainer10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 2132 NONAME - _ZN35QDeclarativeGraphicsObjectContainer11eventFilterEP7QObjectP6QEvent @ 2133 NONAME - _ZN35QDeclarativeGraphicsObjectContainer11qt_metacallEN11QMetaObject4CallEiPPv @ 2134 NONAME - _ZN35QDeclarativeGraphicsObjectContainer11qt_metacastEPKc @ 2135 NONAME - _ZN35QDeclarativeGraphicsObjectContainer16staticMetaObjectE @ 2136 NONAME DATA 16 - _ZN35QDeclarativeGraphicsObjectContainer17setGraphicsObjectEP15QGraphicsObject @ 2137 NONAME - _ZN35QDeclarativeGraphicsObjectContainer19getStaticMetaObjectEv @ 2138 NONAME - _ZN35QDeclarativeGraphicsObjectContainer23setSynchronizedResizingEb @ 2139 NONAME - _ZN35QDeclarativeGraphicsObjectContainerC1EP16QDeclarativeItem @ 2140 NONAME - _ZN35QDeclarativeGraphicsObjectContainerC2EP16QDeclarativeItem @ 2141 NONAME - _ZN35QDeclarativeGraphicsObjectContainerD0Ev @ 2142 NONAME - _ZN35QDeclarativeGraphicsObjectContainerD1Ev @ 2143 NONAME - _ZN35QDeclarativeGraphicsObjectContainerD2Ev @ 2144 NONAME + _ZN35QDeclarativeGraphicsObjectContainer10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 2132 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainer11eventFilterEP7QObjectP6QEvent @ 2133 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainer11qt_metacallEN11QMetaObject4CallEiPPv @ 2134 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainer11qt_metacastEPKc @ 2135 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainer16staticMetaObjectE @ 2136 NONAME DATA 16 ABSENT + _ZN35QDeclarativeGraphicsObjectContainer17setGraphicsObjectEP15QGraphicsObject @ 2137 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainer19getStaticMetaObjectEv @ 2138 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainer23setSynchronizedResizingEb @ 2139 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainerC1EP16QDeclarativeItem @ 2140 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainerC2EP16QDeclarativeItem @ 2141 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainerD0Ev @ 2142 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainerD1Ev @ 2143 NONAME ABSENT + _ZN35QDeclarativeGraphicsObjectContainerD2Ev @ 2144 NONAME ABSENT _ZN36QDeclarativeDomValueValueInterceptorC1ERKS_ @ 2145 NONAME _ZN36QDeclarativeDomValueValueInterceptorC1Ev @ 2146 NONAME _ZN36QDeclarativeDomValueValueInterceptorC2ERKS_ @ 2147 NONAME @@ -2765,7 +2765,7 @@ EXPORTS _ZNK24QDeclarativeScriptString6scriptEv @ 2764 NONAME _ZNK24QDeclarativeScriptString7contextEv @ 2765 NONAME _ZNK24QDeclarativeSpringFollow10metaObjectEv @ 2766 NONAME - _ZNK24QDeclarativeSpringFollow11sourceValueEv @ 2767 NONAME + _ZNK24QDeclarativeSpringFollow11sourceValueEv @ 2767 NONAME ABSENT _ZNK24QDeclarativeSpringFollow4massEv @ 2768 NONAME _ZNK24QDeclarativeSpringFollow5valueEv @ 2769 NONAME _ZNK24QDeclarativeSpringFollow6inSyncEv @ 2770 NONAME @@ -2933,9 +2933,9 @@ EXPORTS _ZNK34QDeclarativeDebugPropertyReference4nameEv @ 2932 NONAME _ZNK34QDeclarativeDebugPropertyReference5valueEv @ 2933 NONAME _ZNK34QDeclarativeDebugPropertyReference7bindingEv @ 2934 NONAME - _ZNK35QDeclarativeGraphicsObjectContainer10metaObjectEv @ 2935 NONAME - _ZNK35QDeclarativeGraphicsObjectContainer14graphicsObjectEv @ 2936 NONAME - _ZNK35QDeclarativeGraphicsObjectContainer20synchronizedResizingEv @ 2937 NONAME + _ZNK35QDeclarativeGraphicsObjectContainer10metaObjectEv @ 2935 NONAME ABSENT + _ZNK35QDeclarativeGraphicsObjectContainer14graphicsObjectEv @ 2936 NONAME ABSENT + _ZNK35QDeclarativeGraphicsObjectContainer20synchronizedResizingEv @ 2937 NONAME ABSENT _ZNK36QDeclarativeDomValueValueInterceptor6objectEv @ 2938 NONAME _ZNK38QDeclarativeDebugObjectExpressionWatch10expressionEv @ 2939 NONAME _ZNK38QDeclarativeDebugObjectExpressionWatch10metaObjectEv @ 2940 NONAME @@ -3039,7 +3039,7 @@ EXPORTS _ZTI31QDeclarativePropertyValueSource @ 3038 NONAME _ZTI32QDeclarativeDebugExpressionQuery @ 3039 NONAME _ZTI33QDeclarativeDebugRootContextQuery @ 3040 NONAME - _ZTI35QDeclarativeGraphicsObjectContainer @ 3041 NONAME + _ZTI35QDeclarativeGraphicsObjectContainer @ 3041 NONAME ABSENT _ZTI36QDeclarativePropertyValueInterceptor @ 3042 NONAME _ZTI38QDeclarativeDebugObjectExpressionWatch @ 3043 NONAME _ZTI39QDeclarativeNetworkAccessManagerFactory @ 3044 NONAME @@ -3142,7 +3142,7 @@ EXPORTS _ZTV31QDeclarativePropertyValueSource @ 3141 NONAME _ZTV32QDeclarativeDebugExpressionQuery @ 3142 NONAME _ZTV33QDeclarativeDebugRootContextQuery @ 3143 NONAME - _ZTV35QDeclarativeGraphicsObjectContainer @ 3144 NONAME + _ZTV35QDeclarativeGraphicsObjectContainer @ 3144 NONAME ABSENT _ZTV36QDeclarativePropertyValueInterceptor @ 3145 NONAME _ZTV38QDeclarativeDebugObjectExpressionWatch @ 3146 NONAME _ZTV39QDeclarativeNetworkAccessManagerFactory @ 3147 NONAME @@ -3198,8 +3198,8 @@ EXPORTS _ZThn16_N26QDeclarativeBasePositioner17componentCompleteEv @ 3197 NONAME _ZThn16_N26QDeclarativeBasePositionerD0Ev @ 3198 NONAME _ZThn16_N26QDeclarativeBasePositionerD1Ev @ 3199 NONAME - _ZThn16_N35QDeclarativeGraphicsObjectContainerD0Ev @ 3200 NONAME - _ZThn16_N35QDeclarativeGraphicsObjectContainerD1Ev @ 3201 NONAME + _ZThn16_N35QDeclarativeGraphicsObjectContainerD0Ev @ 3200 NONAME ABSENT + _ZThn16_N35QDeclarativeGraphicsObjectContainerD1Ev @ 3201 NONAME ABSENT _ZThn8_N16QDeclarativeBind17componentCompleteEv @ 3202 NONAME _ZThn8_N16QDeclarativeBindD0Ev @ 3203 NONAME _ZThn8_N16QDeclarativeBindD1Ev @ 3204 NONAME @@ -3351,9 +3351,9 @@ EXPORTS _ZThn8_N29QDeclarativeStateChangeScript7executeEv @ 3350 NONAME _ZThn8_N29QDeclarativeStateChangeScriptD0Ev @ 3351 NONAME _ZThn8_N29QDeclarativeStateChangeScriptD1Ev @ 3352 NONAME - _ZThn8_N35QDeclarativeGraphicsObjectContainer10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3353 NONAME - _ZThn8_N35QDeclarativeGraphicsObjectContainerD0Ev @ 3354 NONAME - _ZThn8_N35QDeclarativeGraphicsObjectContainerD1Ev @ 3355 NONAME + _ZThn8_N35QDeclarativeGraphicsObjectContainer10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3353 NONAME ABSENT + _ZThn8_N35QDeclarativeGraphicsObjectContainerD0Ev @ 3354 NONAME ABSENT + _ZThn8_N35QDeclarativeGraphicsObjectContainerD1Ev @ 3355 NONAME ABSENT _ZThn8_NK16QDeclarativeItem12boundingRectEv @ 3356 NONAME _ZThn8_NK16QDeclarativeItem16inputMethodQueryEN2Qt16InputMethodQueryE @ 3357 NONAME _ZThn8_NK19QDeclarativeBinding10expressionEv @ 3358 NONAME @@ -3394,4 +3394,81 @@ EXPORTS _ZNK18QDeclarativeParser7Variant8asScriptEv @ 3393 NONAME _ZNK18QDeclarativeParser7Variant8asStringEv @ 3394 NONAME _ZNK18QDeclarativeParser7Variant9asBooleanEv @ 3395 NONAME + _ZN16QDeclarativeDrag11resetTargetEv @ 3396 NONAME + _ZN16QDeclarativeText11setWrapModeENS_8WrapModeE @ 3397 NONAME + _ZN16QDeclarativeText15wrapModeChangedEv @ 3398 NONAME + _ZN18QDeclarativeActionC1EP7QObjectRK7QStringP19QDeclarativeContextRK8QVariant @ 3399 NONAME + _ZN18QDeclarativeActionC2EP7QObjectRK7QStringP19QDeclarativeContextRK8QVariant @ 3400 NONAME + _ZN18QDeclarativeEngine12importPluginERK7QStringS2_ @ 3401 NONAME + _ZN18QDeclarativeEngine13addPluginPathERK7QString @ 3402 NONAME + _ZN18QDeclarativeEngine17setPluginPathListERK11QStringList @ 3403 NONAME + _ZN20QDeclarativeCompiler2trEPKc @ 3404 NONAME + _ZN20QDeclarativeGridView24setHighlightMoveDurationEi @ 3405 NONAME + _ZN20QDeclarativeGridView28highlightMoveDurationChangedEv @ 3406 NONAME + _ZN20QDeclarativeListView24setHighlightMoveDurationEi @ 3407 NONAME + _ZN20QDeclarativeListView26setHighlightResizeDurationEi @ 3408 NONAME + _ZN20QDeclarativeListView28highlightMoveDurationChangedEv @ 3409 NONAME + _ZN20QDeclarativeListView30highlightResizeDurationChangedEv @ 3410 NONAME + _ZN20QDeclarativePathView24setHighlightMoveDurationEi @ 3411 NONAME + _ZN20QDeclarativePathView28highlightMoveDurationChangedEv @ 3412 NONAME + _ZN20QDeclarativeTextEdit11setWrapModeENS_8WrapModeE @ 3413 NONAME + _ZN20QDeclarativeTextEdit15wrapModeChangedEv @ 3414 NONAME + _ZN21QDeclarativeTextInput11xToPositionEi @ 3415 NONAME + _ZN21QDeclarativeTextInput13setAutoScrollEb @ 3416 NONAME + _ZN21QDeclarativeTextInput14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 3417 NONAME + _ZN21QDeclarativeTextInput17autoScrollChangedEb @ 3418 NONAME + _ZN21QDeclarativeTextInput18displayTextChangedERK7QString @ 3419 NONAME + _ZN21QDeclarativeTextInput19moveCursorSelectionEi @ 3420 NONAME + _ZN21QDeclarativeTextInput20setPasswordCharacterERK7QString @ 3421 NONAME + _ZN21QDeclarativeTextInput24passwordCharacterChangedEv @ 3422 NONAME + _ZN24QDeclarativeSpringFollow5setToEf @ 3423 NONAME + _ZN25QDeclarativeAnimatedImage17sourceSizeChangedEv @ 3424 NONAME + _ZN26QDeclarativeSmoothedFollow10setEnabledEb @ 3425 NONAME + _ZN26QDeclarativeSmoothedFollow11qt_metacallEN11QMetaObject4CallEiPPv @ 3426 NONAME + _ZN26QDeclarativeSmoothedFollow11qt_metacastEPKc @ 3427 NONAME + _ZN26QDeclarativeSmoothedFollow11setDurationEi @ 3428 NONAME + _ZN26QDeclarativeSmoothedFollow11setVelocityEf @ 3429 NONAME + _ZN26QDeclarativeSmoothedFollow14enabledChangedEv @ 3430 NONAME + _ZN26QDeclarativeSmoothedFollow15durationChangedEv @ 3431 NONAME + _ZN26QDeclarativeSmoothedFollow15velocityChangedEv @ 3432 NONAME + _ZN26QDeclarativeSmoothedFollow16setReversingModeENS_13ReversingModeE @ 3433 NONAME + _ZN26QDeclarativeSmoothedFollow16staticMetaObjectE @ 3434 NONAME DATA 16 + _ZN26QDeclarativeSmoothedFollow19getStaticMetaObjectEv @ 3435 NONAME + _ZN26QDeclarativeSmoothedFollow20reversingModeChangedEv @ 3436 NONAME + _ZN26QDeclarativeSmoothedFollow20setMaximumEasingTimeEi @ 3437 NONAME + _ZN26QDeclarativeSmoothedFollow24maximumEasingTimeChangedEv @ 3438 NONAME + _ZN26QDeclarativeSmoothedFollow5setToEf @ 3439 NONAME + _ZN26QDeclarativeSmoothedFollow9setTargetERK20QDeclarativeProperty @ 3440 NONAME + _ZN26QDeclarativeSmoothedFollowC1EP7QObject @ 3441 NONAME + _ZN26QDeclarativeSmoothedFollowC2EP7QObject @ 3442 NONAME + _ZN26QDeclarativeSmoothedFollowD0Ev @ 3443 NONAME + _ZN26QDeclarativeSmoothedFollowD1Ev @ 3444 NONAME + _ZN26QDeclarativeSmoothedFollowD2Ev @ 3445 NONAME + _ZNK16QDeclarativeText8wrapModeEv @ 3446 NONAME + _ZNK16QDeclarativeType10createSizeEv @ 3447 NONAME + _ZNK16QDeclarativeType14createFunctionEv @ 3448 NONAME + _ZNK16QDeclarativeType14isExtendedTypeEv @ 3449 NONAME + _ZNK18QDeclarativeEngine14pluginPathListEv @ 3450 NONAME + _ZNK20QDeclarativeGridView21highlightMoveDurationEv @ 3451 NONAME + _ZNK20QDeclarativeListView21highlightMoveDurationEv @ 3452 NONAME + _ZNK20QDeclarativeListView23highlightResizeDurationEv @ 3453 NONAME + _ZNK20QDeclarativePathView21highlightMoveDurationEv @ 3454 NONAME + _ZNK20QDeclarativeTextEdit8wrapModeEv @ 3455 NONAME + _ZNK21QDeclarativeTextInput10autoScrollEv @ 3456 NONAME + _ZNK21QDeclarativeTextInput11displayTextEv @ 3457 NONAME + _ZNK21QDeclarativeTextInput17passwordCharacterEv @ 3458 NONAME + _ZNK24QDeclarativeSpringFollow2toEv @ 3459 NONAME + _ZNK26QDeclarativeSmoothedFollow10metaObjectEv @ 3460 NONAME + _ZNK26QDeclarativeSmoothedFollow13reversingModeEv @ 3461 NONAME + _ZNK26QDeclarativeSmoothedFollow17maximumEasingTimeEv @ 3462 NONAME + _ZNK26QDeclarativeSmoothedFollow2toEv @ 3463 NONAME + _ZNK26QDeclarativeSmoothedFollow7enabledEv @ 3464 NONAME + _ZNK26QDeclarativeSmoothedFollow8durationEv @ 3465 NONAME + _ZNK26QDeclarativeSmoothedFollow8velocityEv @ 3466 NONAME + _ZTI26QDeclarativeSmoothedFollow @ 3467 NONAME + _ZTV26QDeclarativeSmoothedFollow @ 3468 NONAME + _ZThn8_N21QDeclarativeTextInput14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 3469 NONAME + _ZThn8_N26QDeclarativeSmoothedFollow9setTargetERK20QDeclarativeProperty @ 3470 NONAME + _ZThn8_N26QDeclarativeSmoothedFollowD0Ev @ 3471 NONAME + _ZThn8_N26QDeclarativeSmoothedFollowD1Ev @ 3472 NONAME diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 59e63ea..353603e 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -11943,7 +11943,7 @@ EXPORTS _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11942 NONAME _ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11943 NONAME _ZN20QGraphicsItemPrivate24prependGraphicsTransformEP18QGraphicsTransform @ 11944 NONAME - _ZN20QGraphicsItemPrivate6appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11945 NONAME + _ZN20QGraphicsItemPrivate6appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11945 NONAME ABSENT _ZN20QGraphicsItemPrivate8setWidthEf @ 11946 NONAME _ZN20QGraphicsItemPrivate9setHeightEf @ 11947 NONAME _ZN7QWizard11pageRemovedEi @ 11948 NONAME @@ -11970,4 +11970,7 @@ EXPORTS _ZNK12QPaintBuffer15frameStartIndexEi @ 11969 NONAME _ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11970 NONAME _ZNK12QPaintBuffer18commandDescriptionEi @ 11971 NONAME + _ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11972 NONAME + _ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11973 NONAME + _ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11974 NONAME diff --git a/src/s60installs/eabi/QtMultimediau.def b/src/s60installs/eabi/QtMultimediau.def index 384796d..64a6dc6 100644 --- a/src/s60installs/eabi/QtMultimediau.def +++ b/src/s60installs/eabi/QtMultimediau.def @@ -972,4 +972,7 @@ EXPORTS _ZNK12QSoundEffect7isMutedEv @ 971 NONAME _ZTI12QSoundEffect @ 972 NONAME _ZTV12QSoundEffect @ 973 NONAME + _ZN18QGraphicsVideoItem10sceneEventEP6QEvent @ 974 NONAME + _ZN18QGraphicsVideoItem5eventEP6QEvent @ 975 NONAME + _ZThn8_N18QGraphicsVideoItem10sceneEventEP6QEvent @ 976 NONAME -- cgit v0.12 From 1d267f33d179abbac753a72c2235e7fb07c4def7 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 15 Apr 2010 20:31:07 +1000 Subject: Revert "Update Phonon ds9 backend to 4.4.0." This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp (cherry picked from commit 6253ced81bcd60c04803f1a52bc59a239022b9c4) Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp --- src/3rdparty/phonon/ds9/abstractvideorenderer.cpp | 4 +- src/3rdparty/phonon/ds9/backend.cpp | 14 +- src/3rdparty/phonon/ds9/backend.h | 4 + src/3rdparty/phonon/ds9/backendnode.cpp | 19 ++ src/3rdparty/phonon/ds9/ds9.desktop | 17 +- src/3rdparty/phonon/ds9/effect.cpp | 4 +- src/3rdparty/phonon/ds9/fakesource.cpp | 34 +--- src/3rdparty/phonon/ds9/iodevicereader.cpp | 94 +++------- src/3rdparty/phonon/ds9/iodevicereader.h | 1 - src/3rdparty/phonon/ds9/mediagraph.cpp | 38 ++-- src/3rdparty/phonon/ds9/mediaobject.cpp | 205 +++++++++------------ src/3rdparty/phonon/ds9/mediaobject.h | 8 +- src/3rdparty/phonon/ds9/qasyncreader.cpp | 72 +++----- src/3rdparty/phonon/ds9/qasyncreader.h | 6 +- src/3rdparty/phonon/ds9/qaudiocdreader.cpp | 54 ++---- src/3rdparty/phonon/ds9/qaudiocdreader.h | 2 +- src/3rdparty/phonon/ds9/qbasefilter.cpp | 33 ++-- src/3rdparty/phonon/ds9/qbasefilter.h | 4 +- src/3rdparty/phonon/ds9/qevr9.h | 143 ++++++++++++++ src/3rdparty/phonon/ds9/qmeminputpin.cpp | 113 ++++-------- src/3rdparty/phonon/ds9/qmeminputpin.h | 9 +- src/3rdparty/phonon/ds9/qpin.cpp | 73 +++----- src/3rdparty/phonon/ds9/qpin.h | 7 +- src/3rdparty/phonon/ds9/videorenderer_default.cpp | 153 +++++++++++++++ src/3rdparty/phonon/ds9/videorenderer_default.h | 55 ++++++ src/3rdparty/phonon/ds9/videorenderer_evr.cpp | 215 ++++++++++++++++++++++ src/3rdparty/phonon/ds9/videorenderer_evr.h | 56 ++++++ src/3rdparty/phonon/ds9/videorenderer_soft.cpp | 15 +- src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp | 113 +----------- src/3rdparty/phonon/ds9/videorenderer_vmr9.h | 1 - src/3rdparty/phonon/ds9/videowidget.cpp | 50 ++++- src/3rdparty/phonon/ds9/volumeeffect.cpp | 5 +- src/3rdparty/phonon/ds9/volumeeffect.h | 2 +- src/plugins/phonon/ds9/ds9.pro | 2 + 34 files changed, 1001 insertions(+), 624 deletions(-) create mode 100644 src/3rdparty/phonon/ds9/qevr9.h create mode 100644 src/3rdparty/phonon/ds9/videorenderer_default.cpp create mode 100644 src/3rdparty/phonon/ds9/videorenderer_default.h create mode 100644 src/3rdparty/phonon/ds9/videorenderer_evr.cpp create mode 100644 src/3rdparty/phonon/ds9/videorenderer_evr.h diff --git a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp index e932e70..a9d0694 100644 --- a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp +++ b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp @@ -99,8 +99,8 @@ namespace Phonon m_dstX = m_dstY = 0; if (ratio > 0) { - if (realWidth / realHeight > ratio && scaleMode == Phonon::VideoWidget::FitInView - || realWidth / realHeight < ratio && scaleMode == Phonon::VideoWidget::ScaleAndCrop) { + if ((realWidth / realHeight > ratio && scaleMode == Phonon::VideoWidget::FitInView) + || (realWidth / realHeight < ratio && scaleMode == Phonon::VideoWidget::ScaleAndCrop)) { //the height is correct, let's change the width m_dstWidth = qRound(realHeight * ratio); m_dstX = qRound((realWidth - realHeight * ratio) / 2.); diff --git a/src/3rdparty/phonon/ds9/backend.cpp b/src/3rdparty/phonon/ds9/backend.cpp index 2c56af7..fbc4bdc 100644 --- a/src/3rdparty/phonon/ds9/backend.cpp +++ b/src/3rdparty/phonon/ds9/backend.cpp @@ -41,6 +41,8 @@ namespace Phonon { namespace DS9 { + QMutex *Backend::directShowMutex = 0; + bool Backend::AudioMoniker::operator==(const AudioMoniker &other) { return other->IsEqual(*this) == S_OK; @@ -50,6 +52,8 @@ namespace Phonon Backend::Backend(QObject *parent, const QVariantList &) : QObject(parent) { + directShowMutex = &m_directShowMutex; + ::CoInitialize(0); //registering meta types @@ -62,6 +66,8 @@ namespace Phonon m_audioOutputs.clear(); m_audioEffects.clear(); ::CoUninitialize(); + + directShowMutex = 0; } QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const QList &args) @@ -131,6 +137,7 @@ namespace Phonon QList Backend::objectDescriptionIndexes(Phonon::ObjectDescriptionType type) const { + QMutexLocker locker(&m_directShowMutex); QList ret; switch(type) @@ -157,7 +164,7 @@ namespace Phonon while (S_OK == enumMon->Next(1, mon.pparam(), 0)) { LPOLESTR str = 0; mon->GetDisplayName(0,0,&str); - const QString name = QString::fromUtf16((unsigned short*)str); + const QString name = QString::fromWCharArray(str); ComPointer alloc; ::CoGetMalloc(1, alloc.pparam()); alloc->Free(str); @@ -204,6 +211,7 @@ namespace Phonon QHash Backend::objectDescriptionProperties(Phonon::ObjectDescriptionType type, int index) const { + QMutexLocker locker(&m_directShowMutex); QHash ret; switch (type) { @@ -216,7 +224,7 @@ namespace Phonon LPOLESTR str = 0; HRESULT hr = mon->GetDisplayName(0,0, &str); if (SUCCEEDED(hr)) { - QString name = QString::fromUtf16((unsigned short*)str); + QString name = QString::fromWCharArray(str); ComPointer alloc; ::CoGetMalloc(1, alloc.pparam()); alloc->Free(str); @@ -231,7 +239,7 @@ namespace Phonon WCHAR name[80]; // 80 is clearly stated in the MSDN doc HRESULT hr = ::DMOGetName(m_audioEffects[index], name); if (SUCCEEDED(hr)) { - ret["name"] = QString::fromUtf16((unsigned short*)name); + ret["name"] = QString::fromWCharArray(name); } } break; diff --git a/src/3rdparty/phonon/ds9/backend.h b/src/3rdparty/phonon/ds9/backend.h index ad638f2..7c3c109 100644 --- a/src/3rdparty/phonon/ds9/backend.h +++ b/src/3rdparty/phonon/ds9/backend.h @@ -23,6 +23,7 @@ along with this library. If not, see . #include #include +#include #include "compointer.h" #include "backendnode.h" @@ -63,6 +64,8 @@ namespace Phonon Filter getAudioOutputFilter(int index) const; + static QMutex *directShowMutex; + Q_SIGNALS: void objectDescriptionChanged(ObjectDescriptionType); @@ -74,6 +77,7 @@ namespace Phonon }; mutable QVector m_audioOutputs; mutable QVector m_audioEffects; + mutable QMutex m_directShowMutex; }; } } diff --git a/src/3rdparty/phonon/ds9/backendnode.cpp b/src/3rdparty/phonon/ds9/backendnode.cpp index 7e0b3cd..737ab7b 100644 --- a/src/3rdparty/phonon/ds9/backendnode.cpp +++ b/src/3rdparty/phonon/ds9/backendnode.cpp @@ -57,6 +57,25 @@ namespace Phonon BackendNode::~BackendNode() { + //this will remove the filter from the graph + FILTER_INFO info; + for(int i = 0; i < FILTER_COUNT; ++i) { + const Filter &filter = m_filters[i]; + if (!filter) + continue; + filter->QueryFilterInfo(&info); + if (info.pGraph) { + HRESULT hr = info.pGraph->RemoveFilter(filter); + + if (FAILED(hr) && m_mediaObject) { + m_mediaObject->ensureStopped(); + + hr = info.pGraph->RemoveFilter(filter); + } + Q_ASSERT(SUCCEEDED(hr)); + info.pGraph->Release(); + } + } } void BackendNode::setMediaObject(MediaObject *mo) diff --git a/src/3rdparty/phonon/ds9/ds9.desktop b/src/3rdparty/phonon/ds9/ds9.desktop index 1bc3451..764390e 100644 --- a/src/3rdparty/phonon/ds9/ds9.desktop +++ b/src/3rdparty/phonon/ds9/ds9.desktop @@ -5,13 +5,12 @@ MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;app X-KDE-Library=phonon_ds9 X-KDE-PhononBackendInfo-InterfaceVersion=1 X-KDE-PhononBackendInfo-Version=0.1 -X-KDE-PhononBackendInfo-Website=http://www.trolltech.com/ +X-KDE-PhononBackendInfo-Website=http://qt.nokia.com/ InitialPreference=15 Name=DirectShow9 Name[bg]=DirectShow9 Name[ca]=DirectShow9 -Name[ca@valencia]=DirectShow9 Name[cs]=DirectShow9 Name[da]=DirectShow9 Name[de]=DirectShow9 @@ -20,14 +19,11 @@ Name[en_GB]=DirectShow9 Name[es]=DirectShow9 Name[et]=DirectShow9 Name[eu]=DirectShow9 -Name[fi]=DirectShow9 Name[fr]=DirectShow9 Name[ga]=DirectShow9 Name[gl]=DirectShow9 -Name[hr]=DirectShow9 Name[hsb]=DirectShow9 Name[hu]=DirectShow9 -Name[id]=DirectShow9 Name[is]=DirectShow9 Name[it]=DirectShow9 Name[ja]=DirectShow9 @@ -35,7 +31,6 @@ Name[ko]=DirectShow9 Name[ku]=DirectShow9 Name[lt]=DirectShow9 Name[lv]=DirectShow9 -Name[nb]=DirectShow9 Name[nds]=DirectShow9 Name[nl]=DirectShow9 Name[nn]=DirectShow9 @@ -43,13 +38,10 @@ Name[pa]=ਡਾਇਰੈਕਸ਼ੋ9 Name[pl]=DirectShow9 Name[pt]=DirectShow9 Name[pt_BR]=DirectShow9 -Name[ru]=DirectShow9 Name[se]=DirectShow9 Name[sk]=DirectShow 9 Name[sl]=DirectShow 9 Name[sr]=Директшоу‑9 -Name[sr@ijekavian]=Директшоу‑9 -Name[sr@ijekavianlatin]=DirectShow‑9 Name[sr@latin]=DirectShow‑9 Name[sv]=Directshow 9 Name[tr]=DirectShow9 @@ -61,7 +53,6 @@ Name[zh_TW]=DirectShow9 Comment=Phonon DirectShow9 backend Comment[bg]=Phonon DirectShow9 Comment[ca]=Dorsal DirectShow9 del Phonon -Comment[ca@valencia]=Dorsal DirectShow9 del Phonon Comment[cs]=Phonon DirectShow9 backend Comment[da]=DirectShow9-backend til Phonon Comment[de]=Phonon-Treiber für DirectShow9 @@ -70,13 +61,11 @@ Comment[en_GB]=Phonon DirectShow9 backend Comment[es]=Motor DirectShow9 para Phonon Comment[et]=Phononi DirectShow9 taustaprogramm Comment[eu]=Phonon DirectShow9 backend -Comment[fi]=Phonon DirectShow9-taustaohjelma Comment[fr]=Système de gestion DirectShow9 pour Phonon Comment[ga]=Inneall DirectShow9 le haghaidh Phonon Comment[gl]=Infraestrutura de DirectShow9 para Phonon Comment[hsb]=Phonon DirectShow9 backend Comment[hu]=Phonon DirectShow9 modul -Comment[id]=Phonon DirectShow9 backend Comment[is]=Phonon DirectShow9 bakendi Comment[it]=Motore DirectShow9 di Phonon Comment[ja]=Phonon DirectShow9 ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ @@ -84,7 +73,6 @@ Comment[ko]=Phonon DirectShow9 백엔드 Comment[ku]=Binesaza Phonon DirectShow9 Comment[lt]=Phonon DirectShow9 galinÄ— sÄ…saja Comment[lv]=Phonon DirectShow9 aizmugure -Comment[nb]=Phonon-motor for DirectShow9 Comment[nds]=Phonon-Hülpprogrmm DirectShow9 Comment[nl]=DirectShow9-backend (Phonon) Comment[nn]=Phonon-motor for DirectShow9 @@ -92,13 +80,10 @@ Comment[pa]=ਫੋਨੋਨ ਡਾਇਰੈਕਟਸ਼ੋ9 ਬੈਕà¨à¨‚ਡ Comment[pl]=ObsÅ‚uga DirectShow9 przez Phonon Comment[pt]=Infra-estrutura do DirectShow9 para o Phonon Comment[pt_BR]=Infraestrutura Phonon DirectShow9 -Comment[ru]=Механизм DirectShow9 Ð´Ð»Ñ Phonon Comment[se]=Phonon DirectShow9 duogášmohtor Comment[sk]=Phonon DirectShow 9 podsystém Comment[sl]=Phononova Hrbtenica DirectShow 9 Comment[sr]=Директшоу‑9 као позадина Фонона -Comment[sr@ijekavian]=Директшоу‑9 као позадина Фонона -Comment[sr@ijekavianlatin]=DirectShow‑9 kao pozadina Phonona Comment[sr@latin]=DirectShow‑9 kao pozadina Phonona Comment[sv]=Phonon Directshow 9-gränssnitt Comment[tr]=Phonon DirectShow9 arka ucu diff --git a/src/3rdparty/phonon/ds9/effect.cpp b/src/3rdparty/phonon/ds9/effect.cpp index 104a3c1..ebe976b 100644 --- a/src/3rdparty/phonon/ds9/effect.cpp +++ b/src/3rdparty/phonon/ds9/effect.cpp @@ -82,7 +82,7 @@ namespace Phonon current += wcslen(current) + 1; //skip the name current += wcslen(current) + 1; //skip the unit for(; *current; current += wcslen(current) + 1) { - values.append( QString::fromUtf16((unsigned short*)current) ); + values.append( QString::fromWCharArray(current) ); } } //FALLTHROUGH @@ -107,7 +107,7 @@ namespace Phonon Phonon::EffectParameter::Hints hint = info.mopCaps == MP_CAPS_CURVE_INVSQUARE ? Phonon::EffectParameter::LogarithmicHint : Phonon::EffectParameter::Hints(0); - const QString n = QString::fromUtf16((unsigned short*)name); + const QString n = QString::fromWCharArray(name); ret.append(Phonon::EffectParameter(i, n, hint, def, min, max, values)); ::CoTaskMemFree(name); //let's free the memory } diff --git a/src/3rdparty/phonon/ds9/fakesource.cpp b/src/3rdparty/phonon/ds9/fakesource.cpp index 9a61a2e..4dce138 100644 --- a/src/3rdparty/phonon/ds9/fakesource.cpp +++ b/src/3rdparty/phonon/ds9/fakesource.cpp @@ -29,8 +29,10 @@ namespace Phonon namespace DS9 { static WAVEFORMATEX g_defaultWaveFormat = {WAVE_FORMAT_PCM, 2, 44100, 176400, 4, 16, 0}; - static BITMAPINFOHEADER g_defautBitmapHeader = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 0, 0, 0, 0, 0, 0, 0}; - static VIDEOINFOHEADER2 g_defaultVideoInfo = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + static VIDEOINFOHEADER2 g_defaultVideoInfo = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, {0}, 0, {sizeof(BITMAPINFOHEADER), 1, 1, 1, 0, 0, 0, 0, 0, 0, 0} }; + + static const AM_MEDIA_TYPE g_fakeAudioType = {MEDIATYPE_Audio, MEDIASUBTYPE_PCM, 0, 0, 2, FORMAT_WaveFormatEx, 0, sizeof(WAVEFORMATEX), reinterpret_cast(&g_defaultWaveFormat)}; + static const AM_MEDIA_TYPE g_fakeVideoType = {MEDIATYPE_Video, MEDIASUBTYPE_RGB32, TRUE, FALSE, 0, FORMAT_VideoInfo2, 0, sizeof(VIDEOINFOHEADER2), reinterpret_cast(&g_defaultVideoInfo)}; class FakePin : public QPin { @@ -128,36 +130,12 @@ namespace Phonon void FakeSource::createFakeAudioPin() { - AM_MEDIA_TYPE mt; - qMemSet(&mt, 0, sizeof(AM_MEDIA_TYPE)); - mt.majortype = MEDIATYPE_Audio; - mt.subtype = MEDIASUBTYPE_PCM; - mt.formattype = FORMAT_WaveFormatEx; - mt.lSampleSize = 2; - - //fake the format (stereo 44.1 khz stereo 16 bits) - mt.cbFormat = sizeof(WAVEFORMATEX); - mt.pbFormat = reinterpret_cast(&g_defaultWaveFormat); - - new FakePin(this, mt); + new FakePin(this, g_fakeAudioType); } void FakeSource::createFakeVideoPin() { - AM_MEDIA_TYPE mt; - qMemSet(&mt, 0, sizeof(AM_MEDIA_TYPE)); - mt.majortype = MEDIATYPE_Video; - mt.subtype = MEDIASUBTYPE_RGB32; - mt.formattype = FORMAT_VideoInfo2; - mt.bFixedSizeSamples = 1; - - g_defaultVideoInfo.bmiHeader = g_defautBitmapHeader; - - //fake the format - mt.cbFormat = sizeof(VIDEOINFOHEADER2); - mt.pbFormat = reinterpret_cast(&g_defaultVideoInfo); - - new FakePin(this, mt); + new FakePin(this, g_fakeVideoType); } } diff --git a/src/3rdparty/phonon/ds9/iodevicereader.cpp b/src/3rdparty/phonon/ds9/iodevicereader.cpp index 9152712..ba4ae5c 100644 --- a/src/3rdparty/phonon/ds9/iodevicereader.cpp +++ b/src/3rdparty/phonon/ds9/iodevicereader.cpp @@ -36,18 +36,20 @@ namespace Phonon //these mediatypes define a stream, its type will be autodetected by DirectShow static QVector getMediaTypes() { - AM_MEDIA_TYPE mt = { MEDIATYPE_Stream, MEDIASUBTYPE_NULL, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0}; + //the order here is important because otherwise, + //directshow might not be able to detect the stream type correctly + + AM_MEDIA_TYPE mt = { MEDIATYPE_Stream, MEDIASUBTYPE_Avi, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0}; QVector ret; - //normal auto-detect stream - mt.subtype = MEDIASUBTYPE_NULL; - ret << mt; //AVI stream - mt.subtype = MEDIASUBTYPE_Avi; ret << mt; //WAVE stream mt.subtype = MEDIASUBTYPE_WAVE; ret << mt; + //normal auto-detect stream (must be at the end!) + mt.subtype = MEDIASUBTYPE_NULL; + ret << mt; return ret; } @@ -64,7 +66,6 @@ namespace Phonon //for Phonon::StreamInterface void writeData(const QByteArray &data) { - QWriteLocker locker(&m_lock); m_pos += data.size(); m_buffer += data; } @@ -75,54 +76,22 @@ namespace Phonon void setStreamSize(qint64 newSize) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_size = newSize; } - qint64 streamSize() const - { - QReadLocker locker(&m_lock); - return m_size; - } - void setStreamSeekable(bool s) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_seekable = s; } - bool streamSeekable() const - { - QReadLocker locker(&m_lock); - return m_seekable; - } - - void setCurrentPos(qint64 pos) - { - QWriteLocker locker(&m_lock); - m_pos = pos; - seekStream(pos); - m_buffer.clear(); - } - - qint64 currentPos() const - { - QReadLocker locker(&m_lock); - return m_pos; - } - - int currentBufferSize() const - { - QReadLocker locker(&m_lock); - return m_buffer.size(); - } - //virtual pure members //implementation from IAsyncReader STDMETHODIMP Length(LONGLONG *total, LONGLONG *available) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (total) { *total = m_size; } @@ -137,37 +106,39 @@ namespace Phonon HRESULT read(LONGLONG pos, LONG length, BYTE *buffer, LONG *actual) { - QMutexLocker locker(&m_mutexRead); + Q_ASSERT(!m_mutex.tryLock()); + if (m_mediaGraph->isStopping()) { + return VFW_E_WRONG_STATE; + } - if(streamSize() != 1 && pos + length > streamSize()) { + if(m_size != 1 && pos + length > m_size) { //it tries to read outside of the boundaries return E_FAIL; } - if (currentPos() - currentBufferSize() != pos) { - if (!streamSeekable()) { + if (m_pos - m_buffer.size() != pos) { + if (!m_seekable) { return S_FALSE; } - setCurrentPos(pos); + m_pos = pos; + seekStream(pos); + m_buffer.clear(); } - int oldSize = currentBufferSize(); - while (currentBufferSize() < int(length)) { + int oldSize = m_buffer.size(); + while (m_buffer.size() < int(length)) { needData(); - if (oldSize == currentBufferSize()) { + if (oldSize == m_buffer.size()) { break; //we didn't get any data } - oldSize = currentBufferSize(); + oldSize = m_buffer.size(); } - DWORD bytesRead = qMin(currentBufferSize(), int(length)); - { - QWriteLocker locker(&m_lock); - qMemCopy(buffer, m_buffer.data(), bytesRead); - //truncate the buffer - m_buffer = m_buffer.mid(bytesRead); - } + int bytesRead = qMin(m_buffer.size(), int(length)); + qMemCopy(buffer, m_buffer.data(), bytesRead); + //truncate the buffer + m_buffer = m_buffer.mid(bytesRead); if (actual) { *actual = bytesRead; //initialization @@ -183,7 +154,6 @@ namespace Phonon qint64 m_pos; qint64 m_size; - QMutex m_mutexRead; const MediaGraph *m_mediaGraph; }; @@ -197,14 +167,6 @@ namespace Phonon IODeviceReader::~IODeviceReader() { } - - STDMETHODIMP IODeviceReader::Stop() - { - HRESULT hr = QBaseFilter::Stop(); - m_streamReader->enoughData(); //this asks to cancel any blocked call to needData - return hr; - } - } } diff --git a/src/3rdparty/phonon/ds9/iodevicereader.h b/src/3rdparty/phonon/ds9/iodevicereader.h index af4b271..c8b91c3 100644 --- a/src/3rdparty/phonon/ds9/iodevicereader.h +++ b/src/3rdparty/phonon/ds9/iodevicereader.h @@ -41,7 +41,6 @@ namespace Phonon public: IODeviceReader(const MediaSource &source, const MediaGraph *); ~IODeviceReader(); - STDMETHODIMP Stop(); private: StreamReader *m_streamReader; diff --git a/src/3rdparty/phonon/ds9/mediagraph.cpp b/src/3rdparty/phonon/ds9/mediagraph.cpp index db0ec84..3e7a68b 100644 --- a/src/3rdparty/phonon/ds9/mediagraph.cpp +++ b/src/3rdparty/phonon/ds9/mediagraph.cpp @@ -68,6 +68,8 @@ namespace Phonon return ret; } + +/* static HRESULT saveToFile(Graph graph, const QString &filepath) { const WCHAR wszStreamName[] = L"ActiveMovieGraph"; @@ -103,7 +105,7 @@ namespace Phonon return hr; } - +*/ MediaGraph::MediaGraph(MediaObject *mo, short index) : m_graph(CLSID_FilterGraph, IID_IGraphBuilder), @@ -377,11 +379,12 @@ namespace Phonon FILTER_INFO info; filter->QueryFilterInfo(&info); #ifdef GRAPH_DEBUG - qDebug() << "removeFilter" << QString::fromUtf16(info.achName); + qDebug() << "removeFilter" << QString((const QChar *)info.achName); #endif if (info.pGraph) { info.pGraph->Release(); - return m_graph->RemoveFilter(filter); + if (info.pGraph == m_graph) + return m_graph->RemoveFilter(filter); } //already removed @@ -537,11 +540,11 @@ namespace Phonon const QList outputs = BackendNode::pins(filter, PINDIR_OUTPUT); for(int i = 0; i < outputs.count(); ++i) { const OutputPin &pin = outputs.at(i); - if (VFW_E_NOT_CONNECTED == pin->ConnectedTo(inPin.pparam())) { + if (HRESULT(VFW_E_NOT_CONNECTED) == pin->ConnectedTo(inPin.pparam())) { return SUCCEEDED(pin->Connect(newIn, 0)); } } - //we should never go here + //we shoud never go here return false; } else { QAMMediaType type; @@ -679,7 +682,6 @@ namespace Phonon #ifndef QT_NO_PHONON_MEDIACONTROLLER } else if (source.discType() == Phonon::Cd) { m_realSource = Filter(new QAudioCDPlayer); - m_result = m_graph->AddFilter(m_realSource, 0); #endif //QT_NO_PHONON_MEDIACONTROLLER } else { @@ -809,7 +811,7 @@ namespace Phonon for (int i = 0; i < outputs.count(); ++i) { const OutputPin &out = outputs.at(i); InputPin pin; - if (out->ConnectedTo(pin.pparam()) == VFW_E_NOT_CONNECTED) { + if (out->ConnectedTo(pin.pparam()) == HRESULT(VFW_E_NOT_CONNECTED)) { m_decoderPins += out; //unconnected outputs can be decoded outputs } } @@ -820,7 +822,7 @@ namespace Phonon //let's reestablish the connections for (int i = 0; i < connections.count(); ++i) { const GraphConnection &connection = connections.at(i); - //check if we should transfer the sink node + //check if we shoud transfer the sink node grabFilter(connection.input); grabFilter(connection.output); @@ -873,7 +875,7 @@ namespace Phonon { FILTER_INFO info; filter->QueryFilterInfo(&info); - qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName); + qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName); if (info.pGraph) { info.pGraph->Release(); } @@ -919,7 +921,7 @@ namespace Phonon { FILTER_INFO info; filter->QueryFilterInfo(&info); - qDebug() << "found a decoder filter" << QString::fromUtf16(info.achName); + qDebug() << "found a decoder filter" << QString((const QChar *)info.achName); if (info.pGraph) { info.pGraph->Release(); } @@ -935,7 +937,7 @@ namespace Phonon { FILTER_INFO info; filter->QueryFilterInfo(&info); - qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName); + qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName); if (info.pGraph) { info.pGraph->Release(); } @@ -954,7 +956,7 @@ namespace Phonon { FILTER_INFO info; filter->QueryFilterInfo(&info); - qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName); + qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName); if (info.pGraph) { info.pGraph->Release(); } @@ -988,7 +990,7 @@ namespace Phonon { FILTER_INFO info; filter->QueryFilterInfo(&info); - qDebug() << "found a demuxer filter" << QString::fromUtf16(info.achName); + qDebug() << "found a demuxer filter" << QString((const QChar *)info.achName); if (info.pGraph) { info.pGraph->Release(); } @@ -1006,27 +1008,27 @@ namespace Phonon BSTR str; HRESULT hr = mediaContent->get_AuthorName(&str); if (SUCCEEDED(hr)) { - ret.insert(QLatin1String("ARTIST"), QString::fromUtf16((const unsigned short*)str)); + ret.insert(QLatin1String("ARTIST"), QString::fromWCharArray(str)); SysFreeString(str); } hr = mediaContent->get_Title(&str); if (SUCCEEDED(hr)) { - ret.insert(QLatin1String("TITLE"), QString::fromUtf16((const unsigned short*)str)); + ret.insert(QLatin1String("TITLE"), QString::fromWCharArray(str)); SysFreeString(str); } hr = mediaContent->get_Description(&str); if (SUCCEEDED(hr)) { - ret.insert(QLatin1String("DESCRIPTION"), QString::fromUtf16((const unsigned short*)str)); + ret.insert(QLatin1String("DESCRIPTION"), QString::fromWCharArray(str)); SysFreeString(str); } hr = mediaContent->get_Copyright(&str); if (SUCCEEDED(hr)) { - ret.insert(QLatin1String("COPYRIGHT"), QString::fromUtf16((const unsigned short*)str)); + ret.insert(QLatin1String("COPYRIGHT"), QString::fromWCharArray(str)); SysFreeString(str); } hr = mediaContent->get_MoreInfoText(&str); if (SUCCEEDED(hr)) { - ret.insert(QLatin1String("MOREINFO"), QString::fromUtf16((const unsigned short*)str)); + ret.insert(QLatin1String("MOREINFO"), QString::fromWCharArray(str)); SysFreeString(str); } } diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index b9a8713..34f92c2 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -23,13 +23,10 @@ along with this library. If not, see . #ifndef Q_CC_MSVC #include -#endif //Q_CC_MSVC +#endif #include #include #include -#ifdef Q_CC_MSVC -# include -#endif #include #include "mediaobject.h" @@ -52,7 +49,7 @@ namespace Phonon //first the definition of the WorkerThread class WorkerThread::WorkerThread() - : QThread(), m_currentRenderId(0), m_finished(false), m_currentWorkId(1) + : QThread(), m_finished(false), m_currentWorkId(1) { } @@ -60,24 +57,6 @@ namespace Phonon { } - WorkerThread::Work WorkerThread::dequeueWork() - { - QMutexLocker locker(&m_mutex); - if (m_finished) { - return Work(); - } - Work ret = m_queue.dequeue(); - - //we ensure to have the wait condition in the right state - if (m_queue.isEmpty()) { - m_waitCondition.reset(); - } else { - m_waitCondition.set(); - } - - return ret; - } - void WorkerThread::run() { while (m_finished == false) { @@ -91,11 +70,6 @@ namespace Phonon } DWORD result = ::WaitForMultipleObjects(count, handles, FALSE, INFINITE); if (result == WAIT_OBJECT_0) { - if (m_finished) { - //that's the end of the thread execution - return; - } - handleTask(); } else { //this is the event management @@ -183,6 +157,7 @@ namespace Phonon //we create a new graph w.graph = Graph(CLSID_FilterGraph, IID_IGraphBuilder); w.filter = filter; + w.graph->AddFilter(filter, 0); w.id = m_currentWorkId++; m_queue.enqueue(w); m_waitCondition.set(); @@ -202,23 +177,29 @@ namespace Phonon void WorkerThread::handleTask() { - const Work w = dequeueWork(); + QMutexLocker locker(Backend::directShowMutex); + { + QMutexLocker locker(&m_mutex); + if (m_finished || m_queue.isEmpty()) { + return; + } - if (m_finished) { - return; + m_currentWork = m_queue.dequeue(); + + //we ensure to have the wait condition in the right state + if (m_queue.isEmpty()) { + m_waitCondition.reset(); + } else { + m_waitCondition.set(); + } } HRESULT hr = S_OK; - m_currentRender = w.graph; - m_currentRenderId = w.id; - if (w.task == ReplaceGraph) { - QMutexLocker locker(&m_mutex); - HANDLE h; - + if (m_currentWork.task == ReplaceGraph) { int index = -1; for(int i = 0; i < FILTER_COUNT; ++i) { - if (m_graphHandle[i].graph == w.oldGraph) { + if (m_graphHandle[i].graph == m_currentWork.oldGraph) { m_graphHandle[i].graph = Graph(); index = i; break; @@ -231,51 +212,40 @@ namespace Phonon Q_ASSERT(index != -1); //add the new graph - if (SUCCEEDED(ComPointer(w.graph, IID_IMediaEvent) + HANDLE h; + if (SUCCEEDED(ComPointer(m_currentWork.graph, IID_IMediaEvent) ->GetEventHandle(reinterpret_cast(&h)))) { - m_graphHandle[index].graph = w.graph; + m_graphHandle[index].graph = m_currentWork.graph; m_graphHandle[index].handle = h; } - } else if (w.task == Render) { - if (w.filter) { + } else if (m_currentWork.task == Render) { + if (m_currentWork.filter) { //let's render pins - w.graph->AddFilter(w.filter, 0); - const QList outputs = BackendNode::pins(w.filter, PINDIR_OUTPUT); - for (int i = 0; i < outputs.count(); ++i) { - //blocking call - hr = w.graph->Render(outputs.at(i)); - if (FAILED(hr)) { - break; - } + const QList outputs = BackendNode::pins(m_currentWork.filter, PINDIR_OUTPUT); + for (int i = 0; SUCCEEDED(hr) && i < outputs.count(); ++i) { + hr = m_currentWork.graph->Render(outputs.at(i)); } - } else if (!w.url.isEmpty()) { + } else if (!m_currentWork.url.isEmpty()) { //let's render a url (blocking call) - hr = w.graph->RenderFile(reinterpret_cast(w.url.utf16()), 0); + hr = m_currentWork.graph->RenderFile(reinterpret_cast(m_currentWork.url.utf16()), 0); } if (hr != E_ABORT) { - emit asyncRenderFinished(w.id, hr, w.graph); + emit asyncRenderFinished(m_currentWork.id, hr, m_currentWork.graph); } - } else if (w.task == Seek) { + } else if (m_currentWork.task == Seek) { //that's a seekrequest - ComPointer mediaSeeking(w.graph, IID_IMediaSeeking); - qint64 newtime = w.time * 10000; + ComPointer mediaSeeking(m_currentWork.graph, IID_IMediaSeeking); + qint64 newtime = m_currentWork.time * 10000; hr = mediaSeeking->SetPositions(&newtime, AM_SEEKING_AbsolutePositioning, 0, AM_SEEKING_NoPositioning); - qint64 currentTime = -1; - if (SUCCEEDED(hr)) { - hr = mediaSeeking->GetCurrentPosition(¤tTime); - if (SUCCEEDED(hr)) { - currentTime /= 10000; //convert to ms - } - } - emit asyncSeekingFinished(w.id, currentTime); + emit asyncSeekingFinished(m_currentWork.id, newtime / 10000); hr = E_ABORT; //to avoid emitting asyncRenderFinished - } else if (w.task == ChangeState) { + } else if (m_currentWork.task == ChangeState) { //remove useless decoders QList unused; - for (int i = 0; i < w.decoders.count(); ++i) { - const Filter &filter = w.decoders.at(i); + for (int i = 0; i < m_currentWork.decoders.count(); ++i) { + const Filter &filter = m_currentWork.decoders.at(i); bool used = false; const QList pins = BackendNode::pins(filter, PINDIR_OUTPUT); for( int i = 0; i < pins.count(); ++i) { @@ -292,15 +262,15 @@ namespace Phonon //we can get the state for (int i = 0; i < unused.count(); ++i) { //we should remove this filter from the graph - w.graph->RemoveFilter(unused.at(i)); + m_currentWork.graph->RemoveFilter(unused.at(i)); } //we can get the state - ComPointer mc(w.graph, IID_IMediaControl); + ComPointer mc(m_currentWork.graph, IID_IMediaControl); //we change the state here - switch(w.state) + switch(m_currentWork.state) { case State_Stopped: mc->Stop(); @@ -318,36 +288,38 @@ namespace Phonon if (SUCCEEDED(hr)) { if (s == State_Stopped) { - emit stateReady(w.graph, Phonon::StoppedState); + emit stateReady(m_currentWork.graph, Phonon::StoppedState); } else if (s == State_Paused) { - emit stateReady(w.graph, Phonon::PausedState); + emit stateReady(m_currentWork.graph, Phonon::PausedState); } else /*if (s == State_Running)*/ { - emit stateReady(w.graph, Phonon::PlayingState); + emit stateReady(m_currentWork.graph, Phonon::PlayingState); } } } - m_currentRender = Graph(); - m_currentRenderId = 0; - + { + QMutexLocker locker(&m_mutex); + m_currentWork = Work(); //reinitialize + } } - void WorkerThread::abortCurrentRender(qint16 renderId) - { + void WorkerThread::abortCurrentRender(qint16 renderId) + { QMutexLocker locker(&m_mutex); + if (m_currentWork.id == renderId) { + m_currentWork.graph->Abort(); + } bool found = false; - //we try to see if there is already an attempt to seek and we remove it for(int i = 0; !found && i < m_queue.size(); ++i) { const Work &w = m_queue.at(i); if (w.id == renderId) { found = true; m_queue.removeAt(i); + if (m_queue.isEmpty()) { + m_waitCondition.reset(); + } } } - - if (m_currentRender && m_currentRenderId == renderId) { - m_currentRender->Abort(); - } } //tells the thread to stop processing @@ -355,9 +327,9 @@ namespace Phonon { QMutexLocker locker(&m_mutex); m_queue.clear(); - if (m_currentRender) { + if (m_currentWork.graph) { //in case we're currently rendering something - m_currentRender->Abort(); + m_currentWork.graph->Abort(); } @@ -389,17 +361,17 @@ namespace Phonon m_graphs[i] = new MediaGraph(this, i); } - connect(&m_thread, SIGNAL(stateReady(Graph, Phonon::State)), - SLOT(slotStateReady(Graph, Phonon::State))); + connect(&m_thread, SIGNAL(stateReady(Graph,Phonon::State)), + SLOT(slotStateReady(Graph,Phonon::State))); - connect(&m_thread, SIGNAL(eventReady(Graph, long, long)), - SLOT(handleEvents(Graph, long, long))); + connect(&m_thread, SIGNAL(eventReady(Graph,long,long)), + SLOT(handleEvents(Graph,long,long))); - connect(&m_thread, SIGNAL(asyncRenderFinished(quint16, HRESULT, Graph)), - SLOT(finishLoading(quint16, HRESULT, Graph))); + connect(&m_thread, SIGNAL(asyncRenderFinished(quint16,HRESULT,Graph)), + SLOT(finishLoading(quint16,HRESULT,Graph))); - connect(&m_thread, SIGNAL(asyncSeekingFinished(quint16, qint64)), - SLOT(finishSeeking(quint16, qint64))); + connect(&m_thread, SIGNAL(asyncSeekingFinished(quint16,qint64)), + SLOT(finishSeeking(quint16,qint64))); //really special case m_mediaObject = this; m_thread.start(); @@ -522,6 +494,18 @@ namespace Phonon qSwap(m_graphs[0], m_graphs[1]); //swap the graphs + if (m_transitionTime >= 0) + m_graphs[1]->stop(); //make sure we stop the previous graph + + if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid && + catchComError(currentGraph()->renderResult())) { + setState(Phonon::ErrorState); + return; + } + + //we need to play the next media + play(); + //we tell the video widgets to switch now to the new source #ifndef QT_NO_PHONON_VIDEO for (int i = 0; i < m_videoWidgets.count(); ++i) { @@ -530,15 +514,6 @@ namespace Phonon #endif //QT_NO_PHONON_VIDEO emit currentSourceChanged(currentGraph()->mediaSource()); - - if (currentGraph()->isLoading()) { - //will simply tell that when loading is finished - //it should start the playback - play(); - } - - - emit metaDataChanged(currentGraph()->metadata()); if (nextGraph()->hasVideo() != currentGraph()->hasVideo()) { @@ -551,15 +526,6 @@ namespace Phonon #ifndef QT_NO_PHONON_MEDIACONTROLLER setTitles(currentGraph()->titles()); #endif //QT_NO_PHONON_MEDIACONTROLLER - - //this manages only gapless transitions - if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid) { - if (catchComError(currentGraph()->renderResult())) { - setState(Phonon::ErrorState); - } else { - play(); - } - } } Phonon::State MediaObject::state() const @@ -794,15 +760,16 @@ namespace Phonon case Phonon::PausedState: pause(); break; - case Phonon::StoppedState: - stop(); - break; case Phonon::PlayingState: play(); break; case Phonon::ErrorState: setState(Phonon::ErrorState); break; + case Phonon::StoppedState: + default: + stop(); + break; } } } @@ -850,13 +817,11 @@ namespace Phonon #endif LPAMGETERRORTEXT getErrorText = (LPAMGETERRORTEXT)QLibrary::resolve(QLatin1String("quartz"), "AMGetErrorTextW"); - ushort buffer[MAX_ERROR_TEXT_LEN]; - if (getErrorText && getErrorText(hr, (WCHAR*)buffer, MAX_ERROR_TEXT_LEN)) { - m_errorString = QString::fromUtf16(buffer); -#ifdef Q_CC_MSVC + WCHAR buffer[MAX_ERROR_TEXT_LEN]; + if (getErrorText && getErrorText(hr, buffer, MAX_ERROR_TEXT_LEN)) { + m_errorString = QString::fromWCharArray(buffer); } else { - m_errorString = QString::fromUtf16((ushort*)_com_error(hr).ErrorMessage()); -#endif + m_errorString = QString::fromLatin1("Unknown error"); } const QString comError = QString::number(uint(hr), 16); if (!m_errorString.toLower().contains(comError.toLower())) { diff --git a/src/3rdparty/phonon/ds9/mediaobject.h b/src/3rdparty/phonon/ds9/mediaobject.h index 2c34ffc..34aa666 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.h +++ b/src/3rdparty/phonon/ds9/mediaobject.h @@ -114,6 +114,7 @@ namespace Phonon enum Task { + None, Render, Seek, ChangeState, @@ -122,6 +123,7 @@ namespace Phonon struct Work { + Work() : task(None), id(0), time(0) { } Task task; quint16 id; Graph graph; @@ -135,16 +137,14 @@ namespace Phonon }; QList decoders; //for the state change requests }; - Work dequeueWork(); void handleTask(); - Graph m_currentRender; - qint16 m_currentRenderId; + Work m_currentWork; QQueue m_queue; bool m_finished; quint16 m_currentWorkId; QWinWaitCondition m_waitCondition; - QMutex m_mutex; + QMutex m_mutex; // mutex for the m_queue, m_finished and m_currentWorkId //this is for WaitForMultipleObjects struct diff --git a/src/3rdparty/phonon/ds9/qasyncreader.cpp b/src/3rdparty/phonon/ds9/qasyncreader.cpp index 68ec1f8..a3f9cda 100644 --- a/src/3rdparty/phonon/ds9/qasyncreader.cpp +++ b/src/3rdparty/phonon/ds9/qasyncreader.cpp @@ -15,8 +15,6 @@ You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ -#include - #include "qasyncreader.h" #include "qbasefilter.h" @@ -80,8 +78,7 @@ namespace Phonon STDMETHODIMP QAsyncReader::Request(IMediaSample *sample,DWORD_PTR user) { - QMutexLocker mutexLocker(&m_mutexWait); - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (m_flushing) { return VFW_E_WRONG_STATE; } @@ -93,33 +90,28 @@ namespace Phonon STDMETHODIMP QAsyncReader::WaitForNext(DWORD timeout, IMediaSample **sample, DWORD_PTR *user) { - QMutexLocker locker(&m_mutexWait); + QMutexLocker locker(&m_mutex); if (!sample ||!user) { return E_POINTER; } + //msdn says to return immediately if we're flushing but that doesn't seem to be true + //since it triggers a dead-lock somewhere inside directshow (see task 258830) + *sample = 0; *user = 0; - AsyncRequest r = getNextRequest(); - - if (r.sample == 0) { - //there is no request in the queue - if (isFlushing()) { + if (m_requestQueue.isEmpty()) { + if (m_requestWait.wait(&m_mutex, timeout) == false) { + return VFW_E_TIMEOUT; + } + if (m_requestQueue.isEmpty()) { return VFW_E_WRONG_STATE; - } else { - //First we need to lock the mutex - if (m_requestWait.wait(&m_mutexWait, timeout) == false) { - return VFW_E_TIMEOUT; - } - if (isFlushing()) { - return VFW_E_WRONG_STATE; - } - - r = getNextRequest(); } } + AsyncRequest r = m_requestQueue.dequeue(); + //at this point we're sure to have a request to proceed if (r.sample == 0) { return E_FAIL; @@ -127,14 +119,12 @@ namespace Phonon *sample = r.sample; *user = r.user; - - return SyncReadAligned(r.sample); + return syncReadAlignedUnlocked(r.sample); } STDMETHODIMP QAsyncReader::BeginFlush() { - QMutexLocker mutexLocker(&m_mutexWait); - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_flushing = true; m_requestWait.wakeOne(); return S_OK; @@ -142,13 +132,28 @@ namespace Phonon STDMETHODIMP QAsyncReader::EndFlush() { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_flushing = false; return S_OK; } STDMETHODIMP QAsyncReader::SyncReadAligned(IMediaSample *sample) { + QMutexLocker locker(&m_mutex); + return syncReadAlignedUnlocked(sample); + } + + STDMETHODIMP QAsyncReader::SyncRead(LONGLONG pos, LONG length, BYTE *buffer) + { + QMutexLocker locker(&m_mutex); + return read(pos, length, buffer, 0); + } + + + STDMETHODIMP QAsyncReader::syncReadAlignedUnlocked(IMediaSample *sample) + { + Q_ASSERT(!m_mutex.tryLock()); + if (!sample) { return E_POINTER; } @@ -175,23 +180,6 @@ namespace Phonon return sample->SetActualDataLength(actual); } - STDMETHODIMP QAsyncReader::SyncRead(LONGLONG pos, LONG length, BYTE *buffer) - { - return read(pos, length, buffer, 0); - } - - - //addition - QAsyncReader::AsyncRequest QAsyncReader::getNextRequest() - { - QWriteLocker locker(&m_lock); - AsyncRequest ret; - if (!m_requestQueue.isEmpty()) { - ret = m_requestQueue.dequeue(); - } - - return ret; - } } } diff --git a/src/3rdparty/phonon/ds9/qasyncreader.h b/src/3rdparty/phonon/ds9/qasyncreader.h index cb789ee..95872f9 100644 --- a/src/3rdparty/phonon/ds9/qasyncreader.h +++ b/src/3rdparty/phonon/ds9/qasyncreader.h @@ -48,11 +48,12 @@ namespace Phonon STDMETHODIMP WaitForNext(DWORD,IMediaSample **,DWORD_PTR *); STDMETHODIMP SyncReadAligned(IMediaSample *); STDMETHODIMP SyncRead(LONGLONG,LONG,BYTE *); - virtual STDMETHODIMP Length(LONGLONG *,LONGLONG *) = 0; + STDMETHODIMP Length(LONGLONG *,LONGLONG *) = 0; STDMETHODIMP BeginFlush(); STDMETHODIMP EndFlush(); protected: + STDMETHODIMP syncReadAlignedUnlocked(IMediaSample *); virtual HRESULT read(LONGLONG pos, LONG length, BYTE *buffer, LONG *actual) = 0; private: @@ -62,9 +63,6 @@ namespace Phonon IMediaSample *sample; DWORD_PTR user; }; - AsyncRequest getNextRequest(); - - QMutex m_mutexWait; QQueue m_requestQueue; QWaitCondition m_requestWait; diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp index b9f9fd6..6d0f335 100644 --- a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp +++ b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp @@ -103,8 +103,8 @@ namespace Phonon private: HANDLE m_cddrive; - CDROM_TOC *m_toc; - WaveStructure *m_waveHeader; + CDROM_TOC m_toc; + WaveStructure m_waveHeader; qint64 m_trackAddress; }; @@ -112,19 +112,8 @@ namespace Phonon #define SECTOR_SIZE 2352 #define NB_SECTORS_READ 20 - static AM_MEDIA_TYPE getAudioCDMediaType() - { - AM_MEDIA_TYPE mt; - qMemSet(&mt, 0, sizeof(AM_MEDIA_TYPE)); - mt.majortype = MEDIATYPE_Stream; - mt.subtype = MEDIASUBTYPE_WAVE; - mt.bFixedSizeSamples = TRUE; - mt.bTemporalCompression = FALSE; - mt.lSampleSize = 1; - mt.formattype = GUID_NULL; - return mt; - } - + static const AM_MEDIA_TYPE audioCDMediaType = { MEDIATYPE_Stream, MEDIASUBTYPE_WAVE, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0}; + int addressToSectors(UCHAR address[4]) { return ((address[0] * 60 + address[1]) * 60 + address[2]) * 75 + address[3] - 150; @@ -141,11 +130,8 @@ namespace Phonon } - QAudioCDReader::QAudioCDReader(QBaseFilter *parent, QChar drive) : QAsyncReader(parent, QVector() << getAudioCDMediaType()) + QAudioCDReader::QAudioCDReader(QBaseFilter *parent, QChar drive) : QAsyncReader(parent, QVector() << audioCDMediaType) { - m_toc = new CDROM_TOC; - m_waveHeader = new WaveStructure; - //now open the cd-drive QString path; if (drive.isNull()) { @@ -154,36 +140,30 @@ namespace Phonon path = QString::fromLatin1("\\\\.\\%1:").arg(drive); } - m_cddrive = QT_WA_INLINE ( - ::CreateFile( (TCHAR*)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ), - ::CreateFileA( path.toLocal8Bit().constData(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ) - ); + m_cddrive = ::CreateFile((const wchar_t *)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - qMemSet(m_toc, 0, sizeof(CDROM_TOC)); + qMemSet(&m_toc, 0, sizeof(CDROM_TOC)); //read the TOC DWORD bytesRead = 0; - bool tocRead = ::DeviceIoControl(m_cddrive, IOCTL_CDROM_READ_TOC, 0, 0, m_toc, sizeof(CDROM_TOC), &bytesRead, 0); + bool tocRead = ::DeviceIoControl(m_cddrive, IOCTL_CDROM_READ_TOC, 0, 0, &m_toc, sizeof(CDROM_TOC), &bytesRead, 0); if (!tocRead) { qWarning("unable to load the TOC from the CD"); return; } - m_trackAddress = addressToSectors(m_toc->TrackData[0].Address); - const qint32 nbSectorsToRead = (addressToSectors(m_toc->TrackData[m_toc->LastTrack + 1 - m_toc->FirstTrack].Address) + m_trackAddress = addressToSectors(m_toc.TrackData[0].Address); + const qint32 nbSectorsToRead = (addressToSectors(m_toc.TrackData[m_toc.LastTrack + 1 - m_toc.FirstTrack].Address) - m_trackAddress); const qint32 dataLength = nbSectorsToRead * SECTOR_SIZE; - m_waveHeader->chunksize = 4 + (8 + m_waveHeader->chunksize2) + (8 + dataLength); - m_waveHeader->dataLength = dataLength; + m_waveHeader.chunksize = 4 + (8 + m_waveHeader.chunksize2) + (8 + dataLength); + m_waveHeader.dataLength = dataLength; } QAudioCDReader::~QAudioCDReader() { ::CloseHandle(m_cddrive); - delete m_toc; - delete m_waveHeader; - } STDMETHODIMP_(ULONG) QAudioCDReader::AddRef() @@ -199,7 +179,7 @@ namespace Phonon STDMETHODIMP QAudioCDReader::Length(LONGLONG *total,LONGLONG *available) { - const LONGLONG length = sizeof(WaveStructure) + m_waveHeader->dataLength; + const LONGLONG length = sizeof(WaveStructure) + m_waveHeader.dataLength; if (total) { *total = length; } @@ -238,11 +218,11 @@ namespace Phonon if (pos < sizeof(WaveStructure)) { //we first copy the content of the structure nbRead = qMin(LONG(sizeof(WaveStructure) - pos), length); - qMemCopy(buffer, reinterpret_cast(m_waveHeader) + pos, nbRead); + qMemCopy(buffer, reinterpret_cast(&m_waveHeader) + pos, nbRead); } const LONGLONG posInTrack = pos - sizeof(WaveStructure) + nbRead; - const int bytesLeft = qMin(m_waveHeader->dataLength - posInTrack, LONGLONG(length - nbRead)); + const int bytesLeft = qMin(m_waveHeader.dataLength - posInTrack, LONGLONG(length - nbRead)); if (bytesLeft > 0) { @@ -297,8 +277,8 @@ namespace Phonon { QList ret; ret << 0; - for(int i = m_toc->FirstTrack; i <= m_toc->LastTrack ; ++i) { - const uchar *address = m_toc->TrackData[i].Address; + for(int i = m_toc.FirstTrack; i <= m_toc.LastTrack ; ++i) { + const uchar *address = m_toc.TrackData[i].Address; ret << ((address[0] * 60 + address[1]) * 60 + address[2]) * 1000 + address[3]*1000/75 - 2000; } diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.h b/src/3rdparty/phonon/ds9/qaudiocdreader.h index 9049b66..eff845d 100644 --- a/src/3rdparty/phonon/ds9/qaudiocdreader.h +++ b/src/3rdparty/phonon/ds9/qaudiocdreader.h @@ -31,7 +31,7 @@ namespace Phonon { struct CDROM_TOC; struct WaveStructure; - extern const IID IID_ITitleInterface; + EXTERN_C const IID IID_ITitleInterface; //interface for the Titles struct ITitleInterface : public IUnknown diff --git a/src/3rdparty/phonon/ds9/qbasefilter.cpp b/src/3rdparty/phonon/ds9/qbasefilter.cpp index 95cab92..78b8b8f 100644 --- a/src/3rdparty/phonon/ds9/qbasefilter.cpp +++ b/src/3rdparty/phonon/ds9/qbasefilter.cpp @@ -92,8 +92,8 @@ namespace Phonon return E_POINTER; } - int nbfetched = 0; - while (nbfetched < int(count) && m_index < m_pins.count()) { + uint nbfetched = 0; + while (nbfetched < count && m_index < m_pins.count()) { IPin *current = m_pins[m_index]; current->AddRef(); ret[nbfetched] = current; @@ -166,19 +166,19 @@ namespace Phonon const QList QBaseFilter::pins() const { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); return m_pins; } void QBaseFilter::addPin(QPin *pin) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_pins.append(pin); } void QBaseFilter::removePin(QPin *pin) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_pins.removeAll(pin); } @@ -211,7 +211,8 @@ namespace Phonon } else if (iid == IID_IMediaPosition || iid == IID_IMediaSeeking) { if (inputPins().isEmpty()) { - if (*out = getUpStreamInterface(iid)) { + *out = getUpStreamInterface(iid); + if (*out) { return S_OK; //we return here to avoid adding a reference } else { hr = E_NOINTERFACE; @@ -250,35 +251,35 @@ namespace Phonon STDMETHODIMP QBaseFilter::GetClassID(CLSID *clsid) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); *clsid = m_clsid; return S_OK; } STDMETHODIMP QBaseFilter::Stop() { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_state = State_Stopped; return S_OK; } STDMETHODIMP QBaseFilter::Pause() { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_state = State_Paused; return S_OK; } STDMETHODIMP QBaseFilter::Run(REFERENCE_TIME) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_state = State_Running; return S_OK; } STDMETHODIMP QBaseFilter::GetState(DWORD, FILTER_STATE *state) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (!state) { return E_POINTER; } @@ -289,7 +290,7 @@ namespace Phonon STDMETHODIMP QBaseFilter::SetSyncSource(IReferenceClock *clock) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (clock) { clock->AddRef(); } @@ -302,7 +303,7 @@ namespace Phonon STDMETHODIMP QBaseFilter::GetSyncSource(IReferenceClock **clock) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (!clock) { return E_POINTER; } @@ -341,7 +342,7 @@ namespace Phonon STDMETHODIMP QBaseFilter::QueryFilterInfo(FILTER_INFO *info ) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (!info) { return E_POINTER; } @@ -355,9 +356,9 @@ namespace Phonon STDMETHODIMP QBaseFilter::JoinFilterGraph(IFilterGraph *graph, LPCWSTR name) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_graph = graph; - m_name = QString::fromUtf16((const unsigned short*)name); + m_name = QString::fromWCharArray(name); return S_OK; } diff --git a/src/3rdparty/phonon/ds9/qbasefilter.h b/src/3rdparty/phonon/ds9/qbasefilter.h index 85f1431..a72d6fe 100644 --- a/src/3rdparty/phonon/ds9/qbasefilter.h +++ b/src/3rdparty/phonon/ds9/qbasefilter.h @@ -22,7 +22,7 @@ along with this library. If not, see . #include #include -#include +#include #include @@ -127,7 +127,7 @@ namespace Phonon IFilterGraph *m_graph; FILTER_STATE m_state; QList m_pins; - mutable QReadWriteLock m_lock; + mutable QMutex m_mutex; }; } } diff --git a/src/3rdparty/phonon/ds9/qevr9.h b/src/3rdparty/phonon/ds9/qevr9.h new file mode 100644 index 0000000..8599fce --- /dev/null +++ b/src/3rdparty/phonon/ds9/qevr9.h @@ -0,0 +1,143 @@ +/* This file is part of the KDE project. + +Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + +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 or 3 of the License. + +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, see . +*/ + +#include + +#define DXVA2_ProcAmp_Brightness 1 +#define DXVA2_ProcAmp_Contrast 2 +#define DXVA2_ProcAmp_Hue 4 +#define DXVA2_ProcAmp_Saturation 8 + +typedef enum { + MFVideoARMode_None = 0x00000000, + MFVideoARMode_PreservePicture = 0x00000001, + MFVideoARMode_PreservePixel = 0x00000002, + MFVideoARMode_NonLinearStretch = 0x00000004, + MFVideoARMode_Mask = 0x00000007 +} MFVideoAspectRatioMode; + +typedef struct { + float left; + float top; + float right; + float bottom; +} MFVideoNormalizedRect; + +typedef struct { + UINT DeviceCaps; + D3DPOOL InputPool; + UINT NumForwardRefSamples; + UINT NumBackwardRefSamples; + UINT Reserved; + UINT DeinterlaceTechnology; + UINT ProcAmpControlCaps; + UINT VideoProcessorOperations; + UINT NoiseFilterTechnology; + UINT DetailFilterTechnology; +} DXVA2_VideoProcessorCaps; + +typedef struct { + union { + struct { + USHORT Fraction; + SHORT Value; + }; + LONG ll; + }; +} DXVA2_Fixed32; + +typedef struct { + DXVA2_Fixed32 MinValue; + DXVA2_Fixed32 MaxValue; + DXVA2_Fixed32 DefaultValue; + DXVA2_Fixed32 StepSize; +} DXVA2_ValueRange; + +typedef struct { + DXVA2_Fixed32 Brightness; + DXVA2_Fixed32 Contrast; + DXVA2_Fixed32 Hue; + DXVA2_Fixed32 Saturation; +} DXVA2_ProcAmpValues; + +DXVA2_Fixed32 DXVA2FloatToFixed(const float _float_) +{ + DXVA2_Fixed32 _fixed_; + _fixed_.Fraction = LOWORD(_float_ * 0x10000); + _fixed_.Value = HIWORD(_float_ * 0x10000); + return _fixed_; +} + +float DXVA2FixedToFloat(const DXVA2_Fixed32 _fixed_) +{ + return (FLOAT)_fixed_.Value + (FLOAT)_fixed_.Fraction / 0x10000; +} + +#undef INTERFACE +#define INTERFACE IMFVideoDisplayControl +DECLARE_INTERFACE_(IMFVideoDisplayControl, IUnknown) +{ + STDMETHOD(GetNativeVideoSize)(THIS_ SIZE* pszVideo, SIZE* pszARVideo) PURE; + STDMETHOD(GetIdealVideoSize)(THIS_ SIZE* pszMin, SIZE* pszMax) PURE; + STDMETHOD(SetVideoPosition)(THIS_ const MFVideoNormalizedRect* pnrcSource, const LPRECT prcDest) PURE; + STDMETHOD(GetVideoPosition)(THIS_ MFVideoNormalizedRect* pnrcSource, LPRECT prcDest) PURE; + STDMETHOD(SetAspectRatioMode)(THIS_ DWORD dwAspectRatioMode) PURE; + STDMETHOD(GetAspectRatioMode)(THIS_ DWORD* pdwAspectRatioMode) PURE; + STDMETHOD(SetVideoWindow)(THIS_ HWND hwndVideo) PURE; + STDMETHOD(GetVideoWindow)(THIS_ HWND* phwndVideo) PURE; + STDMETHOD(RepaintVideo)(THIS_) PURE; + STDMETHOD(GetCurrentImage)(THIS_ BITMAPINFOHEADER* pBih, BYTE** pDib, DWORD* pcbDib, LONGLONG* pTimeStamp) PURE; + STDMETHOD(SetBorderColor)(THIS_ COLORREF Clr) PURE; + STDMETHOD(GetBorderColor)(THIS_ COLORREF* pClr) PURE; + STDMETHOD(SetRenderingPrefs)(THIS_ DWORD dwRenderFlags) PURE; + STDMETHOD(GetRenderingPrefs)(THIS_ DWORD* pdwRenderFlags) PURE; + STDMETHOD(SetFullScreen)(THIS_ BOOL fFullscreen) PURE; + STDMETHOD(GetFullScreen)(THIS_ BOOL* pfFullscreen) PURE; +}; +#undef INTERFACE +#define INTERFACE IMFVideoMixerControl +DECLARE_INTERFACE_(IMFVideoMixerControl, IUnknown) +{ + STDMETHOD(SetStreamZOrder)(THIS_ DWORD dwStreamID, DWORD dwZ) PURE; + STDMETHOD(GetStreamZOrder)(THIS_ DWORD dwStreamID, DWORD* pdwZ) PURE; + STDMETHOD(SetStreamOutputRect)(THIS_ DWORD dwStreamID, const MFVideoNormalizedRect* pnrcOutput) PURE; + STDMETHOD(GetStreamOutputRect)(THIS_ DWORD dwStreamID, MFVideoNormalizedRect* pnrcOutput) PURE; +}; +#undef INTERFACE +#define INTERFACE IMFVideoProcessor +DECLARE_INTERFACE_(IMFVideoProcessor, IUnknown) +{ + STDMETHOD(GetAvailableVideoProcessorModes)(THIS_ UINT* lpdwNumProcessingModes, GUID** ppVideoProcessingModes) PURE; + STDMETHOD(GetVideoProcessorCaps)(THIS_ LPGUID lpVideoProcessorMode, DXVA2_VideoProcessorCaps* lpVideoProcessorCaps) PURE; + STDMETHOD(GetVideoProcessorMode)(THIS_ LPGUID lpMode) PURE; + STDMETHOD(SetVideoProcessorMode)(THIS_ LPGUID lpMode) PURE; + STDMETHOD(GetProcAmpRange)(THIS_ DWORD dwProperty, DXVA2_ValueRange* pPropRange) PURE; + STDMETHOD(GetProcAmpValues)(THIS_ DWORD dwFlags, DXVA2_ProcAmpValues* Values) PURE; + STDMETHOD(SetProcAmpValues)(THIS_ DWORD dwFlags, DXVA2_ProcAmpValues* pValues) PURE; + STDMETHOD(GetFilteringRange)(THIS_ DWORD dwProperty, DXVA2_ValueRange* pPropRange) PURE; + STDMETHOD(GetFilteringValue)(THIS_ DWORD dwProperty, DXVA2_Fixed32* pValue) PURE; + STDMETHOD(SetFilteringValue)(THIS_ DWORD dwProperty, DXVA2_Fixed32* pValue) PURE; + STDMETHOD(GetBackgroundColor)(THIS_ COLORREF* lpClrBkg) PURE; + STDMETHOD(SetBackgroundColor)(THIS_ COLORREF ClrBkg) PURE; +}; +#undef INTERFACE +#define INTERFACE IMFGetService +DECLARE_INTERFACE_(IMFGetService, IUnknown) +{ + STDMETHOD(GetService)(THIS_ REFGUID guidService, REFIID riid, LPVOID* ppvObject) PURE; +}; +#undef INTERFACE diff --git a/src/3rdparty/phonon/ds9/qmeminputpin.cpp b/src/3rdparty/phonon/ds9/qmeminputpin.cpp index dca99db..a21fbe7 100644 --- a/src/3rdparty/phonon/ds9/qmeminputpin.cpp +++ b/src/3rdparty/phonon/ds9/qmeminputpin.cpp @@ -28,8 +28,8 @@ namespace Phonon namespace DS9 { - QMemInputPin::QMemInputPin(QBaseFilter *parent, const QVector &mt, bool transform) : - QPin(parent, PINDIR_INPUT, mt), m_shouldDuplicateSamples(true), m_transform(transform) + QMemInputPin::QMemInputPin(QBaseFilter *parent, const QVector &mt, bool transform, QPin *output) : + QPin(parent, PINDIR_INPUT, mt), m_shouldDuplicateSamples(true), m_transform(transform), m_output(output) { } @@ -66,11 +66,9 @@ namespace Phonon { //this allows to serialize with Receive calls QMutexLocker locker(&m_mutexReceive); - for(int i = 0; i < m_outputs.count(); ++i) { - IPin *conn = m_outputs.at(i)->connected(); - if (conn) { - conn->EndOfStream(); - } + IPin *conn = m_output ? m_output->connected() : 0; + if (conn) { + conn->EndOfStream(); } return S_OK; } @@ -78,13 +76,11 @@ namespace Phonon STDMETHODIMP QMemInputPin::BeginFlush() { //pass downstream - for(int i = 0; i < m_outputs.count(); ++i) { - IPin *conn = m_outputs.at(i)->connected(); - if (conn) { - conn->BeginFlush(); - } + IPin *conn = m_output ? m_output->connected() : 0; + if (conn) { + conn->BeginFlush(); } - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_flushing = true; return S_OK; } @@ -92,22 +88,19 @@ namespace Phonon STDMETHODIMP QMemInputPin::EndFlush() { //pass downstream - for(int i = 0; i < m_outputs.count(); ++i) { - IPin *conn = m_outputs.at(i)->connected(); - if (conn) { - conn->EndFlush(); - } + IPin *conn = m_output ? m_output->connected() : 0; + if (conn) { + conn->EndFlush(); } - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_flushing = false; return S_OK; } STDMETHODIMP QMemInputPin::NewSegment(REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - for(int i = 0; i < m_outputs.count(); ++i) { - m_outputs.at(i)->NewSegment(start, stop, rate); - } + if (m_output) + m_output->NewSegment(start, stop, rate); return S_OK; } @@ -119,14 +112,9 @@ namespace Phonon if (hr == S_OK && mt->majortype != MEDIATYPE_NULL && mt->subtype != MEDIASUBTYPE_NULL && - mt->formattype != GUID_NULL) { - //we tell the output pins that they should connect with this type - for(int i = 0; i < m_outputs.count(); ++i) { - hr = m_outputs.at(i)->setAcceptedMediaType(connectedType()); - if (FAILED(hr)) { - break; - } - } + mt->formattype != GUID_NULL && m_output) { + //we tell the output pin that it should connect with this type + hr = m_output->setAcceptedMediaType(connectedType()); } return hr; } @@ -137,7 +125,8 @@ namespace Phonon return E_POINTER; } - if (*alloc = memoryAllocator(true)) { + *alloc = memoryAllocator(true); + if (*alloc) { return S_OK; } @@ -151,18 +140,15 @@ namespace Phonon } { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); m_shouldDuplicateSamples = m_transform && readonly; } setMemoryAllocator(alloc); - for(int i = 0; i < m_outputs.count(); ++i) { - IPin *pin = m_outputs.at(i)->connected(); - if (pin) { - ComPointer input(pin, IID_IMemInputPin); - input->NotifyAllocator(alloc, m_shouldDuplicateSamples); - } + if (m_output) { + ComPointer input(m_output, IID_IMemInputPin); + input->NotifyAllocator(alloc, m_shouldDuplicateSamples); } return S_OK; @@ -201,22 +187,18 @@ namespace Phonon } } - for (int i = 0; i < m_outputs.count(); ++i) { - QPin *current = m_outputs.at(i); + if (m_output) { IMediaSample *outSample = m_shouldDuplicateSamples ? - duplicateSampleForOutput(sample, current->memoryAllocator()) + duplicateSampleForOutput(sample, m_output->memoryAllocator()) : sample; if (m_shouldDuplicateSamples) { m_parent->processSample(outSample); } - IPin *pin = current->connected(); - if (pin) { - ComPointer input(pin, IID_IMemInputPin); - if (input) { - input->Receive(outSample); - } + ComPointer input(m_output->connected(), IID_IMemInputPin); + if (input) { + input->Receive(outSample); } if (m_shouldDuplicateSamples) { @@ -247,39 +229,16 @@ namespace Phonon STDMETHODIMP QMemInputPin::ReceiveCanBlock() { - //we test the output to see if they can block - for(int i = 0; i < m_outputs.count(); ++i) { - IPin *input = m_outputs.at(i)->connected(); - if (input) { - ComPointer meminput(input, IID_IMemInputPin); - if (meminput && meminput->ReceiveCanBlock() != S_FALSE) { - return S_OK; - } + //we test the output to see if it can block + if (m_output) { + ComPointer meminput(m_output->connected(), IID_IMemInputPin); + if (meminput && meminput->ReceiveCanBlock() != S_FALSE) { + return S_OK; } } return S_FALSE; } - //addition - //this should be used by the filter to tell its input pins to which output they should route the samples - - void QMemInputPin::addOutput(QPin *output) - { - QWriteLocker locker(&m_lock); - m_outputs += output; - } - - void QMemInputPin::removeOutput(QPin *output) - { - QWriteLocker locker(&m_lock); - m_outputs.removeOne(output); - } - - QList QMemInputPin::outputs() const - { - QReadLocker locker(&m_lock); - return m_outputs; - } ALLOCATOR_PROPERTIES QMemInputPin::getDefaultAllocatorProperties() const { @@ -294,7 +253,7 @@ namespace Phonon LONG length = sample->GetActualDataLength(); HRESULT hr = alloc->Commit(); - if (hr == VFW_E_SIZENOTSET) { + if (hr == HRESULT(VFW_E_SIZENOTSET)) { ALLOCATOR_PROPERTIES prop = getDefaultAllocatorProperties(); prop.cbBuffer = qMax(prop.cbBuffer, length); ALLOCATOR_PROPERTIES actual; @@ -324,7 +283,7 @@ namespace Phonon { LONGLONG start, end; hr = sample->GetMediaTime(&start, &end); - if (hr != VFW_E_MEDIA_TIME_NOT_SET) { + if (hr != HRESULT(VFW_E_MEDIA_TIME_NOT_SET)) { hr = out->SetMediaTime(&start, &end); Q_ASSERT(SUCCEEDED(hr)); } diff --git a/src/3rdparty/phonon/ds9/qmeminputpin.h b/src/3rdparty/phonon/ds9/qmeminputpin.h index c449721..d74c451 100644 --- a/src/3rdparty/phonon/ds9/qmeminputpin.h +++ b/src/3rdparty/phonon/ds9/qmeminputpin.h @@ -37,7 +37,7 @@ namespace Phonon class QMemInputPin : public QPin, public IMemInputPin { public: - QMemInputPin(QBaseFilter *, const QVector &, bool transform); + QMemInputPin(QBaseFilter *, const QVector &, bool transform, QPin *output); ~QMemInputPin(); //reimplementation from IUnknown @@ -60,18 +60,13 @@ namespace Phonon STDMETHODIMP ReceiveMultiple(IMediaSample **,long,long *); STDMETHODIMP ReceiveCanBlock(); - //addition - void addOutput(QPin *output); - void removeOutput(QPin *output); - QList outputs() const; - private: IMediaSample *duplicateSampleForOutput(IMediaSample *, IMemAllocator *); ALLOCATOR_PROPERTIES getDefaultAllocatorProperties() const; bool m_shouldDuplicateSamples; const bool m_transform; //defines if the pin is transforming the samples - QList m_outputs; + QPin* const m_output; QMutex m_mutexReceive; }; } diff --git a/src/3rdparty/phonon/ds9/qpin.cpp b/src/3rdparty/phonon/ds9/qpin.cpp index 37fe48d..b4afd10 100644 --- a/src/3rdparty/phonon/ds9/qpin.cpp +++ b/src/3rdparty/phonon/ds9/qpin.cpp @@ -28,20 +28,7 @@ namespace Phonon namespace DS9 { - static const AM_MEDIA_TYPE defaultMediaType() - { - AM_MEDIA_TYPE ret; - ret.majortype = MEDIATYPE_NULL; - ret.subtype = MEDIASUBTYPE_NULL; - ret.bFixedSizeSamples = TRUE; - ret.bTemporalCompression = FALSE; - ret.lSampleSize = 1; - ret.formattype = GUID_NULL; - ret.pUnk = 0; - ret.cbFormat = 0; - ret.pbFormat = 0; - return ret; - } + static const AM_MEDIA_TYPE defaultMediaType = { MEDIATYPE_NULL, MEDIASUBTYPE_NULL, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0}; class QEnumMediaTypes : public IEnumMediaTypes { @@ -104,8 +91,8 @@ namespace Phonon return E_INVALIDARG; } - int nbFetched = 0; - while (nbFetched < int(count) && m_index < m_pin->mediaTypes().count()) { + uint nbFetched = 0; + while (nbFetched < count && m_index < m_pin->mediaTypes().count()) { //the caller will deallocate the memory *out = static_cast(::CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))); const AM_MEDIA_TYPE original = m_pin->mediaTypes().at(m_index); @@ -158,9 +145,9 @@ namespace Phonon QPin::QPin(QBaseFilter *parent, PIN_DIRECTION dir, const QVector &mt) : - m_memAlloc(0), m_parent(parent), m_refCount(1), m_connected(0), - m_direction(dir), m_mediaTypes(mt), m_connectedType(defaultMediaType()), - m_flushing(false) + m_parent(parent), m_flushing(false), m_refCount(1), m_connected(0), + m_direction(dir), m_mediaTypes(mt), m_connectedType(defaultMediaType), + m_memAlloc(0) { Q_ASSERT(m_parent); m_parent->addPin(this); @@ -273,7 +260,7 @@ namespace Phonon if (FAILED(hr)) { setConnected(0); - setConnectedType(defaultMediaType()); + setConnectedType(defaultMediaType); } else { ComPointer input(pin, IID_IMemInputPin); if (input) { @@ -315,10 +302,8 @@ namespace Phonon } setConnected(0); - setConnectedType(defaultMediaType()); - if (m_direction == PINDIR_INPUT) { - setMemoryAllocator(0); - } + setConnectedType(defaultMediaType); + setMemoryAllocator(0); return S_OK; } @@ -338,7 +323,7 @@ namespace Phonon STDMETHODIMP QPin::ConnectionMediaType(AM_MEDIA_TYPE *type) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (!type) { return E_POINTER; } @@ -353,7 +338,6 @@ namespace Phonon STDMETHODIMP QPin::QueryPinInfo(PIN_INFO *info) { - QReadLocker locker(&m_lock); if (!info) { return E_POINTER; } @@ -361,14 +345,12 @@ namespace Phonon info->dir = m_direction; info->pFilter = m_parent; m_parent->AddRef(); - qMemCopy(info->achName, m_name.utf16(), qMin(MAX_FILTER_NAME, m_name.length()+1) *2); - + info->achName[0] = 0; return S_OK; } STDMETHODIMP QPin::QueryDirection(PIN_DIRECTION *dir) { - QReadLocker locker(&m_lock); if (!dir) { return E_POINTER; } @@ -379,20 +361,18 @@ namespace Phonon STDMETHODIMP QPin::QueryId(LPWSTR *id) { - QReadLocker locker(&m_lock); if (!id) { return E_POINTER; } - int nbBytes = (m_name.length()+1)*2; - *id = static_cast(::CoTaskMemAlloc(nbBytes)); - qMemCopy(*id, m_name.utf16(), nbBytes); + *id = static_cast(::CoTaskMemAlloc(2)); + *id[0] = 0; return S_OK; } STDMETHODIMP QPin::QueryAccept(const AM_MEDIA_TYPE *type) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (!type) { return E_POINTER; } @@ -439,7 +419,7 @@ namespace Phonon STDMETHODIMP QPin::NewSegment(REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (m_direction == PINDIR_OUTPUT && m_connected) { //we deliver this downstream m_connected->NewSegment(start, stop, rate); @@ -456,8 +436,8 @@ namespace Phonon HRESULT QPin::checkOutputMediaTypesConnection(IPin *pin) { - IEnumMediaTypes *emt = 0; - HRESULT hr = pin->EnumMediaTypes(&emt); + ComPointer emt; + HRESULT hr = pin->EnumMediaTypes(emt.pparam()); if (hr != S_OK) { return hr; } @@ -470,7 +450,7 @@ namespace Phonon freeMediaType(type); return S_OK; } else { - setConnectedType(defaultMediaType()); + setConnectedType(defaultMediaType); freeMediaType(type); } } @@ -520,7 +500,7 @@ namespace Phonon void QPin::setConnectedType(const AM_MEDIA_TYPE &type) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); //1st we free memory freeMediaType(m_connectedType); @@ -530,13 +510,13 @@ namespace Phonon const AM_MEDIA_TYPE &QPin::connectedType() const { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); return m_connectedType; } void QPin::setConnected(IPin *pin) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (pin) { pin->AddRef(); } @@ -548,7 +528,7 @@ namespace Phonon IPin *QPin::connected(bool addref) const { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (addref && m_connected) { m_connected->AddRef(); } @@ -557,13 +537,12 @@ namespace Phonon bool QPin::isFlushing() const { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); return m_flushing; } FILTER_STATE QPin::filterState() const { - QReadLocker locker(&m_lock); FILTER_STATE fstate = State_Stopped; m_parent->GetState(0, &fstate); return fstate; @@ -571,7 +550,7 @@ namespace Phonon QVector QPin::mediaTypes() const { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); return m_mediaTypes; } @@ -607,7 +586,7 @@ namespace Phonon void QPin::setMemoryAllocator(IMemAllocator *alloc) { - QWriteLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (alloc) { alloc->AddRef(); } @@ -619,7 +598,7 @@ namespace Phonon IMemAllocator *QPin::memoryAllocator(bool addref) const { - QReadLocker locker(&m_lock); + QMutexLocker locker(&m_mutex); if (addref && m_memAlloc) { m_memAlloc->AddRef(); } diff --git a/src/3rdparty/phonon/ds9/qpin.h b/src/3rdparty/phonon/ds9/qpin.h index a3287c4..280ad61 100644 --- a/src/3rdparty/phonon/ds9/qpin.h +++ b/src/3rdparty/phonon/ds9/qpin.h @@ -22,7 +22,7 @@ along with this library. If not, see . #include #include -#include +#include #include @@ -85,8 +85,8 @@ namespace Phonon protected: //this can be used by sub-classes - mutable QReadWriteLock m_lock; - QBaseFilter *m_parent; + mutable QMutex m_mutex; + QBaseFilter * const m_parent; bool m_flushing; private: @@ -98,7 +98,6 @@ namespace Phonon const PIN_DIRECTION m_direction; QVector m_mediaTypes; //accepted media types AM_MEDIA_TYPE m_connectedType; - QString m_name; IMemAllocator *m_memAlloc; }; diff --git a/src/3rdparty/phonon/ds9/videorenderer_default.cpp b/src/3rdparty/phonon/ds9/videorenderer_default.cpp new file mode 100644 index 0000000..0045a49 --- /dev/null +++ b/src/3rdparty/phonon/ds9/videorenderer_default.cpp @@ -0,0 +1,153 @@ +/* This file is part of the KDE project. + +Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + +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 or 3 of the License. + +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, see . +*/ + + +#include "videorenderer_default.h" + +#ifndef QT_NO_PHONON_VIDEO + +#include +#include + +#include + +QT_BEGIN_NAMESPACE + + +namespace Phonon +{ + namespace DS9 + { + VideoRendererDefault::~VideoRendererDefault() + { + } + + bool VideoRendererDefault::isNative() const + { + return true; + } + + + VideoRendererDefault::VideoRendererDefault(QWidget *target) : m_target(target) + { + m_target->setAttribute(Qt::WA_PaintOnScreen, true); + m_filter = Filter(CLSID_VideoRenderer, IID_IBaseFilter); + } + + QSize VideoRendererDefault::videoSize() const + { + LONG w = 0, + h = 0; + ComPointer basic(m_filter, IID_IBasicVideo); + if (basic) { + basic->GetVideoSize( &w, &h); + } + return QSize(w, h); + } + + void VideoRendererDefault::repaintCurrentFrame(QWidget * /*target*/, const QRect & /*rect*/) + { + //nothing to do here: the renderer paints everything + } + + void VideoRendererDefault::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio, + Phonon::VideoWidget::ScaleMode scaleMode) + { + if (!isActive()) { + ComPointer basic(m_filter, IID_IBasicVideo); + if (basic) { + basic->SetDestinationPosition(0, 0, 0, 0); + } + return; + } + + ComPointer video(m_filter, IID_IVideoWindow); + + OAHWND owner; + HRESULT hr = video->get_Owner(&owner); + if (FAILED(hr)) { + return; + } + + const OAHWND newOwner = reinterpret_cast(m_target->winId()); + if (owner != newOwner) { + video->put_Owner(newOwner); + video->put_MessageDrain(newOwner); + video->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); + } + + //make sure the widget takes the whole size of the parent + video->SetWindowPosition(0, 0, size.width(), size.height()); + + const QSize vsize = videoSize(); + internalNotifyResize(size, vsize, aspectRatio, scaleMode); + + ComPointer basic(m_filter, IID_IBasicVideo); + if (basic) { + basic->SetDestinationPosition(m_dstX, m_dstY, m_dstWidth, m_dstHeight); + } + } + + void VideoRendererDefault::applyMixerSettings(qreal /*brightness*/, qreal /*contrast*/, qreal /*m_hue*/, qreal /*saturation*/) + { + //this can't be supported for the default renderer + } + + QImage VideoRendererDefault::snapshot() const + { + ComPointer basic(m_filter, IID_IBasicVideo); + if (basic) { + LONG bufferSize = 0; + //1st we get the buffer size + basic->GetCurrentImage(&bufferSize, 0); + + QByteArray buffer; + buffer.resize(bufferSize); + HRESULT hr = basic->GetCurrentImage(&bufferSize, reinterpret_cast(buffer.data())); + + if (SUCCEEDED(hr)) { + + const BITMAPINFOHEADER *bmi = reinterpret_cast(buffer.constData()); + + const int w = qAbs(bmi->biWidth), + h = qAbs(bmi->biHeight); + + // Create image and copy data into image. + QImage ret(w, h, QImage::Format_RGB32); + + if (!ret.isNull()) { + const char *data = buffer.constData() + bmi->biSize; + const int bytes_per_line = w * sizeof(QRgb); + for (int y = h - 1; y >= 0; --y) { + qMemCopy(ret.scanLine(y), //destination + data, //source + bytes_per_line); + data += bytes_per_line; + } + } + return ret; + } + } + return QImage(); + } + + } +} + +QT_END_NAMESPACE + +#endif //QT_NO_PHONON_VIDEO diff --git a/src/3rdparty/phonon/ds9/videorenderer_default.h b/src/3rdparty/phonon/ds9/videorenderer_default.h new file mode 100644 index 0000000..43768d9 --- /dev/null +++ b/src/3rdparty/phonon/ds9/videorenderer_default.h @@ -0,0 +1,55 @@ +/* This file is part of the KDE project. + +Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + +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 or 3 of the License. + +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, see . +*/ + +#ifndef PHONON_VIDEORENDERER_DEFAULT_H +#define PHONON_VIDEORENDERER_DEFAULT_H + +#include "abstractvideorenderer.h" + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_PHONON_VIDEO + +namespace Phonon +{ + namespace DS9 + { + class VideoRendererDefault : public AbstractVideoRenderer + { + public: + VideoRendererDefault(QWidget *target); + ~VideoRendererDefault(); + + //Implementation from AbstractVideoRenderer + void repaintCurrentFrame(QWidget *target, const QRect &rect); + void notifyResize(const QSize&, Phonon::VideoWidget::AspectRatio, Phonon::VideoWidget::ScaleMode); + QSize videoSize() const; + QImage snapshot() const; + void applyMixerSettings(qreal brightness, qreal contrast, qreal m_hue, qreal saturation); + bool isNative() const; + private: + QWidget *m_target; + }; + } +} + +#endif //QT_NO_PHONON_VIDEO + +QT_END_NAMESPACE + +#endif + diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp new file mode 100644 index 0000000..d23d9ce --- /dev/null +++ b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp @@ -0,0 +1,215 @@ +/* This file is part of the KDE project. + +Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + +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 or 3 of the License. + +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, see . +*/ + + +#include "videorenderer_evr.h" +#include "qevr9.h" + +#ifndef QT_NO_PHONON_VIDEO + +#include +#include + +QT_BEGIN_NAMESPACE + +namespace Phonon +{ + namespace DS9 + { + //we have to define them here because not all compilers/sdk have them + static const GUID MR_VIDEO_RENDER_SERVICE = {0x1092a86c, 0xab1a, 0x459a, {0xa3, 0x36, 0x83, 0x1f, 0xbc, 0x4d, 0x11, 0xff} }; + static const GUID MR_VIDEO_MIXER_SERVICE = { 0x73cd2fc, 0x6cf4, 0x40b7, {0x88, 0x59, 0xe8, 0x95, 0x52, 0xc8, 0x41, 0xf8} }; + static const IID IID_IMFVideoDisplayControl = {0xa490b1e4, 0xab84, 0x4d31, {0xa1, 0xb2, 0x18, 0x1e, 0x03, 0xb1, 0x07, 0x7a} }; + static const IID IID_IMFVideoMixerControl = {0xA5C6C53F, 0xC202, 0x4aa5, {0x96, 0x95, 0x17, 0x5B, 0xA8, 0xC5, 0x08, 0xA5} }; + static const IID IID_IMFVideoProcessor = {0x6AB0000C, 0xFECE, 0x4d1f, {0xA2, 0xAC, 0xA9, 0x57, 0x35, 0x30, 0x65, 0x6E} }; + static const IID IID_IMFGetService = {0xFA993888, 0x4383, 0x415A, {0xA9, 0x30, 0xDD, 0x47, 0x2A, 0x8C, 0xF6, 0xF7} }; + static const GUID CLSID_EnhancedVideoRenderer = {0xfa10746c, 0x9b63, 0x4b6c, {0xbc, 0x49, 0xfc, 0x30, 0xe, 0xa5, 0xf2, 0x56} }; + + template ComPointer getService(const Filter &filter, REFGUID guidService, REFIID riid) + { + //normally we should use IID_IMFGetService but this introduces another dependency + //so here we simply define our own IId with the same value + ComPointer getService(filter, IID_IMFGetService); + Q_ASSERT(getService); + T *ptr = 0; + HRESULT hr = getService->GetService(guidService, riid, reinterpret_cast(&ptr)); + if (!SUCCEEDED(hr) || ptr == 0) + Q_ASSERT(!SUCCEEDED(hr) && ptr != 0); + ComPointer service(ptr); + return service; + } + + VideoRendererEVR::~VideoRendererEVR() + { + } + + bool VideoRendererEVR::isNative() const + { + return true; + } + + VideoRendererEVR::VideoRendererEVR(QWidget *target) : m_target(target) + { + m_filter = Filter(CLSID_EnhancedVideoRenderer, IID_IBaseFilter); + if (!m_filter) { + return; + } + + ComPointer filterControl = getService(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); + + filterControl->SetVideoWindow(reinterpret_cast(target->winId())); + filterControl->SetAspectRatioMode(MFVideoARMode_None); // We're in control of the size + } + + QImage VideoRendererEVR::snapshot() const + { + // This will always capture black areas where no video is drawn, if any are present. + // Due to the hack in notifyResize() + ComPointer filterControl = getService(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); + if (filterControl) { + BITMAPINFOHEADER bmi; + BYTE *buffer = 0; + DWORD bufferSize; + LONGLONG timeStamp; + + bmi.biSize = sizeof(BITMAPINFOHEADER); + + HRESULT hr = filterControl->GetCurrentImage(&bmi, &buffer, &bufferSize, &timeStamp); + if (SUCCEEDED(hr)) { + + const int w = qAbs(bmi.biWidth), + h = qAbs(bmi.biHeight); + + // Create image and copy data into image. + QImage ret(w, h, QImage::Format_RGB32); + + if (!ret.isNull()) { + uchar *data = buffer; + const int bytes_per_line = w * sizeof(QRgb); + for (int y = h - 1; y >= 0; --y) { + qMemCopy(ret.scanLine(y), //destination + data, //source + bytes_per_line); + data += bytes_per_line; + } + } + ::CoTaskMemFree(buffer); + return ret; + } + } + return QImage(); + } + + QSize VideoRendererEVR::videoSize() const + { + SIZE nativeSize; + SIZE aspectRatioSize; + + ComPointer filterControl = getService(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); + + filterControl->GetNativeVideoSize(&nativeSize, &aspectRatioSize); + + return QSize(nativeSize.cx, nativeSize.cy); + } + + void VideoRendererEVR::repaintCurrentFrame(QWidget *target, const QRect &rect) + { + // repaint the video + ComPointer filterControl = getService(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); + // All failed results can be safely ignored + filterControl->RepaintVideo(); + } + + void VideoRendererEVR::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio, + Phonon::VideoWidget::ScaleMode scaleMode) + { + if (!isActive()) { + RECT dummyRect = { 0, 0, 0, 0}; + ComPointer filterControl = getService(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); + filterControl->SetVideoPosition(0, &dummyRect); + return; + } + + const QSize vsize = videoSize(); + internalNotifyResize(size, vsize, aspectRatio, scaleMode); + + RECT dstRectWin = { 0, 0, size.width(), size.height()}; + + // Resize the Stream output rect instead of the destination rect. + // Hacky workaround for flicker in the areas outside of the destination rect + // This way these areas don't exist + MFVideoNormalizedRect streamOutputRect = { float(m_dstX) / float(size.width()), float(m_dstY) / float(size.height()), + float(m_dstWidth + m_dstX) / float(size.width()), float(m_dstHeight + m_dstY) / float(size.height())}; + + ComPointer filterMixer = getService(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoMixerControl); + ComPointer filterControl = getService(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl); + + filterMixer->SetStreamOutputRect(0, &streamOutputRect); + filterControl->SetVideoPosition(0, &dstRectWin); + } + + void VideoRendererEVR::applyMixerSettings(qreal brightness, qreal contrast, qreal hue, qreal saturation) + { + InputPin sink = BackendNode::pins(m_filter, PINDIR_INPUT).first(); + OutputPin source; + if (FAILED(sink->ConnectedTo(source.pparam()))) { + return; //it must be connected to work + } + + // Get the "Video Processor" (used for brightness/contrast/saturation/hue) + ComPointer processor = getService(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoProcessor); + Q_ASSERT(processor); + + DXVA2_ValueRange contrastRange; + DXVA2_ValueRange brightnessRange; + DXVA2_ValueRange saturationRange; + DXVA2_ValueRange hueRange; + + if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Contrast, &contrastRange))) + return; + if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Brightness, &brightnessRange))) + return; + if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Saturation, &saturationRange))) + return; + if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Hue, &hueRange))) + return; + + DXVA2_ProcAmpValues values; + + values.Contrast = DXVA2FloatToFixed(((contrast < 0 + ? DXVA2FixedToFloat(contrastRange.MinValue) : DXVA2FixedToFloat(contrastRange.MaxValue)) + - DXVA2FixedToFloat(contrastRange.DefaultValue)) * qAbs(contrast) + DXVA2FixedToFloat(contrastRange.DefaultValue)); + values.Brightness = DXVA2FloatToFixed(((brightness < 0 + ? DXVA2FixedToFloat(brightnessRange.MinValue) : DXVA2FixedToFloat(brightnessRange.MaxValue)) + - DXVA2FixedToFloat(brightnessRange.DefaultValue)) * qAbs(brightness) + DXVA2FixedToFloat(brightnessRange.DefaultValue)); + values.Saturation = DXVA2FloatToFixed(((saturation < 0 + ? DXVA2FixedToFloat(saturationRange.MinValue) : DXVA2FixedToFloat(saturationRange.MaxValue)) + - DXVA2FixedToFloat(saturationRange.DefaultValue)) * qAbs(saturation) + DXVA2FixedToFloat(saturationRange.DefaultValue)); + values.Hue = DXVA2FloatToFixed(((hue < 0 + ? DXVA2FixedToFloat(hueRange.MinValue) : DXVA2FixedToFloat(hueRange.MaxValue)) + - DXVA2FixedToFloat(hueRange.DefaultValue)) * qAbs(hue) + DXVA2FixedToFloat(hueRange.DefaultValue)); + + //finally set the settings + processor->SetProcAmpValues(DXVA2_ProcAmp_Contrast | DXVA2_ProcAmp_Brightness | DXVA2_ProcAmp_Saturation | DXVA2_ProcAmp_Hue, &values); + + } + } +} + +QT_END_NAMESPACE + +#endif //QT_NO_PHONON_VIDEO diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.h b/src/3rdparty/phonon/ds9/videorenderer_evr.h new file mode 100644 index 0000000..229c36d --- /dev/null +++ b/src/3rdparty/phonon/ds9/videorenderer_evr.h @@ -0,0 +1,56 @@ +/* This file is part of the KDE project. + +Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + +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 or 3 of the License. + +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, see . +*/ + +#ifndef PHONON_VIDEORENDERER_EVR_H +#define PHONON_VIDEORENDERER_EVR_H + +#include "abstractvideorenderer.h" +#include "compointer.h" + +QT_BEGIN_NAMESPACE + +#ifndef QT_NO_PHONON_VIDEO + +namespace Phonon +{ + namespace DS9 + { + class VideoRendererEVR : public AbstractVideoRenderer + { + public: + VideoRendererEVR(QWidget *target); + ~VideoRendererEVR(); + + //Implementation from AbstractVideoRenderer + void repaintCurrentFrame(QWidget *target, const QRect &rect); + void notifyResize(const QSize&, Phonon::VideoWidget::AspectRatio, Phonon::VideoWidget::ScaleMode); + QSize videoSize() const; + QImage snapshot() const; + void applyMixerSettings(qreal brightness, qreal contrast, qreal m_hue, qreal saturation); + bool isNative() const; + private: + QWidget *m_target; + }; + } +} + +#endif //QT_NO_PHONON_VIDEO + +QT_END_NAMESPACE + +#endif + diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp index 491d1bd..9c7993c 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp @@ -194,8 +194,8 @@ namespace Phonon m_sampleBuffer = ComPointer(); #ifndef QT_NO_OPENGL freeGLResources(); -#endif // QT_NO_OPENGL m_textureUploaded = false; +#endif // QT_NO_OPENGL } void endOfStream() @@ -314,7 +314,6 @@ namespace Phonon REFERENCE_TIME m_start; HANDLE m_renderEvent, m_receiveCanWait; // Signals sample to render QSize m_size; - bool m_textureUploaded; //mixer settings qreal m_brightness, @@ -356,6 +355,7 @@ namespace Phonon bool m_checkedPrograms; bool m_usingOpenGL; + bool m_textureUploaded; GLuint m_program[2]; GLuint m_texture[3]; #endif @@ -365,7 +365,7 @@ namespace Phonon { public: VideoRendererSoftPin(VideoRendererSoftFilter *parent) : - QMemInputPin(parent, videoMediaTypes(), false /*no transformation of the samples*/), + QMemInputPin(parent, videoMediaTypes(), false /*no transformation of the samples*/, 0), m_renderer(parent) { } @@ -436,7 +436,7 @@ namespace Phonon QBaseFilter(CLSID_NULL), m_inputPin(new VideoRendererSoftPin(this)), m_renderer(renderer), m_start(0) #ifndef QT_NO_OPENGL - ,m_usingOpenGL(false), m_checkedPrograms(false), m_textureUploaded(false) + , m_checkedPrograms(false), m_usingOpenGL(false), m_textureUploaded(false) #endif { m_renderEvent = ::CreateEvent(0, 0, 0, 0); @@ -661,7 +661,10 @@ namespace Phonon #ifndef QT_NO_OPENGL - if (painter.paintEngine() && painter.paintEngine()->type() == QPaintEngine::OpenGL && checkGLPrograms()) { + if (painter.paintEngine() && + (painter.paintEngine()->type() == QPaintEngine::OpenGL || painter.paintEngine()->type() == QPaintEngine::OpenGL2) + && checkGLPrograms()) { + //for now we only support YUV (both YV12 and YUY2) updateTexture(); @@ -673,6 +676,7 @@ namespace Phonon } //let's draw the texture + painter.beginNativePainting(); //Let's pass the other arguments const Program prog = (m_inputPin->connectedType().subtype == MEDIASUBTYPE_YV12) ? YV12toRGB : YUY2toRGB; @@ -722,6 +726,7 @@ namespace Phonon glDisableClientState(GL_VERTEX_ARRAY); glDisable(GL_FRAGMENT_PROGRAM_ARB); + painter.endNativePainting(); return; } else #endif diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp index 298e9fa..545b31e 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp +++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp @@ -22,14 +22,9 @@ along with this library. If not, see . #include #include -#include -#ifndef Q_OS_WINCE #include #include -#else -#include -#endif QT_BEGIN_NAMESPACE @@ -48,116 +43,10 @@ namespace Phonon } -#ifdef Q_OS_WINCE - VideoRendererVMR9::VideoRendererVMR9(QWidget *target) : m_target(target) - { - m_target->setAttribute(Qt::WA_PaintOnScreen, true); - m_filter = Filter(CLSID_VideoRenderer, IID_IBaseFilter); - } - - QSize VideoRendererVMR9::videoSize() const - { - LONG w = 0, - h = 0; - ComPointer basic(m_filter, IID_IBasicVideo); - if (basic) { - basic->GetVideoSize( &w, &h); - } - return QSize(w, h); - } - - void VideoRendererVMR9::repaintCurrentFrame(QWidget * /*target*/, const QRect & /*rect*/) - { - //nothing to do here: the renderer paints everything - } - - void VideoRendererVMR9::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio, - Phonon::VideoWidget::ScaleMode scaleMode) - { - if (!isActive()) { - ComPointer basic(m_filter, IID_IBasicVideo); - if (basic) { - basic->SetDestinationPosition(0, 0, 0, 0); - } - return; - } - - ComPointer video(m_filter, IID_IVideoWindow); - - OAHWND owner; - HRESULT hr = video->get_Owner(&owner); - if (FAILED(hr)) { - return; - } - - const OAHWND newOwner = reinterpret_cast(m_target->winId()); - if (owner != newOwner) { - video->put_Owner(newOwner); - video->put_MessageDrain(newOwner); - video->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS); - } - - //make sure the widget takes the whole size of the parent - video->SetWindowPosition(0, 0, size.width(), size.height()); - - const QSize vsize = videoSize(); - internalNotifyResize(size, vsize, aspectRatio, scaleMode); - - ComPointer basic(m_filter, IID_IBasicVideo); - if (basic) { - basic->SetDestinationPosition(m_dstX, m_dstY, m_dstWidth, m_dstHeight); - } - } - - void VideoRendererVMR9::applyMixerSettings(qreal /*brightness*/, qreal /*contrast*/, qreal /*m_hue*/, qreal /*saturation*/) - { - //this can't be supported for WinCE - } - - QImage VideoRendererVMR9::snapshot() const - { - ComPointer basic(m_filter, IID_IBasicVideo); - if (basic) { - LONG bufferSize = 0; - //1st we get the buffer size - basic->GetCurrentImage(&bufferSize, 0); - - QByteArray buffer; - buffer.resize(bufferSize); - HRESULT hr = basic->GetCurrentImage(&bufferSize, reinterpret_cast(buffer.data())); - - if (SUCCEEDED(hr)) { - - const BITMAPINFOHEADER *bmi = reinterpret_cast(buffer.constData()); - - const int w = qAbs(bmi->biWidth), - h = qAbs(bmi->biHeight); - - // Create image and copy data into image. - QImage ret(w, h, QImage::Format_RGB32); - - if (!ret.isNull()) { - const char *data = buffer.constData() + bmi->biSize; - const int bytes_per_line = w * sizeof(QRgb); - for (int y = h - 1; y >= 0; --y) { - qMemCopy(ret.scanLine(y), //destination - data, //source - bytes_per_line); - data += bytes_per_line; - } - } - return ret; - } - } - return QImage(); - } - -#else VideoRendererVMR9::VideoRendererVMR9(QWidget *target) : m_target(target) { m_filter = Filter(CLSID_VideoMixingRenderer9, IID_IBaseFilter); if (!m_filter) { - qWarning("the video widget could not be initialized correctly"); return; } @@ -169,6 +58,7 @@ namespace Phonon Q_ASSERT(SUCCEEDED(hr)); ComPointer windowlessControl(m_filter, IID_IVMRWindowlessControl9); windowlessControl->SetVideoClippingWindow(reinterpret_cast(target->winId())); + windowlessControl->SetAspectRatioMode(VMR9ARMode_None); //we're in control of the size } QImage VideoRendererVMR9::snapshot() const @@ -324,7 +214,6 @@ namespace Phonon //finally set the settings mixer->SetProcAmpControl(0, &ctrl); } -#endif } } diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.h b/src/3rdparty/phonon/ds9/videorenderer_vmr9.h index 4eb237e..516d79d 100644 --- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.h +++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.h @@ -19,7 +19,6 @@ along with this library. If not, see . #define PHONON_VIDEORENDERER_VMR9_H #include "abstractvideorenderer.h" -#include "compointer.h" QT_BEGIN_NAMESPACE diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp index de7ce5f..09d42a4 100644 --- a/src/3rdparty/phonon/ds9/videowidget.cpp +++ b/src/3rdparty/phonon/ds9/videowidget.cpp @@ -24,7 +24,12 @@ along with this library. If not, see . #include "mediaobject.h" +#ifndef Q_OS_WINCE +#include "videorenderer_evr.h" #include "videorenderer_vmr9.h" +#else +#include "videorenderer_default.h" +#endif #include "videorenderer_soft.h" QT_BEGIN_NAMESPACE @@ -84,7 +89,19 @@ namespace Phonon void setCurrentRenderer(AbstractVideoRenderer *renderer) { m_currentRenderer = renderer; - update(); + //we disallow repaint on that widget for just a fraction of second + //this allows better transition between videos + setUpdatesEnabled(false); + m_flickerFreeTimer.start(20, this); + } + + void timerEvent(QTimerEvent *e) + { + if (e->timerId() == m_flickerFreeTimer.timerId()) { + m_flickerFreeTimer.stop(); + setUpdatesEnabled(true); + } + QWidget::timerEvent(e); } QSize sizeHint() const @@ -106,6 +123,8 @@ namespace Phonon void paintEvent(QPaintEvent *e) { + if (!updatesEnabled()) + return; //this avoids repaint from native events checkCurrentRenderingMode(); m_currentRenderer->repaintCurrentFrame(this, e->rect()); } @@ -153,13 +172,14 @@ namespace Phonon } } else if (!isEmbedded()) { m_currentRenderer = m_node->switchRendering(m_currentRenderer); - setAttribute(Qt::WA_PaintOnScreen, true); + setAttribute(Qt::WA_PaintOnScreen, false); } } VideoWidget *m_node; AbstractVideoRenderer *m_currentRenderer; QVariant m_restoreScreenSaverActive; + QBasicTimer m_flickerFreeTimer; }; VideoWidget::VideoWidget(QWidget *parent) @@ -203,6 +223,9 @@ namespace Phonon if (toNative && m_noNativeRendererSupported) return current; //no switch here + if (!mediaObject()) + return current; + //firt we delete the renderer //initialization of the widgets for(int i = 0; i < FILTER_COUNT; ++i) { @@ -261,6 +284,7 @@ namespace Phonon { m_aspectRatio = aspectRatio; updateVideoSize(); + m_widget->update(); } Phonon::VideoWidget::ScaleMode VideoWidget::scaleMode() const @@ -279,6 +303,7 @@ namespace Phonon { m_scaleMode = scaleMode; updateVideoSize(); + m_widget->update(); } void VideoWidget::setBrightness(qreal b) @@ -332,14 +357,29 @@ namespace Phonon int index = graphIndex * 2 + type; if (m_renderers[index] == 0 && autoCreate) { AbstractVideoRenderer *renderer = 0; - if (type == Native) { - renderer = new VideoRendererVMR9(m_widget); + if (type == Native) { +#ifndef Q_OS_WINCE + renderer = new VideoRendererEVR(m_widget); + if (renderer->getFilter() == 0) { + delete renderer; + //EVR not present, let's try VMR + renderer = new VideoRendererVMR9(m_widget); + if (renderer->getFilter() == 0) { + //instanciating the renderer might fail + m_noNativeRendererSupported = true; + delete renderer; + renderer = 0; + } + } +#else + renderer = new VideoRendererDefault(m_widget); if (renderer->getFilter() == 0) { - //instanciating the renderer might fail with error VFW_E_DDRAW_CAPS_NOT_SUITABLE (0x80040273) + //instanciating the renderer might fail m_noNativeRendererSupported = true; delete renderer; renderer = 0; } +#endif } if (renderer == 0) { diff --git a/src/3rdparty/phonon/ds9/volumeeffect.cpp b/src/3rdparty/phonon/ds9/volumeeffect.cpp index b9a5fce..a93b074 100644 --- a/src/3rdparty/phonon/ds9/volumeeffect.cpp +++ b/src/3rdparty/phonon/ds9/volumeeffect.cpp @@ -76,7 +76,7 @@ namespace Phonon class VolumeMemInputPin : public QMemInputPin { public: - VolumeMemInputPin(QBaseFilter *parent, const QVector &mt) : QMemInputPin(parent, mt, true /*transform*/) + VolumeMemInputPin(QBaseFilter *parent, const QVector &mt, QPin *output) : QMemInputPin(parent, mt, true /*transform*/, output) { } @@ -139,8 +139,7 @@ namespace Phonon //then creating the input mt << audioMediaType(); - m_input = new VolumeMemInputPin(this, mt); - m_input->addOutput(m_output); //make the connection here + m_input = new VolumeMemInputPin(this, mt, m_output); } void VolumeEffectFilter::treatOneSamplePerChannel(BYTE **buffer, int sampleSize, int channelCount, int frequency) diff --git a/src/3rdparty/phonon/ds9/volumeeffect.h b/src/3rdparty/phonon/ds9/volumeeffect.h index 39b20d0..d1b0186 100644 --- a/src/3rdparty/phonon/ds9/volumeeffect.h +++ b/src/3rdparty/phonon/ds9/volumeeffect.h @@ -47,7 +47,7 @@ namespace Phonon private: float m_volume; - //parameters used to fade + //paramaters used to fade Phonon::VolumeFaderEffect::FadeCurve m_fadeCurve; bool m_fading; //determines if we should be fading. diff --git a/src/plugins/phonon/ds9/ds9.pro b/src/plugins/phonon/ds9/ds9.pro index f40c561..dab5116 100644 --- a/src/plugins/phonon/ds9/ds9.pro +++ b/src/plugins/phonon/ds9/ds9.pro @@ -23,6 +23,7 @@ HEADERS += \ $$PHONON_DS9_DIR/videowidget.h \ $$PHONON_DS9_DIR/videorenderer_soft.h \ $$PHONON_DS9_DIR/videorenderer_vmr9.h \ + $$PHONON_DS9_DIR/videorenderer_evr.h \ $$PHONON_DS9_DIR/volumeeffect.h \ $$PHONON_DS9_DIR/qbasefilter.h \ $$PHONON_DS9_DIR/qpin.h \ @@ -46,6 +47,7 @@ SOURCES += \ $$PHONON_DS9_DIR/videowidget.cpp \ $$PHONON_DS9_DIR/videorenderer_soft.cpp \ $$PHONON_DS9_DIR/videorenderer_vmr9.cpp \ + $$PHONON_DS9_DIR/videorenderer_evr.cpp \ $$PHONON_DS9_DIR/volumeeffect.cpp \ $$PHONON_DS9_DIR/qbasefilter.cpp \ $$PHONON_DS9_DIR/qpin.cpp \ -- cgit v0.12 From ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 15 Apr 2010 20:32:27 +1000 Subject: Fix previous merge commit. --- src/3rdparty/phonon/ds9/mediaobject.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp index 34f92c2..d640956 100644 --- a/src/3rdparty/phonon/ds9/mediaobject.cpp +++ b/src/3rdparty/phonon/ds9/mediaobject.cpp @@ -27,6 +27,9 @@ along with this library. If not, see . #include #include #include +#ifdef Q_CC_MSVC +# include +#endif #include #include "mediaobject.h" -- cgit v0.12 From f2f5184d4a1c1bb0dd4816a13918a67ae0435d3d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 15 Apr 2010 12:23:19 +0200 Subject: qdoc: Fixed .qdocconf files for assistant. (cherry picked from commit 114cb018c088570ff0640eeb0d57594905ff9fcf) --- tools/qdoc3/test/qt-build-docs.qdocconf | 30 ++++++++++++++++++++++++++- tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 29 +++++++++++++++++++++++++- tools/qdoc3/test/qt.qdocconf | 29 +++++++++++++++++++++++++- tools/qdoc3/test/qt_zh_CN.qdocconf | 29 +++++++++++++++++++++++++- 4 files changed, 113 insertions(+), 4 deletions(-) diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index c9392c0..900c7c3 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -22,13 +22,41 @@ qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML -qhp.Qt.extraFiles = classic.css \ +qhp.Qt.extraFiles = style/style.css \ + scripts/functions.js \ + scripts/jquery.js \ + images/api_examples.png \ + images/api_lookup.png \ + images/api_topcs.png \ + images/bg_11.png \ + images/bg_1_blank.png \ + images/bg_1.png \ + images/bg_1r.png \ + images/bg_r.png \ + images/bg_ul_blank.png \ + images/bg_ul.png \ + images/bg_ur_blank.png \ + images/bg_ur.png \ + images/breadcrumb.png \ + images/bullet_dn.png \ + images/bullet_gt.png \ + images/feedbackground.png \ + images/form_bg.png \ + images/horBar.png \ + images/page_bg.png \ + images/print.png \ + images/qt_guide.png \ images/qt-logo.png \ + images/qt_ref_doc.png \ + images/qt_tools.png \ + images/sep.png \ + images/sprites-combined.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ 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 diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 19db8a9..93c5e3e 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -29,8 +29,35 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML -qhp.Qt.extraFiles = classic.css \ +qhp.Qt.extraFiles = style/style.css \ + scripts/functions.js \ + scripts/jquery.js \ + images/api_examples.png \ + images/api_lookup.png \ + images/api_topcs.png \ + images/bg_11.png \ + images/bg_1_blank.png \ + images/bg_1.png \ + images/bg_1r.png \ + images/bg_r.png \ + images/bg_ul_blank.png \ + images/bg_ul.png \ + images/bg_ur_blank.png \ + images/bg_ur.png \ + images/breadcrumb.png \ + images/bullet_dn.png \ + images/bullet_gt.png \ + images/feedbackground.png \ + images/form_bg.png \ + images/horBar.png \ + images/page_bg.png \ + images/print.png \ + images/qt_guide.png \ images/qt-logo.png \ + images/qt_ref_doc.png \ + images/qt_tools.png \ + images/sep.png \ + images/sprites-combined.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 29b49e2..91f9525 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -24,8 +24,35 @@ qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML -qhp.Qt.extraFiles = classic.css \ +qhp.Qt.extraFiles = style/style.css \ + scripts/functions.js \ + scripts/jquery.js \ + images/api_examples.png \ + images/api_lookup.png \ + images/api_topcs.png \ + images/bg_11.png \ + images/bg_1_blank.png \ + images/bg_1.png \ + images/bg_1r.png \ + images/bg_r.png \ + images/bg_ul_blank.png \ + images/bg_ul.png \ + images/bg_ur_blank.png \ + images/bg_ur.png \ + images/breadcrumb.png \ + images/bullet_dn.png \ + images/bullet_gt.png \ + images/feedbackground.png \ + images/form_bg.png \ + images/horBar.png \ + images/page_bg.png \ + images/print.png \ + images/qt_guide.png \ images/qt-logo.png \ + images/qt_ref_doc.png \ + images/qt_tools.png \ + images/sep.png \ + images/sprites-combined.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf index 980c542..925edec 100644 --- a/tools/qdoc3/test/qt_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt_zh_CN.qdocconf @@ -31,8 +31,35 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML -qhp.Qt.extraFiles = classic.css \ +qhp.Qt.extraFiles = style/style.css \ + scripts/functions.js \ + scripts/jquery.js \ + images/api_examples.png \ + images/api_lookup.png \ + images/api_topcs.png \ + images/bg_11.png \ + images/bg_1_blank.png \ + images/bg_1.png \ + images/bg_1r.png \ + images/bg_r.png \ + images/bg_ul_blank.png \ + images/bg_ul.png \ + images/bg_ur_blank.png \ + images/bg_ur.png \ + images/breadcrumb.png \ + images/bullet_dn.png \ + images/bullet_gt.png \ + images/feedbackground.png \ + images/form_bg.png \ + images/horBar.png \ + images/page_bg.png \ + images/print.png \ + images/qt_guide.png \ images/qt-logo.png \ + images/qt_ref_doc.png \ + images/qt_tools.png \ + images/sep.png \ + images/sprites-combined.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ images/dynamiclayouts-example.png \ -- cgit v0.12 From 3764acbd211b97cf48908d90697d16e43c116836 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 13 Apr 2010 15:15:33 +0200 Subject: Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. Reveiwed-by: trustme (cherry picked from commit c0d02030333c9f96188b5a425f2552472ab53325) --- doc/src/index.qdoc | 2 - doc/src/template/images/bullet_dn.png | Bin 0 -> 230 bytes doc/src/template/images/bullet_up.png | Bin 0 -> 253 bytes doc/src/template/images/header.png | Bin 0 -> 2600 bytes doc/src/template/scripts/functions.js | 11 +- doc/src/template/style/style.css | 817 +++++++++--------------- tools/qdoc3/test/qt-defines.qdocconf | 2 + tools/qdoc3/test/qt-html-templates.qdocconf | 26 +- tools/qdoc3/test/scripts/functions.js | 60 ++ tools/qdoc3/test/scripts/jquery.js | 152 +++++ tools/qdoc3/test/style/style.css | 946 ++++++++++++++++++++++++++++ tools/qdoc3/test/style/style_ie6.css | 54 ++ tools/qdoc3/test/style/style_ie7.css | 19 + tools/qdoc3/test/style/style_ie8.css | 0 14 files changed, 1562 insertions(+), 527 deletions(-) create mode 100644 doc/src/template/images/bullet_dn.png create mode 100644 doc/src/template/images/bullet_up.png create mode 100644 doc/src/template/images/header.png create mode 100644 tools/qdoc3/test/scripts/functions.js create mode 100644 tools/qdoc3/test/scripts/jquery.js create mode 100644 tools/qdoc3/test/style/style.css create mode 100644 tools/qdoc3/test/style/style_ie6.css create mode 100644 tools/qdoc3/test/style/style_ie7.css create mode 100644 tools/qdoc3/test/style/style_ie8.css diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 71060f8..2f23e6e 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -43,8 +43,6 @@ \page index.html \keyword Qt Reference Documentation - \title Qt Reference Documentation - \raw HTML
diff --git a/doc/src/template/images/bullet_dn.png b/doc/src/template/images/bullet_dn.png new file mode 100644 index 0000000..f776247 Binary files /dev/null and b/doc/src/template/images/bullet_dn.png differ diff --git a/doc/src/template/images/bullet_up.png b/doc/src/template/images/bullet_up.png new file mode 100644 index 0000000..285e741 Binary files /dev/null and b/doc/src/template/images/bullet_up.png differ diff --git a/doc/src/template/images/header.png b/doc/src/template/images/header.png new file mode 100644 index 0000000..141488b Binary files /dev/null and b/doc/src/template/images/header.png differ diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index c510410..329b910 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -1,7 +1,7 @@ /* START non link areas where cursor should change to pointing hand */ $('.t_button').mouseover(function() { - $(this).css('cursor','pointer'); + $('.t_button').css('cursor','pointer'); /*document.getElementById(this.id).style.cursor='pointer';*/ }); @@ -17,17 +17,20 @@ $('#medA').click(function() { $('.content h1').css('font','600 18px/1.2 Arial'); $('.content h2').css('font','600 16px/1.2 Arial'); $('.content h3').css('font','600 14px/1.2 Arial'); - $('.content p').css('font','13px/1.2 Verdana'); - $('.content li').css('font','600 10pt/1 Verdana'); + $('.content p').css('font','13px/20px Verdana'); + $('.content li').css('font','400 13px/1 Verdana'); $('.content li').css('line-height','14px'); + $('.content .toc li').css('font', 'normal 10px/1.2 Verdana'); $('.content table').css('font','13px/1.2 Verdana'); + $('.content .heading').css('font','600 16px/1 Arial'); + $('.content .indexboxcont li').css('font','600 13px/1 Verdana'); $('.t_button').removeClass('active') $(this).addClass('active') }); $('#bigA').click(function() { $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large'); - $('.content li').css('line-height','14px'); + $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('line-height','25px'); $('.t_button').removeClass('active') $(this).addClass('active') }); diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 4668c23..c46e875 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -73,6 +73,7 @@ { font-size: 100%; } + /* Page style */ html { background-color: #e5e5e5; @@ -101,7 +102,6 @@ { background: url(../images/bg_r.png) repeat-y 100% 0; } - .wrapper .hd { padding-left: 216px; @@ -109,12 +109,10 @@ background: url(../images/bg_ul.png) no-repeat 0 0; overflow: hidden; } - .offline .wrapper .hd { background: url(../images/bg_ul_blank.png) no-repeat 0 0; } - .wrapper .hd span { height: 15px; @@ -122,23 +120,19 @@ background: url(../images/bg_ur.png) no-repeat 100% 0; overflow: hidden; } - .offline .wrapper .hd span { /* background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */ } - .wrapper .bd { background: url(../images/bg_l.png) repeat-y 0 0; position: relative; } - .offline .wrapper .bd { background: url(../images/bg_l_blank.png) repeat-y 0 0; } - .wrapper .ft { padding-left: 216px; @@ -146,12 +140,10 @@ background: url(../images/bg_ll.png) no-repeat 0 0; overflow: hidden; } - .offline .wrapper .ft { background: url(../images/bg_ll_blank.png) no-repeat 0 0; } - .wrapper .ft span { height: 15px; @@ -159,34 +151,23 @@ background: url(../images/bg_lr.png) no-repeat 100% 0; overflow: hidden; } - .header, .footer { display: block; clear: both; overflow: hidden; } - - /* .header - { - height: 130px; - position: relative; - } - */ - .header { height: 115px; position: relative; } - .header .icon { position: absolute; top: 13px; left: 0; } - .header .qtref { position: absolute; @@ -195,7 +176,6 @@ width: 302px; height: 22px; } - .header .qtref span { display: block; @@ -204,7 +184,184 @@ text-indent: -999em; background: url(../images/qt_ref_doc.png) no-repeat 0 0; } + /* header elements */ + #nav-topright + { + height: 70px; + } + + #nav-topright ul + { + list-style-type: none; + float: right; + width: 370px; + margin-top: 11px; + } + + #nav-topright li + { + display: inline-block; + margin-right: 20px; + float: left; + } + + #nav-topright li.nav-topright-last + { + margin-right: 0; + } + + #nav-topright li a + { + background: transparent url(../images/sprites-combined.png) no-repeat; + height: 18px; + display: block; + overflow: hidden; + text-indent: -9999px; + } + + #nav-topright li.nav-topright-home a + { + width: 65px; + background-position: -2px -91px; + } + + #nav-topright li.nav-topright-home a:hover + { + background-position: -2px -117px; + } + + + #nav-topright li.nav-topright-dev a + { + width: 30px; + background-position: -76px -91px; + } + + #nav-topright li.nav-topright-dev a:hover + { + background-position: -76px -117px; + } + + + #nav-topright li.nav-topright-labs a + { + width: 40px; + background-position: -114px -91px; + } + + #nav-topright li.nav-topright-labs a:hover + { + background-position: -114px -117px; + } + + #nav-topright li.nav-topright-doc a + { + width: 32px; + background-position: -162px -91px; + } + + #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a + { + background-position: -162px -117px; + } + + #nav-topright li.nav-topright-blog a + { + width: 40px; + background-position: -203px -91px; + } + + #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a + { + background-position: -203px -117px; + } + + #nav-topright li.nav-topright-shop a + { + width: 40px; + background-position: -252px -91px; + } + + #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a + { + background-position: -252px -117px; + } + + #nav-logo + { + background: transparent url( "../images/sprites-combined.png" ) no-repeat 0 -225px; + left: -3px; + position: absolute; + width: 75px; + height: 75px; + top: 13px; + } + #nav-logo a + { + width: 75px; + height: 75px; + display: block; + text-indent: -9999px; + overflow: hidden; + } + /* Clearing */ + .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after + { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + /* ^ Clearing */ + + + + .shortCut-topleft-inactive + { + padding-left: 3px; + background: transparent url( "../images/sprites-combined.png" ) no-repeat 0px -58px; + height: 20px; + width: 93px; + } + .shortCut-topleft-inactive span + { + font-variant: normal; + } + #shortCut + { + padding-top: 10px; + font-weight: bolder; + color: #b0adab; + } + #shortCut ul + { + list-style-type: none; + float: left; + width: 347px; + margin-left: 100px; + } + #shortCut li + { + display: inline-block; + margin-right: 25px; + float: left; + white-space: nowrap; + } + #shortCut li a + { + color: #b0adab; + text-decoration: none; + } + #shortCut li a:hover + { + color: #44a51c; + text-decoration: none; + } + /* end of header elements */ + + /* menu element */ .sidebar { float: left; @@ -212,7 +369,6 @@ width: 200px; font-size: 11px; } - .sidebar a { color: #00732f; @@ -222,19 +378,15 @@ { display: none; } - .sidebar .searchlabel { padding: 0 0 2px 17px; font: normal bold 11px/1.2 Verdana; } - .sidebar .search { padding: 0 15px 0 16px; } - - .sidebar .search form { width: 167px; @@ -242,7 +394,6 @@ padding: 2px 0 0 5px; background: url(../images/form_bg.png) no-repeat 0 0; } - .sidebar .search form fieldset input#searchstring { width: 158px; @@ -252,84 +403,66 @@ outline: none; font: 13px/1.2 Verdana; } - .sidebar .box { padding: 17px 15px 5px 16px; } - .sidebar .box .first { background-image: none; } - .sidebar .box h2 { font: normal 18px/1.2 Arial; padding: 15px 0 0 40px; min-height: 32px; } - .sidebar .box#lookup h2 { background: url(../images/api_lookup.png) no-repeat 0 0; } - .sidebar .box#topics h2 { background: url(../images/api_topics.png) no-repeat 0 0; } - .sidebar .box#examples h2 { background: url(../images/api_examples.png) no-repeat 0 0; } - .sidebar .box .list { display: block; } - .sidebar .box .live { display: none; height: 100px; overflow: auto; } - .list li a:hover, .live li a:hover { text-decoration: underline; } - - - .sidebar .box ul - { - } - .sidebar .box ul li { padding-left: 12px; background: url(../images/bullet_gt.png) no-repeat 0 5px; margin-bottom: 15px; } - .sidebar .bottombar { background: url(../images/box_bg.png) repeat-x 0 bottom; } - + /* content elements */ .wrap { - /* margin: 0 5px 0 0px;*/ overflow: hidden; } - .offline .wrap { margin: 0 5px 0 5px; } - + /* tool bar */ .wrap .toolbar { background-color: #fafafa; @@ -339,12 +472,10 @@ margin-right: 5px; position: relative; } - .wrap .toolbar .toolblock { position: absolute; } - .wrap .toolbar .breadcrumb { font-size: 11px; @@ -359,12 +490,10 @@ vertical-align: top; overflow: hidden; } - .wrap .toolbar .toolbuttons .active { color: #00732F; } - .wrap .toolbar .toolbuttons ul { float: right; @@ -378,7 +507,6 @@ font-weight: bold; color: #B0ADAB; } - #smallA { font-size: 10pt; @@ -391,31 +519,20 @@ { font-size: 14pt; } - #smallA:hover, #medA:hover, #bigA:hover { color: #00732F; } - #print { font-size: 14pt; line-height: 20pt; } - #printIcon { margin-left: 5px; } - - .offline .wrap .breadcrumb - { - } - - .wrap .breadcrumb ul - { - } - + /* bread crumbs */ .wrap .breadcrumb ul li { float: left; @@ -424,105 +541,87 @@ margin-left: 15px; font-weight: bold; } - .wrap .breadcrumb ul li.last { font-weight: normal; } - - .wrap .breadcrumb ul li a - { - } - .wrap .breadcrumb ul li.first { background-image: none; padding-left: 0; margin-left: 0; } - .wrap .content { - /* left 30 top 27*/ padding: 30px; position: relative; } - + /* text elements */ .heading { font: normal 600 16px/1.0 Arial; padding-bottom: 15px; } + .subtitle + { + font-size: 13px; + } + + .small-subtitle + { + font-size: 13px; + } + .wrap .content h1 { font: 600 18px/1.2 Arial; padding-bottom: 15px; } - .wrap .content h2 { font: 600 16px/1.2 Arial; } - .wrap .content h3 { font: 600 14px/1.2 Arial; } - - - .wrap .content p { - padding-bottom: 10px; + line-height:20px; + padding:10px 5px 10px 5px; } - .wrap .content ul { - padding-left: 15px; + padding-left: 25px; } .wrap .content li { padding-left: 12px; background: url(../images/bullet_sq.png) no-repeat 0 5px; - font: normal 600 10pt/1 Verdana; + font: normal 400 10pt/1 Verdana; margin-bottom: 10px; line-height: 14px; } - - .content li:hover + a { + color: #00732F; text-decoration: none; } - - .content li + a:hover { - text-decoration: none; + color: #4c0033; + text-decoration: underline; } - - /*.content*/ a - { - color: #00732F; - text-decoration: none; - } - - .content a:hover - { - color: #4c0033; - text-decoration: underline; - } - .content a:visited { color: #4c0033; + text-decoration: none; } - .offline .wrap .content { padding-top: 15px; } - - .footer { min-height: 100px; @@ -531,7 +630,6 @@ text-align: center; padding-top: 40px; } - .feedback { float: right; @@ -539,7 +637,6 @@ font: normal 8px/1 Verdana; color: #B0ADAB; } - .feedback:hover { float: right; @@ -547,196 +644,6 @@ color: #00732F; text-decoration: underline; } - - - - /* Clearing */ - .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after - { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - /* ^ Clearing */ - - - /* header elements */ - - - #nav-topright - { - height: 70px; - } - - #nav-topright ul - { - list-style-type: none; - float: right; - width: 347px; - margin-top: 11px; - } - - #nav-topright li - { - display: inline-block; - margin-right: 20px; - float: left; - } - - #nav-topright li.nav-topright-last - { - margin-right: 0; - } - - #nav-topright li a - { - background: transparent url(../images/sprites-combined.png) no-repeat; - height: 18px; - display: block; - overflow: hidden; - text-indent: -9999px; - } - - #nav-topright li.nav-topright-home a - { - width: 65px; - background-position: -2px -91px; - } - - #nav-topright li.nav-topright-home a:hover - { - background-position: -2px -117px; - } - - - #nav-topright li.nav-topright-dev a - { - width: 30px; - background-position: -76px -91px; - } - - #nav-topright li.nav-topright-dev a:hover - { - background-position: -76px -117px; - } - - - #nav-topright li.nav-topright-labs a - { - width: 40px; - background-position: -114px -91px; - } - - #nav-topright li.nav-topright-labs a:hover - { - background-position: -114px -117px; - } - - #nav-topright li.nav-topright-doc a - { - width: 32px; - background-position: -162px -91px; - } - - #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a - { - background-position: -162px -117px; - } - - #nav-topright li.nav-topright-blog a - { - width: 40px; - background-position: -203px -91px; - } - - #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a - { - background-position: -203px -117px; - } - - #nav-topright li.nav-topright-shop a - { - width: 40px; - background-position: -252px -91px; - } - - #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a - { - background-position: -252px -117px; - } - - #nav-logo - { - background: transparent url( "../images/sprites-combined.png" ) no-repeat 0 -225px; - left: -3px; - position: absolute; - width: 75px; - height: 75px; - top: 13px; - } - #nav-logo a - { - width: 75px; - height: 75px; - display: block; - text-indent: -9999px; - overflow: hidden; - } - - - .shortCut-topleft-inactive - { - padding-left: 3px; - background: transparent url( "../images/sprites-combined.png" ) no-repeat 0px -58px; - height: 20px; - width: 93px; - } - - .shortCut-topleft-inactive span - { - font-variant: normal; - } - - #shortCut - { - padding-top: 10px; - font-weight: bolder; - color: #b0adab; - } - - #shortCut ul - { - list-style-type: none; - float: left; - width: 347px; - margin-left: 100px; - } - - #shortCut li - { - display: inline-block; - margin-right: 25px; - float: left; - white-space: nowrap; - } - - #shortCut li a - { - color: #b0adab; - text-decoration: none; - } - - #shortCut li a:hover - { - color: #44a51c; - text-decoration: none; - } - - - /* end of header elements */ - hr { background-color: #e0e0e0; @@ -745,228 +652,111 @@ text-align: left; margin: 15px 0px 15px 0px; } + .content .alignedsummary { margin: 15px; } - - table.valuelist - { - border-width: 0px 0px 1px 0px; - border-style: solid; - border-color: #b0adab; - border-collapse: collapse; - background-color: #f0f0f0; /* border-bottom: solid 1px #b0adab;*/ - } - - table.valuelist th - { - border-width: 0px 0px 0px 0px; - padding: 4px; - color: #00732F; - font: 600 10pt/1 Verdana; - } - - table.generic, table.annotated + /* tables */ + table, pre { - border: none; - padding-left: 15px; - padding-right: 15px; - margin-bottom: 15px; - } - - - table td.memItemLeft - { - width: 180px; - padding: 2px 0px 0px 8px; - margin: 4px; - border-width: 1px; - border-color: #b0adab; - border-style: none; - font-size: 100%; - white-space: nowrap; - } - - table td.memItemRight - { - padding: 2px 8px 0px 8px; - margin: 4px; - border-width: 1px; - border-color: #b0adab; - border-style: none; - font-size: 100%; + -moz-border-radius: 7px 7px 7px 7px; + background-color: #F6F6F6; + border: 1px solid #E6E6E6; + border-collapse: separate; + font-size: 11px; + min-width: 395px; + margin-bottom: 25px; } - + thead{margin-top: 5px;} + th{ padding: 3px 15px 3px 15px;} + td{padding: 3px 15px 3px 20px;} table tr.odd { - background: #EBEBEB; + border-left: 1px solid #E6E6E6; + background-color: #F6F6F6; color: #66666E; } - table tr.even { - background: #F4F4F4; + border-left: 1px solid #E6E6E6; + background-color: #ffffff; color: #66666E; } - - table.annotated th + table tr.odd:hover { - padding: 3px; - text-align: left; + background-color: #E6E6E6; } - - table td, table th + table tr.even:hover { - padding: 3px; /* border:solid 1px #FFFFFF;*/ + background-color: #E6E6E6; } - - table tr pre - { - padding-top: 0px; - padding-bottom: 0px; - padding-left: 0px; - padding-right: 0px; - border: none; - background: none; - } - - tr.qt-style /* change me - widgets-sliders.html*/ - { - background: #BCBCBC; - border-bottom: solid 1px #b0adab; - } - - table tr.qt-code pre /* investigate */ - { - padding: 0.2em; - border: #e7e7e7 1px solid; - background: #f1f1f1; - color: black; - } - - span.preprocessor, span.preprocessor a - { - color: darkblue; - } - span.comment { - color: darkred; + color: #8B0000; font-style: italic; } - span.string, span.char { - color: darkgreen; + color: #254117; } - - .subtitle + pre { - font-size: 13px; + -moz-border-radius:7px 7px 7px 7px; + background-color:#F6F6F6; + border:1px solid #DDDDDD; + margin:0 20px 10px 10px; + padding:20px 15px 20px 20px; + overflow-x:auto; } - - .small-subtitle - { - font-size: 13px; - } - - .qmlitem - { - padding: 0; - } - - .qmlname - { - white-space: nowrap; - } - .qmltype { text-align: center; font-size: 160%; } - - .qmlproto - { - background-color: #eee; - border-width: 1px; - border-style: solid; - border-color: #ddd; - font-weight: bold; - padding: 6px 10px 6px 10px; - margin: 42px 0px 0px 0px; - } - .qmlreadonly { float: right; - color: red; - } - - .qmldoc - { + color: #254117; } - - *.qmlitem p - { - } - - - thead - { - margin-top: 5px; - } - - td - { - padding: 5px; - } - th - { - padding: 5px; - } - - #feedbackBox { - display: none; - position: fixed; + display:none; + -moz-border-radius:7px 7px 7px 7px; + border:1px solid #DDDDDD; + position:fixed; + top:100px; left: 33%; - bottom: 200px; height: 190px; width: 400px; padding: 5px; background-color: #e6e7e8; z-index: 4; } - #feedcloseX a { - padding-top: 5px; - padding-right: 5px; - color: #333333; + display:inline; + padding: 5px 5px 0 0; + margin-bottom:3px; + color: #363534; + font-weight:600; float: right; text-decoration: none; } - #feedbox + /* here */ { - float: none; - width: 350px; + display:inline; + width: 370px; height: 120px; - margin-top: 5px; - margin-left: 25px; - margin-right: 25px; + margin:0px 25px 10px 15px; } - #feedsubmit { - float: right; - margin-top: 4px; - margin-right: 22px; + display:inline; + float:right; + margin:4px 32px 0 0; } - #blurpage { display: none; @@ -979,74 +769,83 @@ background: transparent url(../images/feedbackground.png) 0 0; z-index: 3; } - /* page elements */ .toc { - float: right; - border: solid 1px #666600; - background-color: #FFFFCC; - margin: 15px; + float: right; + -moz-border-radius:7px 7px 7px 7px; + background-color:#F6F6F6; + border:1px solid #DDDDDD; + margin:0 20px 10px 10px; + padding:20px 15px 20px 20px; height: auto; width: 200px; } + .toc h3 + { + font:600 12px/1.2 Arial; + } + .toc ul { float: left; padding: 15px; + } + .content .toc li { - font: normal 13px/1.2 Verdana; + font: normal 10px/1.2 Verdana; + background: url(../images/bullet_dn.png) no-repeat 0 5px; } - - .relpage /* edit */ + + .relpage { + -moz-border-radius: 7px 7px 7px 7px; + border: 1px solid #DDDDDD; + padding: 25px 25px; clear:both; - border: solid 1px #666600; - background-color: #FFFFCC; - height: auto; - width: 100%; - } - .relpage ul - { - float:none; + } + .relpage ul + { + float: none; padding: 15px; - - } - .relpage li - { - font: normal 13px/1.2 Verdana; - - } -/* edit */ + } + .content .relpage li + { + font: normal 11px/1.2 Verdana; + } + /* edit */ h3.fn, span.fn { - background-color: #eee; + background-color: #F6F6F6; border-width: 1px; border-style: solid; - border-color: #ddd; - font-weight: bold; - /* padding: 6px 0px 6px 10px;*/ - /* margin: 42px 0px 0px 0px;*/ + border-color: #E6E6E6; + font-weight: bold; + /* padding: 6px 0px 6px 10px;*/ + /* margin: 42px 0px 0px 0px;*/ } /* edit */ .indexbox { - /* max-width:785px;*/ - width: 100%; /* margin-bottom: 30px;*/ + width: 100%; + } + .content .indexboxcont li + { + font: normal 600 13px/1 Verdana; } - .indexbox a + /* .indexbox a { color: #00732f; text-decoration: none; - } - .indexbox a:hover + }*/ + .indexbox a:hover, .indexbox a:visited:hover { - color: #00732f; + color: #4c0033; text-decoration: underline; } .indexbox a:visited @@ -1062,14 +861,14 @@ .indexboxbar { - background: transparent url( "../images/horBar.png" ) repeat-x left bottom; + background: transparent url( "../images/horBar.png" ) repeat-x left bottom; margin-bottom: 25px; } .indexboxcont .section { - display: inline-block; /*Pål padding-right: 20px; padding-left: 10px; */ - width: 49%; + display: inline-block; + width: 49%; *width:42%; _width:42%; padding:0 2% 0 1%; @@ -1078,14 +877,13 @@ .indexboxcont .indexIcon { - /*PÅL width: 115px;*/ - width: 13%; + width: 11%; *width:18%; _width:18%; overflow:hidden; } .indexboxcont .section p - { /*PÅL max-width: 350px;*/ + { padding-top: 20px; padding-bottom: 20px; } @@ -1093,37 +891,40 @@ .indexboxcont .sectionlist { display: inline-block; - width: 34%; - margin-right:-2px; - vertical-align:top; + width: 33%; + margin-right: -2px; + vertical-align: top; padding: 0; } .tricol { - /* margin-left: 10px; *//*PÅL padding-right:76px;*/ + } .indexboxcont .sectionlist ul { + padding-left: 15px; margin-bottom: 20px; } - +/* .indexboxcont .sectionlist ul li { line-height: 12px; } - +*/ .lastcol { display: inline-block; - vertical-align:top; + vertical-align: top; padding: 0; max-width: 25%; } .tricol .lastcol { + margin-left:-6px; } + /*.toc ul*/ /* end page elements */ } diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf index e1a008e..faf3906 100644 --- a/tools/qdoc3/test/qt-defines.qdocconf +++ b/tools/qdoc3/test/qt-defines.qdocconf @@ -29,6 +29,8 @@ extraimages.HTML = qt-logo \ bg_ll_blank.png \ bg_ur.png \ bullet_sq.png \ + bullet_dn.png \ + bullet_up.png \ page_bg.png \ qt_tools.png \ api_topics.png \ diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 5bb4382..67a25f3 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -103,7 +103,7 @@ HTML.postheader = "
\n" \ "
\n" HTML.footer = "
\n" \ - "
\n" \ + "
\n" \ " [+] Documentation Feedback
\n" \ "
\n" \ "
\n" \ @@ -113,20 +113,20 @@ HTML.footer = "
\n" \ "
\n" \ "
\n" \ "

\n" \ - " © 2008-2010 Nokia Corporation and/or its>\n" \ + " © 2008-2010 Nokia Corporation and/or its\n" \ " subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation>\n" \ " in Finland and/or other countries worldwide.

\n" \ "

\n" \ - " All other trademarks are property of their respective owners. \n" \ + " All other trademarks are property of their respective owners. Privacy Policy

\n" \ "
\n" \ "
\n" \ "
\n" \ "
\n" \ - " X\n" \ + " X\n" \ "
\n" \ " \n" \ - " \n" \ + " \n" \ "
\n" \ "
\n" \ @@ -134,12 +134,12 @@ HTML.footer = " \n" \ " \n" \ " \n" \ "\n" diff --git a/tools/qdoc3/test/scripts/functions.js b/tools/qdoc3/test/scripts/functions.js new file mode 100644 index 0000000..0135427 --- /dev/null +++ b/tools/qdoc3/test/scripts/functions.js @@ -0,0 +1,60 @@ + +/* START non link areas where cursor should change to pointing hand */ +$('.t_button').mouseover(function() { + $('.t_button').css('cursor','pointer'); + /*document.getElementById(this.id).style.cursor='pointer';*/ +}); + +/* END non link areas */ +$('#smallA').click(function() { + $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller'); + $('.t_button').removeClass('active') + $(this).addClass('active') +}); + +$('#medA').click(function() { + $('.content .heading').css('font','600 16px/1 Arial'); + $('.content h1').css('font','600 18px/1.2 Arial'); + $('.content h2').css('font','600 16px/1.2 Arial'); + $('.content h3').css('font','600 14px/1.2 Arial'); + $('.content p').css('font','13px/20px Verdana'); + $('.content li').css('font','400 13px/1 Verdana'); + $('.content li').css('line-height','14px'); + $('.content table').css('font','13px/1.2 Verdana'); + $('.content .heading').css('font','600 16px/1 Arial'); + $('.content .indexboxcont li').css('font','600 13px/1 Verdana'); + $('.t_button').removeClass('active') + $(this).addClass('active') +}); + +$('#bigA').click(function() { + $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large'); + $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('line-height','25px'); + $('.t_button').removeClass('active') + $(this).addClass('active') +}); + +function doSearch(str){ + +if (str.length>3) + { + alert('start search'); + // document.getElementById("refWrapper").innerHTML=""; + return; + } + else + return; + +// var url="indexSearch.php"; +// url=url+"?q="+str; + // url=url+"&sid="+Math.random(); + // var url="http://localhost:8983/solr/select?"; + // url=url+"&q="+str; + // url=url+"&fq=&start=0&rows=10&fl=&qt=&wt=&explainOther=&hl.fl="; + + // $.get(url, function(data){ + // alert(data); + // document.getElementById("refWrapper").innerHTML=data; + //}); + +} \ No newline at end of file diff --git a/tools/qdoc3/test/scripts/jquery.js b/tools/qdoc3/test/scripts/jquery.js new file mode 100644 index 0000000..0c7294c --- /dev/null +++ b/tools/qdoc3/test/scripts/jquery.js @@ -0,0 +1,152 @@ +/*! + * jQuery JavaScript Library v1.4.1 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Mon Jan 25 19:43:33 2010 -0500 + */ +(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f, +a.currentTarget);m=0;for(s=i.length;m)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent, +va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]], +[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a, +this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this, +a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice}; +c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
a";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support= +{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null}; +b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="";a=r.createDocumentFragment();a.appendChild(d.firstChild); +c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props= +{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true, +{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this, +a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d); +return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]|| +a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m= +c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value|| +{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d); +f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText= +""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j= +function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a, +d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+ +s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a, +"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d, +b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b, +d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), +fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop|| +d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b= +0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true}; +c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b= +a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!== +"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this, +"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"|| +d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a= +a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this, +f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a, +b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g|| +typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u= +l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&& +y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&& +"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true); +return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"=== +g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2=== +0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return hk[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k= +0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="? +k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g}; +try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id"); +return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href", +2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="

";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length=== +0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[], +l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var i=d;i0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e +-1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(), +a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")}, +nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e): +e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!== +b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/"},F={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"], +col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)}, +wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length? +d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments, +false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&& +!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/\n"; out() << " \n"; out() << "\n"; - -#if 0 - out() << "\n"; - out() << QString("\n").arg(naturalLanguage); - - QString shortVersion; - if ((project != "Qtopia") && (project != "Qt Extended")) { - shortVersion = project + " " + shortVersion + ": "; - if (node && !node->doc().location().isEmpty()) - out() << "\n"; - - shortVersion = myTree->version(); - if (shortVersion.count(QChar('.')) == 2) - shortVersion.truncate(shortVersion.lastIndexOf(QChar('.'))); - if (!shortVersion.isEmpty()) { - if (project == "QSA") - shortVersion = "QSA " + shortVersion + ": "; - else - shortVersion = "Qt " + shortVersion + ": "; - } - } - - out() << "\n" - " " << shortVersion << protectEnc(title) << "\n"; - out() << QString("").arg(outputEncoding); - - if (!style.isEmpty()) - out() << " \n"; - - const QMap &metaMap = node->doc().metaTagMap(); - if (!metaMap.isEmpty()) { - QMapIterator i(metaMap); - while (i.hasNext()) { - i.next(); - out() << " \n"; - } - } - - navigationLinks.clear(); - - if (node && !node->links().empty()) { - QPair linkPair; - QPair anchorPair; - const Node *linkNode; - - if (node->links().contains(Node::PreviousLink)) { - linkPair = node->links()[Node::PreviousLink]; - linkNode = findNodeForTarget(linkPair.first, node, marker); - if (!linkNode || linkNode == node) - anchorPair = linkPair; - else - anchorPair = anchorForNode(linkNode); - - out() << " \n"; - - navigationLinks += "[Previous: "; - if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) - navigationLinks += protectEnc(anchorPair.second); - else - navigationLinks += protectEnc(linkPair.second); - navigationLinks += "]\n"; - } - if (node->links().contains(Node::ContentsLink)) { - linkPair = node->links()[Node::ContentsLink]; - linkNode = findNodeForTarget(linkPair.first, node, marker); - if (!linkNode || linkNode == node) - anchorPair = linkPair; - else - anchorPair = anchorForNode(linkNode); - - out() << " \n"; - - navigationLinks += "["; - if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) - navigationLinks += protectEnc(anchorPair.second); - else - navigationLinks += protectEnc(linkPair.second); - navigationLinks += "]\n"; - } - if (node->links().contains(Node::NextLink)) { - linkPair = node->links()[Node::NextLink]; - linkNode = findNodeForTarget(linkPair.first, node, marker); - if (!linkNode || linkNode == node) - anchorPair = linkPair; - else - anchorPair = anchorForNode(linkNode); - - out() << " \n"; - - navigationLinks += "[Next: "; - if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) - navigationLinks += protectEnc(anchorPair.second); - else - navigationLinks += protectEnc(linkPair.second); - navigationLinks += "]\n"; - } - if (node->links().contains(Node::IndexLink)) { - linkPair = node->links()[Node::IndexLink]; - linkNode = findNodeForTarget(linkPair.first, node, marker); - if (!linkNode || linkNode == node) - anchorPair = linkPair; - else - anchorPair = anchorForNode(linkNode); - out() << " \n"; - } - if (node->links().contains(Node::StartLink)) { - linkPair = node->links()[Node::StartLink]; - linkNode = findNodeForTarget(linkPair.first, node, marker); - if (!linkNode || linkNode == node) - anchorPair = linkPair; - else - anchorPair = anchorForNode(linkNode); - out() << " \n"; - } - } - - foreach (const QString &stylesheet, stylesheets) { - out() << " \n"; - } - foreach (const QString &customHeadElement, customHeadElements) { - out() << " " << customHeadElement << "\n"; - } - - out() << "\n" - #endif + if (offlineDocs) + out() << "\n"; + else out() << "\n"; + if (mainPage) generateMacRef(node, marker); out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version()); -#if 0 +#if 0 // Removed for new docf format. MWS if (node && !node->links().empty()) out() << "

\n" << navigationLinks << "

\n"; #endif @@ -4375,8 +4254,6 @@ void HtmlGenerator::endLink() inObsoleteLink = false; } -QT_END_NAMESPACE - #ifdef QDOC_QML /*! @@ -4728,3 +4605,139 @@ void HtmlGenerator::generatePageIndex(const QString& fileName, CodeMarker* marke } #endif + +#if 0 // fossil removed for new doc format MWS 19/04/2010 + out() << "\n"; + out() << QString("\n").arg(naturalLanguage); + + QString shortVersion; + if ((project != "Qtopia") && (project != "Qt Extended")) { + shortVersion = project + " " + shortVersion + ": "; + if (node && !node->doc().location().isEmpty()) + out() << "\n"; + + shortVersion = myTree->version(); + if (shortVersion.count(QChar('.')) == 2) + shortVersion.truncate(shortVersion.lastIndexOf(QChar('.'))); + if (!shortVersion.isEmpty()) { + if (project == "QSA") + shortVersion = "QSA " + shortVersion + ": "; + else + shortVersion = "Qt " + shortVersion + ": "; + } + } + + out() << "\n" + " " << shortVersion << protectEnc(title) << "\n"; + out() << QString("").arg(outputEncoding); + + if (!style.isEmpty()) + out() << " \n"; + + const QMap &metaMap = node->doc().metaTagMap(); + if (!metaMap.isEmpty()) { + QMapIterator i(metaMap); + while (i.hasNext()) { + i.next(); + out() << " \n"; + } + } + + navigationLinks.clear(); + + if (node && !node->links().empty()) { + QPair linkPair; + QPair anchorPair; + const Node *linkNode; + + if (node->links().contains(Node::PreviousLink)) { + linkPair = node->links()[Node::PreviousLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "[Previous: "; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protectEnc(anchorPair.second); + else + navigationLinks += protectEnc(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::ContentsLink)) { + linkPair = node->links()[Node::ContentsLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "["; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protectEnc(anchorPair.second); + else + navigationLinks += protectEnc(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::NextLink)) { + linkPair = node->links()[Node::NextLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + + out() << " \n"; + + navigationLinks += "[Next: "; + if (linkPair.first == linkPair.second && !anchorPair.second.isEmpty()) + navigationLinks += protectEnc(anchorPair.second); + else + navigationLinks += protectEnc(linkPair.second); + navigationLinks += "]\n"; + } + if (node->links().contains(Node::IndexLink)) { + linkPair = node->links()[Node::IndexLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + out() << " \n"; + } + if (node->links().contains(Node::StartLink)) { + linkPair = node->links()[Node::StartLink]; + linkNode = findNodeForTarget(linkPair.first, node, marker); + if (!linkNode || linkNode == node) + anchorPair = linkPair; + else + anchorPair = anchorForNode(linkNode); + out() << " \n"; + } + } + + foreach (const QString &stylesheet, stylesheets) { + out() << " \n"; + } + + foreach (const QString &customHeadElement, customHeadElements) { + out() << " " << customHeadElement << "\n"; + } + + out() << "\n" + #endif + + QT_END_NAMESPACE diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h index 559c968..2a365e9 100644 --- a/tools/qdoc3/htmlgenerator.h +++ b/tools/qdoc3/htmlgenerator.h @@ -297,6 +297,7 @@ class HtmlGenerator : public PageGenerator bool inTableHeader; int numTableRows; bool threeColumnEnumValueTable; + bool offlineDocs; QString link; QStringList sectionNumber; QRegExp funcLeftParen; diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index cc3e436..ef6fe97 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -9,6 +9,7 @@ versionsym = version = %VERSION% description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 +online = true sourceencoding = UTF-8 outputencoding = UTF-8 -- cgit v0.12 From d66a6da84af01f1a6d4fd52d9b1cbec72a4fae3c Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 20 Apr 2010 13:02:51 +1000 Subject: Make offline docs the default for package generation. Acked-by: Martin Smith --- tools/qdoc3/test/qt.qdocconf | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index ef6fe97..cc3e436 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -9,7 +9,6 @@ versionsym = version = %VERSION% description = Qt Reference Documentation url = http://qt.nokia.com/doc/4.7 -online = true sourceencoding = UTF-8 outputencoding = UTF-8 -- cgit v0.12 From bb0aa3c61e8c443ec4207381ca10c85f6c4b6665 Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Tue, 20 Apr 2010 10:34:03 +0200 Subject: Fix crash on startup on Symbian OS The changes to QThread introduced by commit 9aa4538b219ed759a47e8d1f93c2797bf07b5e2f mean that the QThread constructor calls into the event dispatcher. The Symbian event dispatcher owns a QThread, so it crashed when the code re-entered the partially constructed event dispatcher and used an uninitialised pointer. This change delays construction of the QThread until the point of use, so that the event dispatcher is fully constructed. Task-number: QTBUG-10029 Reviewed-by: Jason Barron (cherry picked from commit 2b55d52669beb72396f94e449fdf172735349b3b) --- src/corelib/kernel/qeventdispatcher_symbian.cpp | 20 +++++++++++++++----- src/corelib/kernel/qeventdispatcher_symbian_p.h | 3 ++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index ca44264..f811361 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -632,6 +632,7 @@ void QSocketActiveObject::deleteLater() QEventDispatcherSymbian::QEventDispatcherSymbian(QObject *parent) : QAbstractEventDispatcher(parent), + m_selectThread(0), m_activeScheduler(0), m_wakeUpAO(0), m_completeDeferredAOs(0), @@ -659,11 +660,19 @@ void QEventDispatcherSymbian::startingUp() wakeUp(); } +QSelectThread& QEventDispatcherSymbian::selectThread() { + if (!m_selectThread) + m_selectThread = new QSelectThread; + return *m_selectThread; +} + void QEventDispatcherSymbian::closingDown() { - if (m_selectThread.isRunning()) { - m_selectThread.stop(); + if (m_selectThread && m_selectThread->isRunning()) { + m_selectThread->stop(); } + delete m_selectThread; + m_selectThread = 0; delete m_completeDeferredAOs; delete m_wakeUpAO; @@ -935,12 +944,13 @@ void QEventDispatcherSymbian::registerSocketNotifier ( QSocketNotifier * notifie { QSocketActiveObject *socketAO = q_check_ptr(new QSocketActiveObject(this, notifier)); m_notifiers.insert(notifier, socketAO); - m_selectThread.requestSocketEvents(notifier, &socketAO->iStatus); + selectThread().requestSocketEvents(notifier, &socketAO->iStatus); } void QEventDispatcherSymbian::unregisterSocketNotifier ( QSocketNotifier * notifier ) { - m_selectThread.cancelSocketEvents(notifier); + if (m_selectThread) + m_selectThread->cancelSocketEvents(notifier); if (m_notifiers.contains(notifier)) { QSocketActiveObject *sockObj = *m_notifiers.find(notifier); m_deferredSocketEvents.removeAll(sockObj); @@ -951,7 +961,7 @@ void QEventDispatcherSymbian::unregisterSocketNotifier ( QSocketNotifier * notif void QEventDispatcherSymbian::reactivateSocketNotifier(QSocketNotifier *notifier) { - m_selectThread.requestSocketEvents(notifier, &m_notifiers[notifier]->iStatus); + selectThread().requestSocketEvents(notifier, &m_notifiers[notifier]->iStatus); } void QEventDispatcherSymbian::registerTimer ( int timerId, int interval, QObject * object ) diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h index 1ab31cc..5281199 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian_p.h +++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h @@ -259,8 +259,9 @@ private: bool sendPostedEvents(); bool sendDeferredSocketEvents(); + QSelectThread& selectThread(); private: - QSelectThread m_selectThread; + QSelectThread *m_selectThread; CQtActiveScheduler *m_activeScheduler; -- cgit v0.12 From c6cb0de12b9bbb71690a0b6d5c53b2329767f2a4 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 19 Apr 2010 18:59:32 +0200 Subject: Quick fix to make the documentation work, needs a proper solution though. Reviewed-by: kh (cherry picked from commit 0fd81e81a357edb9f9e615cff28a1876bd363b2e) --- tools/assistant/tools/assistant/helpviewer.cpp | 4 ++++ tools/assistant/tools/assistant/helpviewer.h | 1 + tools/assistant/tools/assistant/helpviewer_qwv.cpp | 22 ++++++++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp index 0c51a02..85e4e71 100644 --- a/tools/assistant/tools/assistant/helpviewer.cpp +++ b/tools/assistant/tools/assistant/helpviewer.cpp @@ -52,6 +52,10 @@ QT_BEGIN_NAMESPACE +QString AbstractHelpViewer::DocPath = QString::fromLatin1("qthelp://com." + "trolltech.qt.%1/").arg(QString(QLatin1String(QT_VERSION_STR)) + .replace(QLatin1String("."), QLatin1String(""))); + QString AbstractHelpViewer::AboutBlank = QCoreApplication::translate("HelpViewer", "about:blank"); diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h index 6f1f48d..9c3971f 100644 --- a/tools/assistant/tools/assistant/helpviewer.h +++ b/tools/assistant/tools/assistant/helpviewer.h @@ -67,6 +67,7 @@ public: virtual bool handleForwardBackwardMouseButtons(QMouseEvent *e) = 0; + static QString DocPath; static QString AboutBlank; static QString LocalHelpFile; static QString PageNotFoundMessage; diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp index db1cd58..a19b29a 100644 --- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp @@ -129,13 +129,27 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/, const QNetworkRequest &request, QIODevice* /*outgoingData*/) { TRACE_OBJ - const QUrl &url = request.url(); - const QString &mimeType = AbstractHelpViewer::mimeFromUrl(url.toString()); - + QString url = request.url().toString(); HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance(); + + // TODO: For some reason the url to load is already wrong (passed from webkit) + // though the css file and the references inside should work that way. One + // possible problem might be that the css is loaded at the same level as the + // html, thus a path inside the css like (../images/foo.png) might cd out of + // the virtual folder + if (!helpEngine.findFile(url).isValid()) { + if (url.startsWith(AbstractHelpViewer::DocPath)) { + if (!url.startsWith(AbstractHelpViewer::DocPath + QLatin1String("qdoc/"))) { + url = url.replace(AbstractHelpViewer::DocPath, + AbstractHelpViewer::DocPath + QLatin1String("qdoc/")); + } + } + } + + const QString &mimeType = AbstractHelpViewer::mimeFromUrl(url); const QByteArray &data = helpEngine.findFile(url).isValid() ? helpEngine.fileData(url) - : AbstractHelpViewer::PageNotFoundMessage.arg(url.toString()).toUtf8(); + : AbstractHelpViewer::PageNotFoundMessage.arg(url).toUtf8(); return new HelpNetworkReply(request, data, mimeType.isEmpty() ? QLatin1String("application/octet-stream") : mimeType); } -- cgit v0.12 From 0c3411c051e1f59e050fcf40fd55fa2feb585d6b Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 20 Apr 2010 11:51:35 +0200 Subject: Doc: Correcting qdocconf files for assistant Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin (cherry picked from commit 84eadc0bc232d8196e08f5aa5614ce9a17ea93bd) --- tools/qdoc3/test/qt-build-docs.qdocconf | 21 ++++++++++++++------- tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 20 +++++++++++++------- tools/qdoc3/test/qt.qdocconf | 20 +++++++++++++------- tools/qdoc3/test/qt_zh_CN.qdocconf | 20 +++++++++++++------- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index dbff4e2..0694748 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -22,14 +22,12 @@ qhp.Qt.indexTitle = Qt Reference Documentation # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - style/style.css \ - scripts/functions.js \ - scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ images/api_topics.png \ - images/bg_ll.png \ images/bg_l_blank.png \ + images/bg_ll_blank.png \ + images/bg_ll.png \ images/bg_l.png \ images/bg_lr.png \ images/bg_r.png \ @@ -37,24 +35,33 @@ qhp.Qt.extraFiles = index.html \ images/bg_ul.png \ images/bg_ur_blank.png \ images/bg_ur.png \ + images/box_bg.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/bullet_up.png \ + images/coloreditorfactoryimage.png \ + images/content_bg.png \ + images/dynamiclayouts-example.png \ images/feedbackground.png \ images/form_bg.png \ images/horBar.png \ images/page_bg.png \ images/print.png \ images/qt_guide.png \ + images/qt_icon.png \ images/qt-logo.png \ images/qt_ref_doc.png \ images/qt_tools.png \ images/sep.png \ images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ - images/coloreditorfactoryimage.png \ - images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + scripts/functions.js \ + scripts/jquery.js \ + style/style.css + qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 461c069..5a3d726 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -30,14 +30,12 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - style/style.css \ - scripts/functions.js \ - scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ images/api_topics.png \ - images/bg_ll.png \ images/bg_l_blank.png \ + images/bg_ll_blank.png \ + images/bg_ll.png \ images/bg_l.png \ images/bg_lr.png \ images/bg_r.png \ @@ -45,24 +43,32 @@ qhp.Qt.extraFiles = index.html \ images/bg_ul.png \ images/bg_ur_blank.png \ images/bg_ur.png \ + images/box_bg.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/bullet_up.png \ + images/coloreditorfactoryimage.png \ + images/content_bg.png \ + images/dynamiclayouts-example.png \ images/feedbackground.png \ images/form_bg.png \ images/horBar.png \ images/page_bg.png \ images/print.png \ images/qt_guide.png \ + images/qt_icon.png \ images/qt-logo.png \ images/qt_ref_doc.png \ images/qt_tools.png \ images/sep.png \ images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ - images/coloreditorfactoryimage.png \ - images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + scripts/functions.js \ + scripts/jquery.js \ + style/style.css language = Cpp diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index cc3e436..92ce9a3 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -25,14 +25,12 @@ qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - style/style.css \ - scripts/functions.js \ - scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ images/api_topics.png \ - images/bg_ll.png \ images/bg_l_blank.png \ + images/bg_ll_blank.png \ + images/bg_ll.png \ images/bg_l.png \ images/bg_lr.png \ images/bg_r.png \ @@ -40,24 +38,32 @@ qhp.Qt.extraFiles = index.html \ images/bg_ul.png \ images/bg_ur_blank.png \ images/bg_ur.png \ + images/box_bg.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/bullet_up.png \ + images/coloreditorfactoryimage.png \ + images/content_bg.png \ + images/dynamiclayouts-example.png \ images/feedbackground.png \ images/form_bg.png \ images/horBar.png \ images/page_bg.png \ images/print.png \ images/qt_guide.png \ + images/qt_icon.png \ images/qt-logo.png \ images/qt_ref_doc.png \ images/qt_tools.png \ images/sep.png \ images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ - images/coloreditorfactoryimage.png \ - images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + scripts/functions.js \ + scripts/jquery.js \ + style/style.css qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc qhp.Qt.customFilters.Qt.name = Qt 4.7.0 diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf index c5d2c88..a5a65d8 100644 --- a/tools/qdoc3/test/qt_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt_zh_CN.qdocconf @@ -32,14 +32,12 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - style/style.css \ - scripts/functions.js \ - scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ images/api_topics.png \ - images/bg_ll.png \ images/bg_l_blank.png \ + images/bg_ll_blank.png \ + images/bg_ll.png \ images/bg_l.png \ images/bg_lr.png \ images/bg_r.png \ @@ -47,24 +45,32 @@ qhp.Qt.extraFiles = index.html \ images/bg_ul.png \ images/bg_ur_blank.png \ images/bg_ur.png \ + images/box_bg.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/bullet_up.png \ + images/coloreditorfactoryimage.png \ + images/content_bg.png \ + images/dynamiclayouts-example.png \ images/feedbackground.png \ images/form_bg.png \ images/horBar.png \ images/page_bg.png \ images/print.png \ images/qt_guide.png \ + images/qt_icon.png \ images/qt-logo.png \ images/qt_ref_doc.png \ images/qt_tools.png \ images/sep.png \ images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ - images/coloreditorfactoryimage.png \ - images/dynamiclayouts-example.png \ - images/stylesheet-coffee-plastique.png + scripts/functions.js \ + scripts/jquery.js \ + style/style.css language = Cpp -- cgit v0.12 From 034e13e765874b25b56d16c9487efd2e98fe4518 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 20 Apr 2010 15:51:04 +0200 Subject: Doc: Cleaning HTML generator and updating index.qdoc Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith (cherry picked from commit 019af5ecb5dbc9c173109ba670180177713a51ad) --- tools/qdoc3/htmlgenerator.cpp | 123 ++++++++++++++-------------- tools/qdoc3/test/qt-html-templates.qdocconf | 18 ++-- 2 files changed, 68 insertions(+), 73 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 1192daf..68c27db 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -514,14 +514,14 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE]; break; case Atom::Code: - out() << "
"
+	out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n";
 	break;
 #ifdef QDOC_QML
     case Atom::Qml:
-	out() << "
"
+	out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n";
@@ -529,7 +529,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
 #endif
     case Atom::CodeNew:
         out() << "
you can rewrite it as
\n"
-              << "
"
+              << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "
\n";
@@ -538,9 +538,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "
For example, if you have code like
\n";
         // fallthrough
     case Atom::CodeBad:
-        out() << "
"
+        out() << "
"
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
-              << "
\n";
+              << "
\n";
 	break;
     case Atom::FootnoteLeft:
         // ### For now
@@ -849,7 +849,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             if (atom->next() != 0)
                 text = atom->next()->string();
             if (atom->type() == Atom::Image)
-                out() << "
";
+                out() << "
";
             if (fileName.isEmpty()) {
                 out() << "[Missing image "
                       << protectEnc(atom->string()) << "]";
@@ -868,7 +868,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
     case Atom::ImageText:
         break;
     case Atom::LegaleseLeft:
-        out() << "
";
+        out() << "
";
         break;
     case Atom::LegaleseRight:
         out() << "
";
@@ -910,13 +910,13 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else if (atom->string() == ATOM_LIST_VALUE) {
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
-                out() << "
"
+                out() << "
"
                       << ""
                       << ""
                       << "\n";
             }
             else {
-                out() << "
ConstantValueDescription
"
+                out() << "
"
                       << "\n";
             }
         }
@@ -951,10 +951,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else { // (atom->string() == ATOM_LIST_VALUE)
             // ### Trenton
 
-            out() << "
ConstantValue
"
+            out() << "
"
                   << protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
                                                                  relative)))
-                  << "";
+                  << "";
 
             QString itemValue;
             if (relative->type() == Node::Enum) {
@@ -980,7 +980,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             if (threeColumnEnumValueTable) {
-                out() << "";
+                out() << "";
                 if (matchAhead(atom, Atom::ListItemRight))
                     out() << " ";
             }
@@ -1010,7 +1010,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << "\n";
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
-            out() << "
\n";
+            out() << "\n";
         }
         else {
             out() << "\n";
@@ -1091,29 +1091,28 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         if (!atom->string().isEmpty()) {
             if (atom->string().contains("%"))
-                out() << "
string() << "\" "
-                      << "align=\"center\">\n";
+                out() << "
string() << "\">\n ";
             else {
-                out() << "
\n";
+                out() << "
\n";
             }
         }
         else {
-            out() << "
\n";
+            out() << "
\n";
         }
         numTableRows = 0;
         break;
     case Atom::TableRight:
-        out() << "
\n";
+        out() << "\n";
         break;
     case Atom::TableHeaderLeft:
-        out() << "";
+        out() << "";
         inTableHeader = true;
         break;
     case Atom::TableHeaderRight:
         out() << "";
         if (matchAhead(atom, Atom::TableHeaderLeft)) {
             skipAhead = 1;
-            out() << "\n";
+            out() << "\n";
         }
         else {
             out() << "\n";
@@ -1122,9 +1121,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::TableRowLeft:
         if (++numTableRows % 2 == 1)
-            out() << "";
+            out() << "";
         else
-            out() << "";
+            out() << "";
         break;
     case Atom::TableRowRight:
         out() << "\n";
@@ -1189,11 +1188,11 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "string()) << "\">";
         break;
     case Atom::UnhandledFormat:
-        out() << "<Missing HTML>";
+        out() << "<Missing HTML>";
         break;
     case Atom::UnknownCommand:
-        out() << "\\" << protectEnc(atom->string())
-              << "";
+        out() << "\\" << protectEnc(atom->string())
+              << "";
         break;
 #ifdef QDOC_QML
     case Atom::QmlText:
@@ -1811,7 +1810,7 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
 void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 {
     if (!inner->includes().isEmpty()) {
-        out() << "
"
+        out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,
                                                         marker->markedUpIncludes(inner->includes())),
                                                  marker,inner))
@@ -1845,8 +1844,8 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
 
     QString tdTag;
     if (numColumns > 1) {
-        tdTag = "";
-        out() << "
\n"
+        tdTag = "
"; /* width=\"" + QString::number((100 + numColumns - 1) / numColumns) + "%\">";*/
+        out() << "\n"
               << tdTag << "\n";
     }
 
@@ -1898,7 +1897,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
     }
 
     if (numColumns > 1)
-        out() << "
\n";
+        out() << "
\n";
 
     inContents = false;
     inLink = false;
@@ -2011,7 +2010,7 @@ void HtmlGenerator::generateNavigationBar(const NavigationBar& bar,
 {
     if (bar.prev.begin() != 0 || bar.current.begin() != 0 ||
          bar.next.begin() != 0) {
-        out() << "
";
+        out() << "
";
         if (bar.prev.begin() != 0) {
 #if 0
             out() << "[\n";
+    out() << "
\n";
 
     int row = 0;
     foreach (const QString &name, nodeMap.keys()) {
@@ -2197,9 +2196,9 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
             continue;
 
         if (++row % 2 == 1)
-            out() << "";
+            out() << "";
         else
-            out() << "";
+            out() << "";
         out() << "";
@@ -2219,7 +2218,7 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
         }
         out() << "\n";
     }
-    out() << "
";
         generateFullName(node, relative, marker);
         out() << "
\n";
+    out() << "\n";
 }
 
 /*!
@@ -2372,7 +2371,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     }
     firstOffset[NumColumns] = classMap.count();
 
-    out() << "
\n";
+    out() << "
\n";
     for (k = 0; k < numRows; k++) {
         out() << "\n";
         for (i = 0; i < NumColumns; i++) {
@@ -2393,7 +2392,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     currentParagraphNo[i] = NumParagraphs - 1;
                 }
 #endif
-                out() << "\n";
     }
-    out() << "
";
+                out() << "";
                 if (currentOffsetInParagraph[i] == 0) {
                     // start a new paragraph
                     out() << ""
@@ -2436,18 +2435,18 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         }
         out() << "
\n";
+    out() << "\n";
 }
 
 void HtmlGenerator::generateFunctionIndex(const Node *relative,
                                           CodeMarker *marker)
 {
-    out() << "
";
+    out() << "
";
     for (int i = 0; i < 26; i++) {
         QChar ch('a' + i);
         out() << QString("%2 ").arg(ch).arg(ch.toUpper());
     }
-    out() << "
\n";
+    out() << "
\n";
 
     char nextLetter = 'a';
     char currentLetter;
@@ -2715,8 +2714,8 @@ void HtmlGenerator::generateSection(const NodeList& nl,
         }
         else {
             if (twoColumn)
-                out() << "
\n"
-                      << "\n
";
+                out() << "\n"
+                      << "\n
";
             out() << "
    \n";
         }
 
@@ -2729,12 +2728,11 @@ void HtmlGenerator::generateSection(const NodeList& nl,
             }
 
             if (name_alignment) {
-                out() << "
";
+                out() << "
 ";
             }
             else {
                 if (twoColumn && i == (int) (nl.count() + 1) / 2)
-                    out() << "
    \n";
+                    out() << "
    \n";
                 out() << "
  • ";
             }
 
@@ -2751,7 +2749,7 @@ void HtmlGenerator::generateSection(const NodeList& nl,
         else {
             out() << "
\n";
             if (twoColumn)
-                out() << "
\n";
+                out() << "
\n";
         }
     }
 }
@@ -2777,8 +2775,8 @@ void HtmlGenerator::generateSectionList(const Section& section,
         }
         else {
             if (twoColumn)
-                out() << "
\n"
-                      << "\n
";
+                out() << "\n"
+                      << "\n
";
             out() << "
    \n";
         }
 
@@ -2791,12 +2789,11 @@ void HtmlGenerator::generateSectionList(const Section& section,
             }
 
             if (name_alignment) {
-                out() << "
";
+                out() << "
 ";
             }
             else {
                 if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-                    out() << "
    \n";
+                    out() << "
    \n";
                 out() << "
  • ";
             }
 
@@ -2813,7 +2810,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
         else {
             out() << "
\n";
             if (twoColumn)
-                out() << "
\n";
+                out() << "
\n";
         }
     }
 
@@ -2910,7 +2907,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     for (int i = 0, n = src.size(); i < n;) {
         if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
             if (nameAlignment && !done) {// && (i != 0)) Why was this here?
-                html += "";
+                html += "";
                 done = true;
             }
             i += 2;
@@ -3075,8 +3072,8 @@ void HtmlGenerator::generateSectionList(const Section& section,
             twoColumn = (section.members.count() >= 5);
         }
         if (twoColumn)
-            out() << "
\n"
-                  << "\n
";
+            out() << "\n"
+                  << "\n
";
         out() << "
    \n";
 
         int i = 0;
@@ -3088,7 +3085,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
             }
 
             if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-                out() << "
    \n";
+                out() << "
    \n";
 
             out() << "
  • ";
             if (style == CodeMarker::Accessors)
@@ -3102,7 +3099,7 @@ void HtmlGenerator::generateSectionList(const Section& section,
         }
         out() << "
\n";
         if (twoColumn)
-            out() << "
\n";
+            out() << "
\n";
     }
 
     if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
@@ -4274,15 +4271,15 @@ void HtmlGenerator::generateQmlSummary(const Section& section,
             twoColumn = (count >= 5);
         }
         if (twoColumn)
-            out() << "
\n"
-                  << "\n
";
+            out() << "\n"
+                  << "\n
";
         out() << "
    \n";
 
         int row = 0;
         m = section.members.begin();
         while (m != section.members.end()) {
             if (twoColumn && row == (int) (count + 1) / 2)
-                out() << "
    \n";
+                out() << "
    \n";
             out() << "
  • ";
             generateQmlItem(*m,relative,marker,true);
             out() << "
    • \n";
@@ -4291,7 +4288,7 @@ void HtmlGenerator::generateQmlSummary(const Section& section,
         }
         out() << "
\n";
         if (twoColumn)
-            out() << "
\n";
+            out() << "
\n";
     }
 }
 
@@ -4383,7 +4380,7 @@ void HtmlGenerator::generateQmlInherits(const QmlClassNode* cn,
             const Node* n = myTree->findNode(strList,Node::Fake);
             if (n && n->subType() == Node::QmlClass) {
                 const QmlClassNode* qcn = static_cast(n);
-                out() << "
";
+                out() << "
";
                 Text text;
                 text << "[Inherits ";
                 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4430,7 +4427,7 @@ void HtmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
 {
     const ClassNode* cn = qcn->classNode();
     if (cn && (cn->status() != Node::Internal)) {
-        out() << "
";
+        out() << "
";
         Text text;
         text << "[";
         text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4461,7 +4458,7 @@ void HtmlGenerator::generateInstantiatedBy(const ClassNode* cn,
     if (cn &&  cn->status() != Node::Internal && !cn->qmlElement().isEmpty()) {
         const Node* n = myTree->root()->findNode(cn->qmlElement(),Node::Fake);
         if (n && n->subType() == Node::QmlClass) {
-            out() << "
";
+            out() << "
";
             Text text;
             text << "[";
             text << Atom(Atom::LinkNode,CodeMarker::stringForNode(cn));
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 67a25f3..158aef3 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -2,7 +2,7 @@ HTML.stylesheets        = style/style.css
 HTML.postheader         = " 
\n" \
 			  "    
\n" \
 			  "      Home
\n" \
-			  "    Qt Reference Documentation\n" \
+			  "    Qt Reference Documentation\n" \
 			  "    
\n" \
 			  "      \n" \
 			  "          
\n" \
 			  "        
\n" \
@@ -110,7 +110,6 @@ HTML.footer             = "        
\n" \
 			  "    
\n" \
 			  "      \n" \
 			  "    
\n" \
-			  "  \n" \
 			  "  
\n" \
 			  "    
\n" \
 			  "      © 2008-2010 Nokia Corporation and/or its\n" \
@@ -121,10 +120,10 @@ HTML.footer             = "        
\n" \
 			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy
\n" \
 			  "  \n" \
 			  "  
\n" \
-			  "    
\n" \
 			  "      
\n" \
 			  "        X\n" \
 			  "      
\n" \
+			  "    \n" \
 			  "      \n" \
 			  "      \n" \
@@ -132,7 +131,6 @@ HTML.footer             = "        
\n" \
 			  "  \n" \
 			  "  
\n" \
 			  "  
\n" \
-			  "  \n" \
 			  "\n";
-    out() << "  \n";
+	out() << "	\n";
     out() << "\n";
 
     if (offlineDocs)
-        out() << "\n";
+        out() << "\n";
     else
-        out() << "\n";
+        out() << "\n";
 
 #ifdef GENERATE_MAC_REFS    
     if (mainPage)
@@ -1833,18 +1845,16 @@ void HtmlGenerator::generateTitle(const QString& title,
                                   CodeMarker *marker)
 {
     if (!title.isEmpty())
-        out() << "
" << protectEnc(title);
+        out() << "
" << protectEnc(title) << "
\n";
     if (!subTitle.isEmpty()) {
-        out() << "
";
-        if (subTitleSize == SmallSubTitle)
-            out() << "";
+ 			out() << "";
         else
-            out() << "";
+            out() << " class=\"subtitle\">";
         generateText(subTitle, relative, marker);
         out() << "\n";
     }
-    if (!title.isEmpty())
-        out() << "\n";
 }
 
 void HtmlGenerator::generateFooter(const Node *node)
@@ -1853,9 +1863,10 @@ void HtmlGenerator::generateFooter(const Node *node)
         out() << "
\n" << navigationLinks << "
\n";
 
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
-          << QString(address).replace("\\" + COMMAND_VERSION, myTree->version())
-          << "\n"
-             "\n";
+          << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
+	      out() << "  \n";
+          out() << "\n";
+          out() <<   "\n";
 }
 
 void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
@@ -1876,7 +1887,7 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
 void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 {
     if (!inner->includes().isEmpty()) {
-        out() << "
"
+        out() << "
"
               << trimmedTrailing(highlightedCode(indent(codeIndent,
                                                         marker->markedUpIncludes(inner->includes())),
                                                  marker,inner))
@@ -3766,7 +3777,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
         out() << "
";
         out() << "";
         generateSynopsis(enume, relative, marker, CodeMarker::Detailed);
-        out() << "
";
+        out() << "
";
         generateSynopsis(enume->flagsType(),
                          relative,
                          marker,
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 1deefce..112b1b2 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -16,45 +16,28 @@ qhp.Assistant.file                = assistant.qhp
 qhp.Assistant.namespace           = com.trolltech.assistant.470
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
-qhp.Assistant.extraFiles          = images/api_examples.png \
-                             	    images/api_lookup.png \
-                             	    images/api_topics.png \
+qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	    images/bg_l_blank.png \
-			     	    images/bg_ll_blank.png \
-                             	    images/bg_ll.png \
-                             	    images/bg_l.png \
-                             	    images/bg_lr.png \
                              	    images/bg_r.png \
-                             	    images/bg_ul_blank.png \
-                             	    images/bg_ul.png \
-                             	    images/bg_ur_blank.png \
-                             	    images/bg_ur.png \
-			     	    images/box_bg.png \
-                             	    images/breadcrumb.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
                              	    images/bullet_dn.png \
-                             	    images/bullet_gt.png \
-                             	    images/bullet_sq.png \
+									images/bullet_sq.png \
                              	    images/bullet_up.png \
-                             	    images/coloreditorfactoryimage.png \
-                             	    images/content_bg.png \
-                             	    images/dynamiclayouts-example.png \
                              	    images/feedbackground.png \
-                             	    images/form_bg.png \
                              	    images/horBar.png \
-                             	    images/page_bg.png \
-                             	    images/print.png \
-                             	    images/qt_guide.png \
-                             	    images/qt_icon.png \
-                             	    images/qt-logo.png \
-                             	    images/qt_ref_doc.png \
-                             	    images/qt_tools.png \
-                             	    images/sep.png \
-                             	    images/sprites-combined.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
-			     	    scripts/functions.js \
-			     	    scripts/jquery.js \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
                              	    style/style.css
+
 qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 513801a..d4da292 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -16,45 +16,28 @@ qhp.Designer.file                = designer.qhp
 qhp.Designer.namespace           = com.trolltech.designer.470
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
-qhp.Designer.extraFiles          = images/api_examples.png \
-                             	   images/api_lookup.png \
-                             	   images/api_topics.png \
-                             	   images/bg_l_blank.png \
-			     	   images/bg_ll_blank.png \
-                             	   images/bg_ll.png \
-                             	   images/bg_l.png \
-                             	   images/bg_lr.png \
-                             	   images/bg_r.png \
-                             	   images/bg_ul_blank.png \
-                             	   images/bg_ul.png \
-                             	   images/bg_ur_blank.png \
-                             	   images/bg_ur.png \
-			     	   images/box_bg.png \
-                             	   images/breadcrumb.png \
-                             	   images/bullet_dn.png \
-                             	   images/bullet_gt.png \
-                             	   images/bullet_sq.png \
-                             	   images/bullet_up.png \
+qhp.Designer.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-                             	   images/content_bg.png \
                              	   images/dynamiclayouts-example.png \
-                             	   images/feedbackground.png \
-                             	   images/form_bg.png \
-                             	   images/horBar.png \
-                             	   images/page_bg.png \
-                             	   images/print.png \
-                             	   images/qt_guide.png \
-                             	   images/qt_icon.png \
-                             	   images/qt-logo.png \
-                             	   images/qt_ref_doc.png \
-                             	   images/qt_tools.png \
-                             	   images/sep.png \
-                             	   images/sprites-combined.png \
-                             	   images/stylesheet-coffee-plastique.png \
-                             	   images/taskmenuextension-example.png \
-			     	   scripts/functions.js \
-			     	   scripts/jquery.js \
-                             	   style/style.css
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Designer.filterAttributes    = qt 4.7.0 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index a3f4f00..7420b4f 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -16,45 +16,28 @@ qhp.Linguist.file                = linguist.qhp
 qhp.Linguist.namespace           = com.trolltech.linguist.470
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
-qhp.Linguist.extraFiles          = images/api_examples.png \
-                             	   images/api_lookup.png \
-                             	   images/api_topics.png \
-                             	   images/bg_l_blank.png \
-			     	   images/bg_ll_blank.png \
-                             	   images/bg_ll.png \
-                             	   images/bg_l.png \
-                             	   images/bg_lr.png \
-                             	   images/bg_r.png \
-                             	   images/bg_ul_blank.png \
-                             	   images/bg_ul.png \
-                             	   images/bg_ur_blank.png \
-                             	   images/bg_ur.png \
-			     	   images/box_bg.png \
-                             	   images/breadcrumb.png \
-                             	   images/bullet_dn.png \
-                             	   images/bullet_gt.png \
-                             	   images/bullet_sq.png \
-                             	   images/bullet_up.png \
+qhp.Linguist.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-                             	   images/content_bg.png \
                              	   images/dynamiclayouts-example.png \
-                             	   images/feedbackground.png \
-                             	   images/form_bg.png \
-                             	   images/horBar.png \
-                             	   images/page_bg.png \
-                             	   images/print.png \
-                             	   images/qt_guide.png \
-                             	   images/qt_icon.png \
-                             	   images/qt-logo.png \
-                             	   images/qt_ref_doc.png \
-                             	   images/qt_tools.png \
-                             	   images/sep.png \
-                             	   images/sprites-combined.png \
-                             	   images/stylesheet-coffee-plastique.png \
-                             	   images/taskmenuextension-example.png \
-			     	   scripts/functions.js \
-			     	   scripts/jquery.js \
-                             	   style/style.css
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Linguist.filterAttributes    = qt 4.7.0 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 80050e3..8015f57 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -27,45 +27,27 @@ qhp.Qml.indexTitle          = Qml Reference
 
 # Files not referenced in any qdoc file
 # See also extraimages.HTML
-qhp.Qml.extraFiles            = images/api_examples.png \
-                             	images/api_lookup.png \
-                             	images/api_topics.png \
-                             	images/bg_l_blank.png \
-			     	images/bg_ll_blank.png \
-                             	images/bg_ll.png \
-                             	images/bg_l.png \
-                             	images/bg_lr.png \
-                             	images/bg_r.png \
-                             	images/bg_ul_blank.png \
-                             	images/bg_ul.png \
-                             	images/bg_ur_blank.png \
-                             	images/bg_ur.png \
-			     	images/box_bg.png \
-                             	images/breadcrumb.png \
-                             	images/bullet_dn.png \
-                             	images/bullet_gt.png \
-                             	images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/content_bg.png \
-                             	images/dynamiclayouts-example.png \
-                             	images/feedbackground.png \
-                             	images/form_bg.png \
-                             	images/horBar.png \
-                             	images/page_bg.png \
-                             	images/print.png \
-                             	images/qt_guide.png \
-                             	images/qt_icon.png \
-                             	images/qt-logo.png \
-                             	images/qt_ref_doc.png \
-                             	images/qt_tools.png \
-                             	images/sep.png \
-                             	images/sprites-combined.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-			     	scripts/functions.js \
-			     	scripts/jquery.js \
-                             	style/style.css
+qhp.Qml.extraFiles            = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
 qhp.Qml.customFilters.Qt.name = Qt 4.6.0
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index f38a2a4..49d088e 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -16,45 +16,28 @@ qhp.qmake.file                = qmake.qhp
 qhp.qmake.namespace           = com.trolltech.qmake.470
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
-qhp.qmake.extraFiles          = images/api_examples.png \
-                             	images/api_lookup.png \
-                             	images/api_topics.png \
-                             	images/bg_l_blank.png \
-			     	images/bg_ll_blank.png \
-                             	images/bg_ll.png \
-                             	images/bg_l.png \
-                             	images/bg_lr.png \
-                             	images/bg_r.png \
-                             	images/bg_ul_blank.png \
-                             	images/bg_ul.png \
-                             	images/bg_ur_blank.png \
-                             	images/bg_ur.png \
-			     	images/box_bg.png \
-                             	images/breadcrumb.png \
-                             	images/bullet_dn.png \
-                             	images/bullet_gt.png \
-                             	images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/content_bg.png \
-                             	images/dynamiclayouts-example.png \
-                             	images/feedbackground.png \
-                             	images/form_bg.png \
-                             	images/horBar.png \
-                             	images/page_bg.png \
-                             	images/print.png \
-                             	images/qt_guide.png \
-                             	images/qt_icon.png \
-                             	images/qt-logo.png \
-                             	images/qt_ref_doc.png \
-                             	images/qt_tools.png \
-                             	images/sep.png \
-                             	images/sprites-combined.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-			     	scripts/functions.js \
-			     	scripts/jquery.js \
-                             	style/style.css
+qhp.qmake.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+									images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 0694748..f0c2535 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -22,45 +22,27 @@ qhp.Qt.indexTitle          = Qt Reference Documentation
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+ 									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 
 
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index 5a3d726..a00d5a1 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -30,45 +30,27 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \									
+                             	    images/horBar.png \									
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 0426f4d..dc81757 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -20,37 +20,20 @@ codeindent              = 1
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
-			  api_examples.png \
-			  bg_ll.png \
-			  bg_ul_blank.png \
-			  bullet_gt.png \
-			  horBar.png \
-			  qt_ref_doc.png \
-			  api_lookup.png \
-			  bg_ll_blank.png \
-			  bg_ur.png \
-			  bullet_sq.png \
-			  bullet_dn.png \
-			  bullet_up.png \
-			  page_bg.png \
-			  qt_tools.png \
-			  api_topics.png \
-			  bg_lr.png \
-			  bg_ur_blank.png \
-			  content_bg.png \
-			  print.png \
-			  sep.png \
-			  bg_l.png \
-			  bg_r.png \
-			  box_bg.png \
-			  feedbackground.png \
-			  qt_guide.png \
-			  sprites-combined.png \
-			  bg_l_blank.png \
-			  bg_ul.png \
-			  breadcrumb.png \
-			  form_bg.png \
-			  qt_icon.png \
+						bg_l.png \
+                        bg_l_blank.png \
+                        bg_r.png \
+						box_bg.png \
+						breadcrumb.png \
+						bullet_gt.png \
+                        bullet_dn.png \
+						bullet_sq.png \
+                        bullet_up.png \
+                        feedbackground.png \
+                        horBar.png \
+						page.png \
+						page_bg.png \
+						sprites-combined.png \
                           taskmenuextension-example.png \
                           coloreditorfactoryimage.png \
                           dynamiclayouts-example.png \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 0651176..00af376 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -33,30 +33,38 @@ HTML.postheader         = " 
\n" \
 			  "        
\n" \
 			  "          \n" \
 			  "            
\n" \
-			  "              \n" \
+			  "              \n" \
 			  "            
\n" \
 			  "          \n" \
 			  "        
\n" \
 			  "        
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "            API Lookup
\n" \
-			  "          
\n" \
-			  "             \n" \
 			  "          
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "        
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "            API Topics
\n" \
-			  "          
\n" \
-			  "              \n" \
 			  "          
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "        
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "            API Examples
\n" \
-			  "          
\n" \
-			  "             \n" \
 			  "          
\n" \
-			  "          
\n" \
+			  "          
\n" \
 			  "          
\n" \
 			  "        
\n" \
 			  "      
\n" \
@@ -103,13 +116,13 @@ HTML.postpostheader     = "            \n" \
 			  "              
  • A
    • \n" \
 			  "              
  • A
    • \n" \
 			  "              
  • \n" \
-			  "                \"\"\"Print
    • \n" \
+			  "                Print\n" \
 			  "            \n" \
 			  "          
    \n" \
 			  "        
    \n" \
 			  "        
    \n"
 
-HTML.footer             = "        
    \n" \
+HTML.footer             = "        \n" \
 			  "        
    \n" \
 			  "          [+] Documentation Feedback
    \n" \
 			  "      
    \n" \
@@ -117,6 +130,7 @@ HTML.footer             = "        \n" \
 			  "    
    \n" \
 			  "      \n" \
 			  "    
    \n" \
+			  "   \n" \
 			  "  
    \n" \
 			  "    
    \n" \
 			  "      © 2008-2010 Nokia Corporation and/or its\n" \
@@ -131,14 +145,14 @@ HTML.footer             = "        
    \n" \
 			  "        X\n" \
 			  "      \n" \
 			  "    
    \n" \
-			  "      \n" \
-			  "      \n" \
+			  "      
    \n" \
+			  "      
    \n" \
 			  "    
    \n" \
 			  "  \n" \
 			  "  
    \n" \
 			  "  
    \n" \
-			  " -->\n"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 69ab4e1..59dd855 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -26,45 +26,27 @@ qhp.Qt.indexRoot           =
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
 qhp.Qt.customFilters.Qt.name = Qt 4.7.0
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index a5a65d8..9275b5c 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -32,45 +32,27 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.png \
+                             	    images/bg_r.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
+                             	    images/bullet_dn.png \
+									images/bullet_sq.png \
+                             	    images/bullet_up.png \
+                             	    images/feedbackground.png \									
+                             	    images/horBar.png \									
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/style/style.css b/tools/qdoc3/test/style/style.css
index 1ed49fa..9c290f5 100644
--- a/tools/qdoc3/test/style/style.css
+++ b/tools/qdoc3/test/style/style.css
@@ -58,6 +58,19 @@
     {
         vertical-align: baseline;
     }
+    .heading
+    {
+        font: normal 600 16px/1.0 Arial;
+        padding-bottom: 15px;
+    }
+    .subtitle
+    {
+        font-size: 13px;
+    }
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
     legend
     {
         color: #000000;
@@ -73,7 +86,6 @@
     {
         font-size: 100%;
     }
-    /* Page style */
     html
     {
         background-color: #e5e5e5;
@@ -92,6 +104,11 @@
     {
         font-style: italic;
     }
+    a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
     .header, .footer, .wrapper
     {
         min-width: 600px;
@@ -106,23 +123,19 @@
     {
         padding-left: 216px;
         height: 15px;
-        background: url(../images/bg_ul.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 0;
         overflow: hidden;
     }
     .offline .wrapper .hd
     {
-        background: url(../images/bg_ul_blank.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 -15px;
     }
     .wrapper .hd span
     {
         height: 15px;
         display: block;
-        background: url(../images/bg_ur.png) no-repeat 100% 0;
         overflow: hidden;
-    }
-    .offline .wrapper .hd span
-    {
-        /*         background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */
+        background: url(../images/page.png) no-repeat 100% -30px;
     }
     .wrapper .bd
     {
@@ -137,18 +150,18 @@
     {
         padding-left: 216px;
         height: 15px;
-        background: url(../images/bg_ll.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 -75px;
         overflow: hidden;
     }
     .offline .wrapper .ft
     {
-        background: url(../images/bg_ll_blank.png) no-repeat 0 0;
+        background: url(../images/page.png) no-repeat 0 -90px;
     }
     .wrapper .ft span
     {
         height: 15px;
         display: block;
-        background: url(../images/bg_lr.png) no-repeat 100% 0;
+        background: url(../images/page.png) no-repeat 100% -60px;
         overflow: hidden;
     }
     .header, .footer
@@ -182,186 +195,9 @@
         width: 302px;
         height: 22px;
         text-indent: -999em;
-        background: url(../images/header.png) no-repeat 0 0;
-    }
-    /* header elements */
-    #nav-topright
-    {
-        height: 70px;
-    }
-
-    #nav-topright ul
-    {
-        list-style-type: none;
-        float: right;
-        width: 370px;
-        margin-top: 11px;
-    }
-
-    #nav-topright li
-    {
-        display: inline-block;
-        margin-right: 20px;
-        float: left;
-    }
-
-    #nav-topright li.nav-topright-last
-    {
-        margin-right: 0;
-    }
-
-    #nav-topright li a
-    {
-        background: transparent url(../images/sprites-combined.png) no-repeat;
-        height: 18px;
-        display: block;
-        overflow: hidden;
-        text-indent: -9999px;
-    }
-
-    #nav-topright li.nav-topright-home a
-    {
-        width: 65px;
-        background-position: -2px -91px;
-    }
-
-    #nav-topright li.nav-topright-home a:hover
-    {
-        background-position: -2px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-dev a
-    {
-        width: 30px;
-        background-position: -76px -91px;
-    }
-
-    #nav-topright li.nav-topright-dev a:hover
-    {
-        background-position: -76px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-labs a
-    {
-        width: 40px;
-        background-position: -114px -91px;
-    }
-
-    #nav-topright li.nav-topright-labs a:hover
-    {
-        background-position: -114px -117px;
-    }
-
-    #nav-topright li.nav-topright-doc a
-    {
-        width: 32px;
-        background-position: -162px -91px;
-    }
-
-    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
-    {
-        background-position: -162px -117px;
-    }
-
-    #nav-topright li.nav-topright-blog a
-    {
-        width: 40px;
-        background-position: -203px -91px;
-    }
-
-    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
-    {
-        background-position: -203px -117px;
-    }
-
-    #nav-topright li.nav-topright-shop a
-    {
-        width: 40px;
-        background-position: -252px -91px;
-    }
-
-    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
-    {
-        background-position: -252px -117px;
-    }
-
-    #nav-logo
-    {
-        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0 -225px;
-        left: -3px;
-        position: absolute;
-        width: 75px;
-        height: 75px;
-        top: 13px;
-    }
-    #nav-logo a
-    {
-        width: 75px;
-        height: 75px;
-        display: block;
-        text-indent: -9999px;
-        overflow: hidden;
-    }
-    /* Clearing */
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    /* ^ Clearing */
-
-
-
-    .shortCut-topleft-inactive
-    {
-        padding-left: 3px;
-        background: transparent url(     "../images/sprites-combined.png" ) no-repeat 0px -58px;
-        height: 20px;
-        width: 93px;
-    }
-    .shortCut-topleft-inactive span
-    {
-        font-variant: normal;
-    }
-    #shortCut
-    {
-        padding-top: 10px;
-        font-weight: bolder;
-        color: #b0adab;
-    }
-    #shortCut ul
-    {
-        list-style-type: none;
-        float: left;
-        width: 347px;
-        margin-left: 100px;
-    }
-    #shortCut li
-    {
-        display: inline-block;
-        margin-right: 25px;
-        float: left;
-        white-space: nowrap;
-    }
-    #shortCut li a
-    {
-        color: #b0adab;
-        text-decoration: none;
-    }
-    #shortCut li a:hover
-    {
-        color: #44a51c;
-        text-decoration: none;
+        background: url(../images/sprites-combined.png) no-repeat -78px -235px;
     }
 
-    /* end of header elements */    
-    
-    /* menu element */
     .sidebar
     {
         float: left;
@@ -369,32 +205,32 @@
         width: 200px;
         font-size: 11px;
     }
-    .sidebar a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-    .offline .sidebar, .offline .feedback
+
+    .offline .sidebar, .offline .feedback, .offline .t_button
     {
         display: none;
     }
+
     .sidebar .searchlabel
     {
         padding: 0 0 2px 17px;
         font: normal bold 11px/1.2 Verdana;
     }
+
     .sidebar .search
     {
         padding: 0 15px 0 16px;
     }
+
     .sidebar .search form
     {
-        width: 167px;
-        height: 21px;
-        padding: 2px 0 0 5px;
-        background: url(../images/form_bg.png) no-repeat 0 0;
+        background: url(../images/sprites-combined.png) no-repeat -6px -348px;
+		height:21px;
+		padding:2px 0 0 5px;
+		width:167px;
     }
-    .sidebar .search form fieldset input#searchstring
+
+    .sidebar .search form input#pageType
     {
         width: 158px;
         height: 19px;
@@ -403,32 +239,62 @@
         outline: none;
         font: 13px/1.2 Verdana;
     }
+
     .sidebar .box
     {
         padding: 17px 15px 5px 16px;
     }
+
     .sidebar .box .first
     {
         background-image: none;
     }
+
     .sidebar .box h2
     {
         font: normal 18px/1.2 Arial;
-        padding: 15px 0 0 40px;
+        padding: 0;
         min-height: 32px;
     }
+    .sidebar .box h2 span
+    {
+        overflow: hidden;
+        display: inline-block;
+    }
     .sidebar .box#lookup h2
     {
-        background: url(../images/api_lookup.png) no-repeat 0 0;
+        background-image: none;
+    }
+    .sidebar #lookup.box h2 span
+    {
+        background: url(../images/sprites-combined.png) no-repeat -6px -311px;
+        width: 27px;
+        height: 35px;
+        margin-right: 13px;
     }
     .sidebar .box#topics h2
     {
-        background: url(../images/api_topics.png) no-repeat 0 0;
+        background-image: none;
+    }
+    .sidebar #topics.box h2 span
+    {
+        background: url(../images/sprites-combined.png) no-repeat -94px -311px;
+        width: 27px;
+        height: 32px;
+        margin-right: 13px;
     }
     .sidebar .box#examples h2
     {
-        background: url(../images/api_examples.png) no-repeat 0 0;
+        background-image: none;
+    }
+    .sidebar #examples.box h2 span
+    {
+        background: url(../images/sprites-combined.png) no-repeat -48px -311px;
+        width: 30px;
+        height: 31px;
+        margin-right: 9px;
     }
+
     .sidebar .box .list
     {
         display: block;
@@ -443,6 +309,9 @@
     {
         text-decoration: underline;
     }
+    .sidebar .box ul
+    {
+    }
     .sidebar .box ul li
     {
         padding-left: 12px;
@@ -453,23 +322,20 @@
     {
         background: url(../images/box_bg.png) repeat-x 0 bottom;
     }
-    /* content elements */
     .wrap
     {
-        overflow: hidden;
+        margin: 0 5px 0 208px;
+        overflow: visible; 
     }
     .offline .wrap
     {
         margin: 0 5px 0 5px;
     }
-    /* tool bar */
     .wrap .toolbar
     {
         background-color: #fafafa;
         border-bottom: 1px solid #d1d1d1;
-        height: 20px;
-        margin-left: 3px;
-        margin-right: 5px;
+        height: 20px; 
         position: relative;
     }
     .wrap .toolbar .toolblock
@@ -487,7 +353,7 @@
     {
         padding: 0 0 10px 21px;
         right: 5px;
-        vertical-align: top;
+        vertical-align: middle;
         overflow: hidden;
     }
     .wrap .toolbar .toolbuttons .active
@@ -507,32 +373,56 @@
         font-weight: bold;
         color: #B0ADAB;
     }
-    #smallA
+
+    .toolbuttons #print
+    {
+        border-left: 1px solid #c5c4c4;
+        margin-top: 0;
+        padding-left: 7px;
+        text-indent: 0;
+    }
+    .toolbuttons #print a
+    {
+        width: 16px;
+        height: 16px;
+    }
+
+    .toolbuttons #print a span
+    {
+        width: 16px;
+        height: 16px;
+        text-indent: -999em;
+        display: block;
+        overflow: hidden;
+        background: url(../images/sprites-combined.png) no-repeat -137px -311px;
+    }
+
+    .toolbuttons #smallA
     {
         font-size: 10pt;
     }
-    #medA
+    .toolbuttons #medA
     {
         font-size: 12pt;
     }
-    #bigA
+    .toolbuttons #bigA
     {
         font-size: 14pt;
+        margin-right: 7px;
     }
+
     #smallA:hover, #medA:hover, #bigA:hover
     {
         color: #00732F;
     }
-    #print
+
+    .offline .wrap .breadcrumb
     {
-        font-size: 14pt;
-        line-height: 20pt;
     }
-    #printIcon
+
+    .wrap .breadcrumb ul
     {
-        margin-left: 5px;
     }
-    /* bread crumbs */
     .wrap .breadcrumb ul li
     {
         float: left;
@@ -545,6 +435,10 @@
     {
         font-weight: normal;
     }
+    .wrap .breadcrumb ul li a
+    {
+        color: #363534;
+    }
     .wrap .breadcrumb ul li.first
     {
         background-image: none;
@@ -554,29 +448,29 @@
     .wrap .content
     {
         padding: 30px;
-        position: relative;
     }
-    /* text elements */
-    .heading
+
+    .wrap .content li
     {
-        font: normal 600 16px/1.0 Arial;
-        padding-bottom: 15px;
+        padding-left: 12px;
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        font: normal 400 10pt/1 Verdana;
+        color: #44a51c;
+        margin-bottom: 10px; 
     }
-
-    .subtitle
+    .content li:hover
     {
-        font-size: 13px;
+        text-decoration: underline;
     }
 
-    .small-subtitle
+    .offline .wrap .content
     {
-        font-size: 13px;
+        padding-top: 15px;
     }
-    
+
     .wrap .content h1
     {
         font: 600 18px/1.2 Arial;
-        padding-bottom: 15px;
     }
     .wrap .content h2
     {
@@ -588,26 +482,13 @@
     }
     .wrap .content p
     {
-        line-height:20px;
-        padding:10px 5px 10px 5px;
+        line-height: 20px;
+        padding: 10px 5px 10px 5px;
     }
     .wrap .content ul
     {
         padding-left: 25px;
     }
-    .wrap .content li
-    {
-        padding-left: 12px;
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 400 10pt/1 Verdana;
-        margin-bottom: 10px;
-        line-height: 14px;
-    }
-    a
-    {
-        color: #00732F;
-        text-decoration: none;
-    }
     a:hover
     {
         color: #4c0033;
@@ -618,10 +499,6 @@
         color: #4c0033;
         text-decoration: none;
     }
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
     .footer
     {
         min-height: 100px;
@@ -629,11 +506,15 @@
         font: normal 9px/1 Verdana;
         text-align: center;
         padding-top: 40px;
+        background-color: #E6E7E8;
+        margin: 0;
     }
     .feedback
     {
-        float: right;
-        padding-right: 10px;
+        float: none;
+        position: absolute;
+        right: 15px;
+        bottom: 10px;
         font: normal 8px/1 Verdana;
         color: #B0ADAB;
     }
@@ -644,37 +525,223 @@
         color: #00732F;
         text-decoration: underline;
     }
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 370px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
+        height: 20px;
+        width: 47px;
+    }
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+    #shortCut li a
+    {
+        color: #b0adab;
+    }
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+    }
+
     hr
     {
-        background-color: #e0e0e0;
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
         height: 1px;
         width: 100%;
         text-align: left;
         margin: 15px 0px 15px 0px;
     }
-    
+
     .content .alignedsummary
     {
         margin: 15px;
     }
-    /* tables */
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
+        overflow-x: auto;
+    }
     table, pre
     {
         -moz-border-radius: 7px 7px 7px 7px;
         background-color: #F6F6F6;
         border: 1px solid #E6E6E6;
         border-collapse: separate;
-        font-size: 11px; 
-        min-width: 395px; 
+        font-size: 11px;
+        /*min-width: 395px;*/
         margin-bottom: 25px;
+        display: inline-block;
+    }
+    thead
+    {
+        margin-top: 5px;
+    }
+    th
+    {
+        padding: 3px 15px 3px 15px;
+    }
+    td
+    {
+        padding: 3px 15px 3px 20px;
     }
-    thead{margin-top: 5px;}
-    th{ padding: 3px 15px 3px 15px;}
-    td{padding: 3px 15px 3px 20px;}
     table tr.odd
     {
         border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6; 
+        background-color: #F6F6F6;
         color: #66666E;
     }
     table tr.even
@@ -685,12 +752,13 @@
     }
     table tr.odd:hover
     {
-        background-color: #E6E6E6; 
+        background-color: #E6E6E6;
     }
     table tr.even:hover
     {
         background-color: #E6E6E6;
     }
+
     span.comment
     {
         color: #8B0000;
@@ -700,15 +768,7 @@
     {
         color: #254117;
     }
-    pre
-    {
-        -moz-border-radius:7px 7px 7px 7px;
-        background-color:#F6F6F6;
-        border:1px solid #DDDDDD;
-        margin:0 20px 10px 10px;
-        padding:20px 15px 20px 20px;
-        overflow-x:auto;
-    }
+
     .qmltype
     {
         text-align: center;
@@ -719,13 +779,28 @@
         float: right;
         color: #254117;
     }
+
+    .qmldefault
+    {
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    *.qmlitem p
+    {
+    }
+
     #feedbackBox
     {
-        display:none;
-        -moz-border-radius:7px 7px 7px 7px;
-        border:1px solid #DDDDDD;
-        position:fixed;
-        top:100px;
+        display: none;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        position: fixed;
+        top: 100px;
         left: 33%;
         height: 190px;
         width: 400px;
@@ -735,27 +810,27 @@
     }
     #feedcloseX a
     {
-        display:inline;
+        display: inline;
         padding: 5px 5px 0 0;
-        margin-bottom:3px;
+        margin-bottom: 3px;
         color: #363534;
-        font-weight:600;
+        font-weight: 600;
         float: right;
         text-decoration: none;
     }
+
     #feedbox
-    /* here */
     {
-        display:inline;
+        display: inline;
         width: 370px;
         height: 120px;
-        margin:0px 25px 10px 15px;
+        margin: 0px 25px 10px 15px;
     }
     #feedsubmit
     {
-        display:inline;
-        float:right;
-        margin:4px 32px 0 0;
+        display: inline;
+        float: right;
+        margin: 4px 32px 0 0;
     }
     #blurpage
     {
@@ -771,141 +846,172 @@
     }
     .toc
     {
-        float: right; 
-        -moz-border-radius:7px 7px 7px 7px;
-        background-color:#F6F6F6;
-        border:1px solid #DDDDDD;
-        margin:0 20px 10px 10px;
-        padding:20px 15px 20px 20px;
+        float: right;
+        -moz-border-radius: 7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border: 1px solid #DDDDDD;
+        margin: 0 20px 10px 10px;
+        padding: 20px 15px 20px 20px;
         height: auto;
         width: 200px;
     }
 
-    .toc ul
+    .toc h3
     {
-        float: left;
-        padding: 15px;
-        
+        font: 600 12px/1.2 Arial;
+    }
+
+    .wrap .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+
+    .wrap .content .toc .level2
+    {
+        margin-left: 15px;
     }
-  
 
     .content .toc li
     {
-        font: normal 12px/1.2 Verdana;
+        font: normal 10px/1.2 Verdana;
         background: url(../images/bullet_dn.png) no-repeat 0 5px;
     }
 
-    .relpage 
+    .relpage
     {
         -moz-border-radius: 7px 7px 7px 7px;
         border: 1px solid #DDDDDD;
         padding: 25px 25px;
-        clear:both;
+        clear: both;
     }
     .relpage ul
     {
         float: none;
         padding: 15px;
     }
-    .content .relpage li 
+    .content .relpage li
     {
         font: normal 11px/1.2 Verdana;
     }
-    /* edit */
     h3.fn, span.fn
     {
         background-color: #F6F6F6;
         border-width: 1px;
         border-style: solid;
         border-color: #E6E6E6;
-        font-weight: bold; 
-        /*  padding: 6px 0px 6px 10px;*/
-         /*     margin: 42px 0px 0px 0px;*/
+        font-weight: bold;
     }
-    /* edit */
 
-    .indexbox
-    {
-        width: 100%; 
-    }
-    .content .indexboxcont li
-    {
-        font: normal 600 13px/1 Verdana;
-    }
 
- /*   .indexbox a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }*/
-    .indexbox a:hover, .indexbox a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    .indexbox a:visited
+    /* start index box */
+    .indexbox
     {
-        color: #00732f;
-        text-decoration: none;
+        width: 100%;
+		display:inline-block;
     }
 
     .indexboxcont
     {
         display: block;
+       /* overflow: hidden;*/
     }
 
     .indexboxbar
     {
-        background: transparent url(     "../images/horBar.png" ) repeat-x left bottom;
+        background: transparent url(../images/horBar.png ) repeat-x left bottom;
         margin-bottom: 25px;
+     /*   background-image: none;
+        border-bottom: 1px solid #e2e2e2;*/
     }
 
     .indexboxcont .section
     {
-        display: inline-block; 
+        display: inline-block;
         width: 49%; 
         *width:42%;
         _width:42%;
         padding:0 2% 0 1%;
         vertical-align:top;
+
 }
 
     .indexboxcont .indexIcon
-    { 
+    {
         width: 11%; 
         *width:18%;
         _width:18%;
         overflow:hidden;
+
 }
     .indexboxcont .section p
-    { 
+    {
         padding-top: 20px;
         padding-bottom: 20px;
     }
-
     .indexboxcont .sectionlist
     {
         display: inline-block;
         width: 33%;
-        margin-right: -2px;
-        vertical-align: top;
         padding: 0;
     }
-    .tricol
-    {
-       
-    }
     .indexboxcont .sectionlist ul
     {
-        padding-left: 15px;
         margin-bottom: 20px;
     }
-/*
+
     .indexboxcont .sectionlist ul li
     {
         line-height: 12px;
     }
-*/
+
+    .content .indexboxcont li
+    {
+        font: normal 600 13px/1 Verdana;
+    }
+
+    .indexbox a:hover, .indexbox a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    .indexbox a:visited
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+
+    .indexboxcont:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+
+    .indexbox .indexIcon span
+    {
+        display: block;
+    }
+    
+    .indexbox.guide .indexIcon span
+    {
+        width: 96px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -5px -376px;
+        padding: 0;
+    }
+    
+    .indexbox.tools .indexIcon span
+    {
+        width: 115px;
+        height: 137px;
+        background: url(../images/sprites-combined.png) no-repeat -111px -376px;
+        padding: 0;
+    }
+
     .lastcol
     {
         display: inline-block;
@@ -916,12 +1022,9 @@
 
     .tricol .lastcol
     {
-        margin-left:-6px;
+        margin-left: -6px;
     }
-
-    /*.toc ul*/
-
-    /* end page elements */
+    /* end indexbox */
 }
 /* end of screen media */
 
@@ -929,7 +1032,7 @@
 
 @media print
 {
-    .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
     {
         display: none;
         background: none;
-- 
cgit v0.12


From 33664eaa591b4325f83643d8c8a21476b1306c34 Mon Sep 17 00:00:00 2001
From: Thomas Zander 
Date: Tue, 4 May 2010 14:15:24 +0200
Subject: Disable compiling of the plugin when extra package not found

The plugin will only compile when the symbian audiorouting API
is installed which is not there by default. So check for that.
The configure check should be added soon too.
---
 src/plugins/mediaservices/mediaservices.pro | 4 +++-
 src/s60installs/s60installs.pro             | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins/mediaservices/mediaservices.pro b/src/plugins/mediaservices/mediaservices.pro
index 27f05bc..0f0b021 100644
--- a/src/plugins/mediaservices/mediaservices.pro
+++ b/src/plugins/mediaservices/mediaservices.pro
@@ -9,5 +9,7 @@ contains(QT_CONFIG, media-backend) {
         SUBDIRS += gstreamer
     }
 
-    symbian:SUBDIRS += symbian
+    symbian:contains(QT_CONFIG, audio-routing-available) {
+        SUBDIRS += symbian
+    }
 }
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index dfd2694..97b2232 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -158,11 +158,12 @@ symbian: {
     contains(QT_CONFIG, media-backend) {
         qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMediaServices$${QT_LIBINFIX}.dll
 
-        mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
-        mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
+        contains(QT_CONFIG, audio-routing-available) {
+            mediaservices_plugins.path = c:$$QT_PLUGINS_BASE_DIR/mediaservices
+            mediaservices_plugins.sources += $$QT_BUILD_TREE/plugins/mediaservices/qmmfengine$${QT_LIBINFIX}.dll
+        }
 
         DEPLOYMENT += mediaservices_plugins
-
     }
 
     BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
-- 
cgit v0.12


From e98459fd11180c24ba9e549b96908cb33a68c714 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Tue, 4 May 2010 14:38:20 +0200
Subject: doc: Edited the intro.

---
 doc/src/declarative/declarativeui.qdoc | 60 ++++++++++++++++------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index d79c4d2..6a1f5c5 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -40,46 +40,42 @@
 ****************************************************************************/
 
 /*!
-\title Declarative UI Using QML
+\title Qt Quick
 \page declarativeui.html
 
-\brief The Qt Declarative module provides a declarative framework for building
-highly dynamic, custom user interfaces.
+\brief Qt Quick provides a declarative framework for building highly
+dynamic, custom user interfaces.
 
-\section1 \l{QML Elements}{Fast QML Elements Reference Page}
+Qt Quick provides a declarative framework for building highly dynamic,
+custom user interfaces from a rich set of \l {QML Elements}{QML elements}.
+Qt Quick helps programmers and designers collaborate to
+build the fluid user interfaces that are becoming common in portable
+consumer devices, such as mobile phones, media players, set-top boxes
+and netbooks.
 
-\raw HTML
-
    
-\endraw
+QML is an extension to \l
+{http://www.ecma-international.org/publications/standards/Ecma-262.htm}
+{JavaScript}, that provides a mechanism to declaratively build an
+object tree of \l {QML Elements}{QML elements}.  QML improves the
+integration between JavaScript and Qt's existing QObject based type
+system, adds support for automatic \l {Property Binding}{property
+bindings} and provides \l {Network Transparency}{network transparency}
+at the language level.
 
-\section1 Preamble
+The \l {QML Elements}{QML elements} are a sophisticated set of
+graphical and behavioral building blocks.  These different elements
+are combined together in \l {QML Documents}{QML documents} to build
+components ranging in complexity from simple buttons and sliders, to
+complete internet-enabled applications like a \l
+{http://www.flickr.com}{Flickr} photo browser.
 
-Qt Declarative UI provides a declarative framework for building highly dynamic, custom
-user interfaces.  Declarative UI helps programmers and designers collaborate to build
-the animation rich, fluid user interfaces that are becoming common in portable
-consumer devices, such as mobile phones, media players, set-top boxes and netbooks.
-
-The Qt Declarative module provides an engine for interpreting the declarative
-QML language, and a rich set of \bold { \l {QML Elements}{QML elements} }
-that can be used from QML.
-
-QML is an extension to \l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}
-{JavaScript}, that provides a mechanism to declaratively build an object tree
-of QML elements.  QML improves the integration between JavaScript and Qt's
-existing QObject based type system, adds support for automatic
-\l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} at the language
-level.
-
-The QML elements are a sophisticated set of graphical and behavioral building
-blocks.  These different elements are combined together in \l {QML Documents}{QML documents} to build components
-ranging in complexity from simple buttons and sliders, to complete
-internet-enabled applications like a \l {http://www.flickr.com}{Flickr} photo browser.
-
-Qt Declarative builds on \l {QML for Qt programmers}{Qt's existing strengths}.
-QML can be be used to incrementally extend an existing application or to build
-completely new applications.  QML is fully \l {Extending QML in C++}{extensible from C++}.
+Qt Quick builds on \l {QML for Qt programmers}{Qt's existing
+strengths}.  QML can be be used to incrementally extend an existing
+application or to build completely new applications.  QML is fully \l
+{Extending QML in C++}{extensible from C++}.
 
 \section1 Getting Started:
+
 \list
 \o \l {Introduction to the QML language}
 \o \l {QML Tutorial}{Tutorial: 'Hello World'}
-- 
cgit v0.12


From 855bbe53b69fa12a9daec49e6326a6bbe4483342 Mon Sep 17 00:00:00 2001
From: David Boddie 
Date: Tue, 4 May 2010 15:00:10 +0200
Subject: Doc: Fixed up the diagrams, aligning items with a grid.

Reviewed-by: Trust Me
---
 doc/src/diagrams/modelview-move-rows-1.sk | 62 +++++++++++++++----------------
 doc/src/diagrams/modelview-move-rows-2.sk | 46 +++++++++++------------
 doc/src/diagrams/modelview-move-rows-3.sk | 54 +++++++++++++--------------
 doc/src/diagrams/modelview-move-rows-4.sk | 40 ++++++++++----------
 4 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/doc/src/diagrams/modelview-move-rows-1.sk b/doc/src/diagrams/modelview-move-rows-1.sk
index 3679dc7..dc90cfb 100644
--- a/doc/src/diagrams/modelview-move-rows-1.sk
+++ b/doc/src/diagrams/modelview-move-rows-1.sk
@@ -14,10 +14,10 @@ lw(1)
 r(30,0,0,-30,415.038,664.044)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,337.792)
+r(30,0,0,-30,415,337.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,605)
@@ -35,19 +35,19 @@ lw(1)
 r(30,0,0,-30,277.5,575)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,414.389,574.044)
+r(30,0,0,-30,415,575)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,545)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(30,0,0,-30.262,220,305.262)
 fp((1,1,1))
 lw(1)
-r(31.2174,0,0,-30,414.082,306.92)
+r(30,0,0,-30,415,307.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,415.038,455.177)
@@ -62,31 +62,31 @@ lw(1)
 r(30,0,0,-30,220,695)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,415.038,694.044)
+r(30,0,0,-30.956,415.038,695)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,367.792)
+r(30,0,0,-30,415,367.5)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,277.5,605)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,414.389,604.044)
+r(30,0,0,-30,415,605)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,277.5,635)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,414.389,634.044)
+r(30,0,0,-30,415,635)
 le()
 lw(1)
 r(165,0,0,-230,210,705)
@@ -107,13 +107,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(423.829,345.932))
+txt('0',(424.44,345.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -131,13 +131,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(423.829,315.932))
+txt('1',(424.44,315.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -161,13 +161,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(423.829,612.184))
+txt('2',(424.44,613.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -191,13 +191,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(423.829,582.184))
+txt('3',(424.44,583.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -221,13 +221,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(423.829,552.184))
+txt('4',(424.44,553.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -239,13 +239,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.133,283.402))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(423.522,285.06))
+txt('5',(424.44,285.64))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
@@ -255,17 +255,17 @@ txt('5',(424.478,433.317))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(275,635,0)
-bs(255,635,0)
+bs(277.5,635,0)
+bs(252.5,635,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(293.986,545.115,0)
+bs(292.5,380,0)
+bs(292.5,542.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(290,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-move-rows-2.sk b/doc/src/diagrams/modelview-move-rows-2.sk
index c453a78..7ddb95e 100644
--- a/doc/src/diagrams/modelview-move-rows-2.sk
+++ b/doc/src/diagrams/modelview-move-rows-2.sk
@@ -14,10 +14,10 @@ lw(1)
 r(30,0,0,-30,415.038,664.044)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,337.792)
+r(30,0,0,-30,415,337.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,605)
@@ -35,7 +35,7 @@ lw(1)
 r(30,0,0,-30,275,455)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,415,455)
@@ -47,10 +47,10 @@ lw(1)
 r(30,0,0,-30,415,545)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(29.6927,0,0,-30,220,305.262)
 fp((1,1,1))
 lw(1)
-r(31.2174,0,0,-30,414.082,306.92)
+r(30,0,0,-30,415,307.5)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,220,635)
@@ -65,16 +65,16 @@ lw(1)
 r(30,0,0,-30,415.038,694.044)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,414.389,367.792)
+r(30,0,0,-30,415,367.5)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,275,485)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,415,485)
@@ -83,7 +83,7 @@ lw(1)
 r(30,0,0,-30,275,515)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,415,515)
@@ -107,13 +107,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(423.829,345.932))
+txt('0',(424.44,345.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -131,13 +131,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(423.829,315.932))
+txt('1',(424.44,315.64))
 fp((0,0,0))
 le()
 lw(1)
@@ -161,7 +161,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -191,7 +191,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -221,7 +221,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -245,27 +245,27 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.133,283.402))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(423.522,285.06))
+txt('5',(424.44,285.64))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(272.5,515,0)
+bs(275,515,0)
 bs(252.5,515,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(295,425,0)
+bs(292.5,380,0)
+bs(292.5,422.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(290,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-move-rows-3.sk b/doc/src/diagrams/modelview-move-rows-3.sk
index d320900..33a9ad1 100644
--- a/doc/src/diagrams/modelview-move-rows-3.sk
+++ b/doc/src/diagrams/modelview-move-rows-3.sk
@@ -4,30 +4,30 @@ layout('A4',0)
 layer('Layer 1',1,1,0,0,(0,0,0))
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,345.913,400)
+r(30,0,0,-30,344.997,400)
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335)
 lw(1)
-r(30,0,0,-30,345.916,339.739)
+r(30,0,0,-30,345,339.739)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(30,0,0,-30,220,305.262)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,345,310)
+r(30,0,0,-30,345,310)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,345.913,430)
+r(30,0,0,-30,344.997,430)
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 lw(1)
-r(30,0,0,-30,345.916,369.739)
+r(30,0,0,-30,345,369.739)
 fp((0.753,0.753,1))
 lw(1)
 r(30,0,0,-30,272.5,455)
@@ -36,7 +36,7 @@ lw(1)
 r(30,0,0,-30,345,460)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 le()
 lw(1)
 r(165,0,0,-230,210,705)
@@ -45,25 +45,25 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(355.353,408.14))
+txt('0',(354.437,408.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(355.353,378.14))
+txt('1',(354.437,378.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -81,37 +81,37 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(355.356,347.879))
+txt('3',(354.44,347.879))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(355.356,317.879))
+txt('4',(354.44,317.879))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.133,283.402))
 fp((0,0,0))
 le()
 lw(1)
@@ -121,17 +121,17 @@ txt('5',(355.049,288.14))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(270,455,0)
-bs(250,455,0)
+bs(272.5,455,0)
+bs(252.5,455,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(295,425,0)
+bs(287.5,380,0)
+bs(287.5,422.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(285,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/modelview-move-rows-4.sk b/doc/src/diagrams/modelview-move-rows-4.sk
index a8a1157..0531749 100644
--- a/doc/src/diagrams/modelview-move-rows-4.sk
+++ b/doc/src/diagrams/modelview-move-rows-4.sk
@@ -4,28 +4,28 @@ layout('A4',0)
 layer('Layer 1',1,1,0,0,(0,0,0))
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,425.18)
+r(30,0,0,-30,220,425)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,345,430)
 lw(1)
-r(30,0,0,-30,219.351,335.18)
+r(30,0,0,-30,220,335.18)
 lw(1)
 r(30,0,0,-30,345,339.739)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,218.435,305.442)
+r(30,0,0,-30.442,220,305.442)
 fp((1,1,1))
 lw(1)
-r(30.6087,0,0,-30,344.084,310)
+r(30,0,0,-30,345,310)
 fp((1,1,1))
 lw(1)
-r(30,0,0,-30,219.351,455.18)
+r(30,0,0,-30,220,455)
 fp((1,1,1))
 lw(1)
 r(30,0,0,-30,345,460)
 lw(1)
-r(30,0,0,-30,219.351,365.18)
+r(30,0,0,-30,220,365)
 lw(1)
 r(30,0,0,-30,345,400)
 fp((0.753,0.753,1))
@@ -36,7 +36,7 @@ lw(1)
 r(30,0,0,-30,345,370)
 fp((0.753,0.753,1))
 lw(1)
-r(30,0,0,-30,219.351,395.18)
+r(30,0,0,-30,220,395)
 le()
 lw(1)
 r(165,0,0,-230,210,705)
@@ -45,7 +45,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('0',(228.791,433.32))
+txt('0',(229.44,433.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -57,7 +57,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('1',(228.791,403.32))
+txt('1',(229.44,403.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -81,13 +81,13 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('2',(228.791,373.32))
+txt('2',(229.44,373.14))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('3',(228.791,343.32))
+txt('3',(229.44,343.14))
 fp((0.503,0.503,0.503))
 le()
 lw(1)
@@ -99,7 +99,7 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('4',(228.791,313.32))
+txt('4',(229.44,313.14))
 fp((0,0,0))
 le()
 lw(1)
@@ -111,27 +111,27 @@ le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(228.484,283.582))
+txt('5',(229.44,283.582))
 fp((0,0,0))
 le()
 lw(1)
 Fn('Helvetica')
 Fs(20)
-txt('5',(354.133,288.14))
+txt('5',(354.44,288.14))
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(270,335,0)
-bs(250,335,0)
+bs(272.5,335,0)
+bs(252.5,335,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(294.508,380.772,0)
-bs(295,335,0)
+bs(287.5,380,0)
+bs(287.5,337.5,0)
 lw(1.5)
 la2(([(-4.0, 3.0), (2.0, 0.0), (-4.0, -3.0), (-4.0, 3.0)], 1))
 b()
-bs(249.466,380.772,0)
-bs(291.551,380.772,0)
+bs(250,380,0)
+bs(285,380,0)
 guidelayer('Guide Lines',1,0,0,1,(0,0,1))
 grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
-- 
cgit v0.12


From d52cc1ded5f30a6da0d11b9c3f7de66b2d3e9ee9 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig 
Date: Tue, 4 May 2010 15:14:56 +0200
Subject: Fix rtl issues with sliders in GTK style

Sliders that draw groove decorations did not invert appearance
correctly in vertical or rtl cases. With this fix we will
flip the rectangles of the respective decorations and tell
gtk if we are using an rtl widget or not.

Task-number: QTBUG-8986
Reviewed-yb: thorbjorn
---
 src/gui/styles/qgtkstyle.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index e3ca8b2..0988fd8 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -1937,14 +1937,11 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
 
             QRect groove = proxy()->subControlRect(CC_Slider, option, SC_SliderGroove, widget);
             QRect handle = proxy()->subControlRect(CC_Slider, option, SC_SliderHandle, widget);
-            QRect ticks = proxy()->subControlRect(CC_Slider, option, SC_SliderTickmarks, widget);
 
             bool horizontal = slider->orientation == Qt::Horizontal;
             bool ticksAbove = slider->tickPosition & QSlider::TicksAbove;
             bool ticksBelow = slider->tickPosition & QSlider::TicksBelow;
-            QColor activeHighlight = option->palette.color(QPalette::Normal, QPalette::Highlight);
 
-            QPixmap cache;
             QBrush oldBrush = painter->brush();
             QPen oldPen = painter->pen();
 
@@ -1953,6 +1950,8 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
             QColor highlightAlpha(Qt::white);
             highlightAlpha.setAlpha(80);
 
+            QGtkStylePrivate::gtk_widget_set_direction(hScaleWidget, slider->upsideDown ?
+                                                       GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
             GtkWidget *scaleWidget = horizontal ? hScaleWidget : vScaleWidget;
             style = scaleWidget->style;
 
@@ -1986,11 +1985,21 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                     QRect lowerGroove = grooveRect;
 
                     if (horizontal) {
-                        upperGroove.setLeft(handle.center().x());
-                        lowerGroove.setRight(handle.center().x());
+                        if (slider->upsideDown) {
+                            lowerGroove.setLeft(handle.center().x());
+                            upperGroove.setRight(handle.center().x());
+                        } else {
+                            upperGroove.setLeft(handle.center().x());
+                            lowerGroove.setRight(handle.center().x());
+                        }
                     } else {
-                        upperGroove.setBottom(handle.center().y());
-                        lowerGroove.setTop(handle.center().y());
+                        if (!slider->upsideDown) {
+                            lowerGroove.setBottom(handle.center().y());
+                            upperGroove.setTop(handle.center().y());
+                        } else {
+                            upperGroove.setBottom(handle.center().y());
+                            lowerGroove.setTop(handle.center().y());
+                        }
                     }
 
                     gtkPainter.paintBox( scaleWidget, "trough-upper", upperGroove, state,
-- 
cgit v0.12


From 409ced7dc098438e185b9a6db6b3f53b1472839d Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Tue, 4 May 2010 15:33:02 +0200
Subject: qdoc: Fixed the alphabet index in the compact list.

Now it leaves out any letter that doesn't appear in
the list. i.e. If there are no classes that begin
with QJ... J does not appear in the alphabet index.
---
 doc/src/declarative/declarativeui.qdoc |  8 ++++----
 tools/qdoc3/htmlgenerator.cpp          | 13 ++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 6a1f5c5..5283ba8 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -74,7 +74,7 @@ strengths}.  QML can be be used to incrementally extend an existing
 application or to build completely new applications.  QML is fully \l
 {Extending QML in C++}{extensible from C++}.
 
-\section1 Getting Started:
+\section1 Getting Started
 
 \list
 \o \l {Introduction to the QML language}
@@ -84,7 +84,7 @@ application or to build completely new applications.  QML is fully \l
 \o \l {QML for Qt programmers}
 \endlist
 
-\section1 Core QML Features:
+\section1 Core QML Features
 \list
 \o \l {QML Documents}
 \o \l {Property Binding}
@@ -102,7 +102,7 @@ application or to build completely new applications.  QML is fully \l
 \o \l {qmlruntime.html}{The Qt Declarative Runtime}
 \endlist
 
-\section1 Using QML with C++:
+\section1 Using QML with C++
 \list
 \o \l {Tutorial: Writing QML extensions with C++}
 \o \l {Extending QML in C++}
@@ -110,7 +110,7 @@ application or to build completely new applications.  QML is fully \l
 \o \l {Integrating QML with existing Qt UI code}
 \endlist
 
-\section1 Reference:
+\section1 Reference
 \list
 \o \l {QML Elements}
 \o \l {QML Global Object}
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 569d1cd..d32ae99 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2399,6 +2399,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     */
     NodeMap paragraph[NumParagraphs+1];
     QString paragraphName[NumParagraphs+1];
+    QSet usedParagraphNames;
 
     NodeMap::ConstIterator c = classMap.begin();
     while (c != classMap.end()) {
@@ -2422,6 +2423,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         }
 
         paragraphName[paragraphNo] = key[0].toUpper();
+        usedParagraphNames.insert(key[0].toLower().cell());
         paragraph[paragraphNo].insert(key, c.value());
         ++c;
     }
@@ -2469,12 +2471,12 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "
    ";
         for (int i = 0; i < 26; i++) {
             QChar ch('a' + i);
-            out() << QString("%2 ").arg(ch).arg(ch.toUpper());
+            if (usedParagraphNames.contains(char('a' + i)))
+                out() << QString("%2 ").arg(ch).arg(ch.toUpper());
         }
         out() << "
    \n";
     }
 
-    QSet used;
     out() << "\n";
     for (k = 0; k < numRows; k++) {
         out() << "\n";
@@ -2502,7 +2504,6 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     if (includeAlphabet) {
                         QChar c = paragraphName[currentParagraphNo[i]][0].toLower();
                         out() << QString("").arg(c);
-                        used.insert(c.cell());
                     }
                     out() << ""
                           << paragraphName[currentParagraphNo[i]]
@@ -2545,12 +2546,6 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "\n";
     }
     out() << "
    \n";
-    char C = 'a';
-    while (C <= 'z') {
-        if (!used.contains(C))
-            out() << QString("").arg(C);
-        ++C;
-    }
 }
 
 void HtmlGenerator::generateFunctionIndex(const Node *relative,
-- 
cgit v0.12


From 8737df24cd58359dacd3d0cb7f856cb7484f03c8 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Tue, 4 May 2010 15:53:33 +0200
Subject: Doc: Updating style and HTML in CSS and qdoc Adding all classnames
 generated in qdoc to the CSS and removing redundant   from
 htmlgenerator.

Reviewed-by: Trust Me
---
 doc/src/template/style/style.css | 96 +++++++++++++++++++++++++++++++++++-----
 tools/qdoc3/htmlgenerator.cpp    | 12 ++---
 2 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 9c290f5..2da91f3 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -58,6 +58,10 @@
     {
         vertical-align: baseline;
     }
+	tt, .qmlreadonly span, .qmldefault span
+	{
+		word-spacing:5px;
+	}
     .heading
     {
         font: normal 600 16px/1.0 Arial;
@@ -483,7 +487,7 @@
     .wrap .content p
     {
         line-height: 20px;
-        padding: 10px 5px 10px 5px;
+        padding: 5px 5px 5px 5px;
     }
     .wrap .content ul
     {
@@ -499,7 +503,11 @@
         color: #4c0033;
         text-decoration: none;
     }
-    .footer
+     .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }   .footer
     {
         min-height: 100px;
         color: #797775;
@@ -665,6 +673,10 @@
     {
         font-variant: normal;
     }
+	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+	{
+		text-decoration:none;
+	}
     #shortCut
     {
         padding-top: 10px;
@@ -732,12 +744,16 @@
     }
     th
     {
-        padding: 3px 15px 3px 15px;
+        padding: 5px 15px 5px 15px;
     }
     td
     {
         padding: 3px 15px 3px 20px;
     }
+	td.rightAlign
+	{
+        padding: 3px 15px 3px 10px;
+	}
     table tr.odd
     {
         border-left: 1px solid #E6E6E6;
@@ -758,7 +774,7 @@
     {
         background-color: #E6E6E6;
     }
-
+		
     span.comment
     {
         color: #8B0000;
@@ -856,11 +872,35 @@
         width: 200px;
     }
 
-    .toc h3
+    .toc h3, .generic a
     {
         font: 600 12px/1.2 Arial;
     }
 
+	.generic{}
+	.alignedsummary{}
+	.propsummary{}
+	.memItemLeft{}
+	.memItemRight{}
+	.bottomAlign{}
+	.highlightedCode{}
+	.LegaleseLeft{}
+	.valuelist{}
+	.annotated{}
+	.obsolete{}
+	.compat{}
+	.flags{}
+	.qmlsummary{}
+	.qmlitem{}
+	.qmlproto{}
+	.qmlname{}
+	.qmlreadonly{}
+	.qmldefault{}
+	.qmldoc{}
+	.qt-style{}
+	.redFont{}
+	code{}
+	
     .wrap .content .toc ul
     {
         padding-left: 0px;
@@ -901,8 +941,42 @@
         border-style: solid;
         border-color: #E6E6E6;
         font-weight: bold;
-    }
-
+		word-spacing:3px;
+    }
+
+	.functionIndex {
+	font-size:12pt;
+	word-spacing:10px;
+	margin-bottom:10px;
+    background-color: #F6F6F6;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #E6E6E6;
+	}
+	
+	.centerAlign
+	{
+	text-align:center;	
+	}
+	
+	.rightAlign
+	{
+	text-align:right;	
+	}
+
+	
+	.leftAlign
+	{
+	text-align:left;	
+	}
+
+	.topAlign{
+	vertical-align:top
+	}
+	
+	.functionIndex a{
+	display:inline-block;
+	}
 
     /* start index box */
     .indexbox
@@ -929,8 +1003,8 @@
     {
         display: inline-block;
         width: 49%; 
-        *width:42%;
-        _width:42%;
+       /* *width:42%;
+        _width:42%;*/
         padding:0 2% 0 1%;
         vertical-align:top;
 
@@ -939,8 +1013,8 @@
     .indexboxcont .indexIcon
     {
         width: 11%; 
-        *width:18%;
-        _width:18%;
+       /* *width:18%;
+        _width:18%;*/
         overflow:hidden;
 
 }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index d32ae99..801e199 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2507,7 +2507,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     }
                     out() << ""
                           << paragraphName[currentParagraphNo[i]]
-                          << " ";
+                          << "";
                 }
                 out() << "\n";
 
@@ -2677,7 +2677,7 @@ void HtmlGenerator::generateQmlItem(const Node *node,
     if (summary)
         marked.replace("@name>", "b>");
 
-    marked.replace("<@extra>", "  ");
+    marked.replace("<@extra>", "");
     marked.replace("", "");
 
     if (summary) {
@@ -2986,7 +2986,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
         extraRegExp.setMinimal(true);
         marked.replace(extraRegExp, "");
     } else {
-        marked.replace("<@extra>", "  ");
+        marked.replace("<@extra>", "");
         marked.replace("", "");
     }
 
@@ -3265,7 +3265,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
         extraRegExp.setMinimal(true);
         marked.replace(extraRegExp, "");
     } else {
-        marked.replace("<@extra>", "  ");
+        marked.replace("<@extra>", "");
         marked.replace("", "");
     }
 
@@ -4436,9 +4436,9 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
                 out() << "";
                 out() << "";
                 if (!qpn->isWritable())
-                    out() << "read-only ";
+                    out() << "read-only";
                 if (qpgn->isDefault())
-                    out() << "default ";
+                    out() << "default";
                 generateQmlItem(qpn, relative, marker, false);
                 out() << "";
                 if (qpgn->isDefault()) {
-- 
cgit v0.12


From 62201af6fd7a704e936692231b35342ce051bb08 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint 
Date: Wed, 12 May 2010 10:49:07 +0200
Subject: REG 4.7: Edit widgets icon no longer in toolbar.

Task-number: QTBUG-10626
Reviewed-by: Daniel Molkentin 
---
 tools/designer/src/designer/qdesigner_actions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/designer/src/designer/qdesigner_actions.cpp b/tools/designer/src/designer/qdesigner_actions.cpp
index a593a76..86b6214 100644
--- a/tools/designer/src/designer/qdesigner_actions.cpp
+++ b/tools/designer/src/designer/qdesigner_actions.cpp
@@ -347,6 +347,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
     connect(m_editWidgetsAction, SIGNAL(triggered()), this, SLOT(editWidgetsSlot()));
     m_editWidgetsAction->setChecked(true);
     m_editWidgetsAction->setEnabled(false);
+    m_editWidgetsAction->setProperty(QDesignerActions::defaultToolbarPropertyName, true);
     m_toolActions->addAction(m_editWidgetsAction);
 
     connect(formWindowManager, SIGNAL(activeFormWindowChanged(QDesignerFormWindowInterface*)),
-- 
cgit v0.12


From 0ebc9783d8ca0c4b27208bbc002c53c52c19ab4c Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" 
Date: Tue, 4 May 2010 16:25:18 +0200
Subject: Use qrand() instead of rand()

This only affects X11 code, and are the only 2 places in Qt where rand() is
used instead of qrand().

Task-number: QTBUG-9793
Reviewed-by: TrustMe
---
 src/gui/kernel/qwidget_x11.cpp        | 2 +-
 src/gui/painting/qpaintengine_x11.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 37ac6bf..43f510c 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -3000,7 +3000,7 @@ Picture QX11Data::getSolidFill(int screen, const QColor &c)
             return X11->solid_fills[i].picture;
     }
     // none found, replace one
-    int i = rand() % 16;
+    int i = qrand() % 16;
 
     if (X11->solid_fills[i].screen != screen && X11->solid_fills[i].picture) {
         XRenderFreePicture (X11->display, X11->solid_fills[i].picture);
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index da48fcb..aef8b80 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -315,7 +315,7 @@ static Picture getPatternFill(int screen, const QBrush &b)
             return X11->pattern_fills[i].picture;
     }
     // none found, replace one
-    int i = rand() % 16;
+    int i = qrand() % 16;
 
     if (X11->pattern_fills[i].screen != screen && X11->pattern_fills[i].picture) {
 	XRenderFreePicture (X11->display, X11->pattern_fills[i].picture);
-- 
cgit v0.12


From d59ef5d00b6c07c3a1c332ebdd0fac060538940c Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Tue, 4 May 2010 18:48:36 +0200
Subject: QtDeclarative: remove spurious semi-colons from the source code

---
 src/declarative/graphicsitems/qdeclarativegridview_p.h    | 2 +-
 src/declarative/graphicsitems/qdeclarativelistview_p.h    | 2 +-
 src/declarative/qml/qdeclarativebinding_p.h               | 2 +-
 src/declarative/qml/qdeclarativecompiledbindings_p.h      | 4 ++--
 src/declarative/qml/qdeclarativecomponent_p.h             | 2 +-
 src/declarative/qml/qdeclarativecontext.h                 | 2 +-
 src/declarative/qml/qdeclarativeguard_p.h                 | 2 +-
 src/declarative/qml/qdeclarativepropertycache.cpp         | 2 +-
 src/declarative/qml/qdeclarativescriptstring.h            | 2 +-
 src/declarative/qml/qdeclarativestringconverters_p.h      | 2 +-
 src/declarative/qml/qdeclarativeworkerscript_p.h          | 2 +-
 src/declarative/qml/qdeclarativexmlhttprequest.cpp        | 6 +++---
 src/declarative/util/qdeclarativelistmodelworkeragent_p.h | 2 +-
 src/declarative/util/qdeclarativesmoothedanimation_p.h    | 2 +-
 src/declarative/util/qdeclarativesmoothedfollow_p.h       | 2 +-
 src/declarative/util/qdeclarativetransitionmanager_p_p.h  | 2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index c06879e..f5d061d 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -142,7 +142,7 @@ public:
     void setSnapMode(SnapMode mode);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain };
-    Q_ENUMS(PositionMode);
+    Q_ENUMS(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(int x, int y) const;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 9c0b7dd..051455c 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -200,7 +200,7 @@ public:
     static QDeclarativeListViewAttached *qmlAttachedProperties(QObject *);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain };
-    Q_ENUMS(PositionMode);
+    Q_ENUMS(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(int x, int y) const;
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 2d3acf5..598f09f 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -164,6 +164,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeBinding*);
+Q_DECLARE_METATYPE(QDeclarativeBinding*)
 
 #endif // QDECLARATIVEBINDING_P_H
diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h
index a17bc84..d5c6a02 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings_p.h
+++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h
@@ -104,8 +104,8 @@ protected:
     int qt_metacall(QMetaObject::Call, int, void **);
 
 private:
-    Q_DISABLE_COPY(QDeclarativeCompiledBindings);
-    Q_DECLARE_PRIVATE(QDeclarativeCompiledBindings);
+    Q_DISABLE_COPY(QDeclarativeCompiledBindings)
+    Q_DECLARE_PRIVATE(QDeclarativeCompiledBindings)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index 24e5386..8b95945 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -149,7 +149,7 @@ Q_SIGNALS:
     void destruction();
 
 private:
-    friend class QDeclarativeContextData;;
+    friend class QDeclarativeContextData;
     friend class QDeclarativeComponentPrivate;
 };
 
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
index 548869c..d87123a 100644
--- a/src/declarative/qml/qdeclarativecontext.h
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -107,7 +107,7 @@ private:
 };
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QList);
+Q_DECLARE_METATYPE(QList)
 
 QT_END_HEADER
 
diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h
index be60ce4..02fed0b 100644
--- a/src/declarative/qml/qdeclarativeguard_p.h
+++ b/src/declarative/qml/qdeclarativeguard_p.h
@@ -97,7 +97,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeGuard);
+Q_DECLARE_METATYPE(QDeclarativeGuard)
 
 #include "private/qdeclarativedata_p.h"
 
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index 888945b..26bddde 100644
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -45,7 +45,7 @@
 #include "private/qdeclarativebinding_p.h"
 #include 
 
-Q_DECLARE_METATYPE(QScriptValue);
+Q_DECLARE_METATYPE(QScriptValue)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h
index 43bef44..fc92a9b 100644
--- a/src/declarative/qml/qdeclarativescriptstring.h
+++ b/src/declarative/qml/qdeclarativescriptstring.h
@@ -79,7 +79,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeScriptString);
+Q_DECLARE_METATYPE(QDeclarativeScriptString)
 
 QT_END_HEADER
 
diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h
index 7afdfd3..97f72fc 100644
--- a/src/declarative/qml/qdeclarativestringconverters_p.h
+++ b/src/declarative/qml/qdeclarativestringconverters_p.h
@@ -80,7 +80,7 @@ namespace QDeclarativeStringConverters
     QSizeF Q_DECLARATIVE_EXPORT sizeFFromString(const QString &, bool *ok = 0);
     QRectF Q_DECLARATIVE_EXPORT rectFFromString(const QString &, bool *ok = 0);
     QVector3D Q_DECLARATIVE_EXPORT vector3DFromString(const QString &, bool *ok = 0);
-};
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeworkerscript_p.h b/src/declarative/qml/qdeclarativeworkerscript_p.h
index 6cce799..4019d13 100644
--- a/src/declarative/qml/qdeclarativeworkerscript_p.h
+++ b/src/declarative/qml/qdeclarativeworkerscript_p.h
@@ -119,7 +119,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeWorkerScript);
+QML_DECLARE_TYPE(QDeclarativeWorkerScript)
 
 QT_END_HEADER
 
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index b7e1832..e034165 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -318,9 +318,9 @@ public:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Node);
-Q_DECLARE_METATYPE(NodeList);
-Q_DECLARE_METATYPE(NamedNodeMap);
+Q_DECLARE_METATYPE(Node)
+Q_DECLARE_METATYPE(NodeList)
+Q_DECLARE_METATYPE(NamedNodeMap)
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index 53d30c2..1622144 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -146,7 +146,7 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDeclarativeListModelWorkerAgent::VariantRef);
+Q_DECLARE_METATYPE(QDeclarativeListModelWorkerAgent::VariantRef)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h
index 17aafa4..f45d19f 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h
@@ -96,7 +96,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSmoothedAnimation);
+QML_DECLARE_TYPE(QDeclarativeSmoothedAnimation)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativesmoothedfollow_p.h b/src/declarative/util/qdeclarativesmoothedfollow_p.h
index d860052..6319192 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow_p.h
+++ b/src/declarative/util/qdeclarativesmoothedfollow_p.h
@@ -106,7 +106,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QDeclarativeSmoothedFollow);
+QML_DECLARE_TYPE(QDeclarativeSmoothedFollow)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
index 4131391..2e23898 100644
--- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h
+++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h
@@ -70,7 +70,7 @@ public:
     void cancel();
 
 private:
-    Q_DISABLE_COPY(QDeclarativeTransitionManager);
+    Q_DISABLE_COPY(QDeclarativeTransitionManager)
     QDeclarativeTransitionManagerPrivate *d;
 
     void complete();
-- 
cgit v0.12


From 395e00552802024cb41335bc87675441ff119d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= 
Date: Tue, 4 May 2010 18:43:42 +0200
Subject: Skip tst_LargeFile::mapOffsetOverflow on Mac

On this platform mmap'ing beyond EOF may succeed, even beyond filesystem
capabilities, but generate Bus Errors on access.

Skipping this failing test and accepting the underlying undefined
behavior is the right thing to do, until QFile offers proper guarantees.

Reviewed-by: Thiago Macieira
---
 tests/auto/qfile/largefile/tst_largefile.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qfile/largefile/tst_largefile.cpp b/tests/auto/qfile/largefile/tst_largefile.cpp
index 041e5f2..60c5f89 100644
--- a/tests/auto/qfile/largefile/tst_largefile.cpp
+++ b/tests/auto/qfile/largefile/tst_largefile.cpp
@@ -523,6 +523,10 @@ void tst_LargeFile::mapFile()
 
 void tst_LargeFile::mapOffsetOverflow()
 {
+#if defined(Q_OS_MAC)
+    QSKIP("mmap'ping beyond EOF may succeed; generate bus error on access", SkipAll);
+#endif
+
     // Out-of-range mappings should fail, and not silently clip the offset
     for (int i = 50; i < 63; ++i) {
         uchar *address = 0;
-- 
cgit v0.12


From 36e6c652bc087a6adcef1fad9f899b787e67e9af Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Wed, 5 May 2010 10:06:52 +1000
Subject: Update changelog.

---
 dist/changes-4.7.0 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 4fd7fdb..d156bd7 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -27,6 +27,13 @@ General Improvements
 - Support for the GL_EXT_geometry_shader4, aka Geometry Shaders, was added
   to QGLShaderProgram.
 
+New features
+------------
+
+ - QNetworkSession, QNetworkConfiguration, QNetworkConfigurationManager
+    * New bearer management classes added.
+
+
 Third party components
 ----------------------
 
-- 
cgit v0.12


From 3b3ec6bc4114db82462eef812a47db420d4505c2 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley 
Date: Wed, 5 May 2010 10:19:40 +1000
Subject: Fix a crash with null objects returned from a Q_INVOKABLE

Task-number: QTBUG-10412
Reviewed-by: Aaron Kennedy
---
 src/declarative/qml/qdeclarativeobjectscriptclass.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 03366f0..170f440 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -775,7 +775,8 @@ QScriptDeclarativeClass::Value MetaCallArgument::toValue(QDeclarativeEngine *e)
         return QScriptDeclarativeClass::Value(engine, *((QString *)&data));
     } else if (type == QMetaType::QObjectStar) {
         QObject *object = *((QObject **)&data);
-        QDeclarativeData::get(object, true)->setImplicitDestructible();
+        if (object)
+            QDeclarativeData::get(object, true)->setImplicitDestructible();
         QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(e);
         return QScriptDeclarativeClass::Value(engine, priv->objectClass->newQObject(object));
     } else if (type == qMetaTypeId >()) {
-- 
cgit v0.12


From 4982b883c31874206aaa05268852fbcee81a8a39 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 5 May 2010 11:49:20 +1000
Subject: Enable states to be activated via their 'when' clause even if
 unnamed.

Autogenerate a name for unnamed states: "anonymousState1", etc.

Task-number: QTBUG-10352
Reviewed-by: Aaron Kennedy
---
 src/declarative/util/qdeclarativestategroup.cpp      | 10 +++++++++-
 .../qdeclarativestates/data/unnamedWhen.qml          | 14 ++++++++++++++
 .../qdeclarativestates/tst_qdeclarativestates.cpp    | 20 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml

diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 5b51495..9b042d7 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -47,6 +47,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 #include 
@@ -62,7 +63,7 @@ class QDeclarativeStateGroupPrivate : public QObjectPrivate
 public:
     QDeclarativeStateGroupPrivate()
     : nullState(0), componentComplete(true),
-      ignoreTrans(false), applyingState(false) {}
+      ignoreTrans(false), applyingState(false), unnamedCount(0) {}
 
     QString currentState;
     QDeclarativeState *nullState;
@@ -78,6 +79,7 @@ public:
     bool componentComplete;
     bool ignoreTrans;
     bool applyingState;
+    int unnamedCount;
 
     QDeclarativeTransition *findTransition(const QString &from, const QString &to);
     void setCurrentStateInternal(const QString &state, bool = false);
@@ -259,6 +261,12 @@ void QDeclarativeStateGroup::componentComplete()
     Q_D(QDeclarativeStateGroup);
     d->componentComplete = true;
 
+    for (int ii = 0; ii < d->states.count(); ++ii) {
+        QDeclarativeState *state = d->states.at(ii);
+        if (state->name().isEmpty())
+            state->setName(QLatin1String("anonymousState") % QString::number(++d->unnamedCount));
+    }
+
     if (d->updateAutoState()) {
         return;
     } else if (!d->currentState.isEmpty()) {
diff --git a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml b/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
new file mode 100644
index 0000000..a70840c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+Rectangle {
+    id: theRect
+    property bool triggerState: false
+    property string stateString: ""
+    states: State {
+        when: triggerState
+        PropertyChanges {
+            target: theRect
+            stateString: "inState"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index d384d26..13992ad 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -110,6 +110,7 @@ private slots:
     void illegalObjectCreation();
     void whenOrdering();
     void urlResolution();
+    void unnamedWhen();
 };
 
 void tst_qdeclarativestates::initTestCase()
@@ -1049,6 +1050,25 @@ void tst_qdeclarativestates::urlResolution()
     QCOMPARE(image3->source(), resolved);
 }
 
+void tst_qdeclarativestates::unnamedWhen()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/unnamedWhen.qml");
+    QDeclarativeRectangle *rect = qobject_cast(c.create());
+    QVERIFY(rect != 0);
+    QDeclarativeItemPrivate *rectPrivate = QDeclarativeItemPrivate::get(rect);
+
+    QCOMPARE(rectPrivate->state(), QLatin1String(""));
+    QCOMPARE(rect->property("stateString").toString(), QLatin1String(""));
+    rect->setProperty("triggerState", true);
+    QCOMPARE(rectPrivate->state(), QLatin1String("anonymousState1"));
+    QCOMPARE(rect->property("stateString").toString(), QLatin1String("inState"));
+    rect->setProperty("triggerState", false);
+    QCOMPARE(rectPrivate->state(), QLatin1String(""));
+    QCOMPARE(rect->property("stateString").toString(), QLatin1String(""));
+}
+
 QTEST_MAIN(tst_qdeclarativestates)
 
 #include "tst_qdeclarativestates.moc"
-- 
cgit v0.12


From a5d15c36ae3db3caff4eeb86fd7eb5cdbb928f2d Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 12:16:28 +1000
Subject: syntax update

---
 src/imports/gestures/qdeclarativegesturearea.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp
index 615c674..19afe0c 100644
--- a/src/imports/gestures/qdeclarativegesturearea.cpp
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp
@@ -259,7 +259,7 @@ bool QDeclarativeGestureAreaPrivate::gestureEvent(QGestureEvent *event)
     bool accept = true;
     for (Bindings::Iterator it = bindings.begin(); it != bindings.end(); ++it) {
         if ((gesture = event->gesture(it.key()))) {
-            it.value()->value();
+            it.value()->evaluate();
             event->setAccepted(true); // XXX only if value returns true?
         }
     }
-- 
cgit v0.12


From 326dab74ba8df7707d1054ca5e0280c5f131c148 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Wed, 5 May 2010 12:51:02 +1000
Subject: Null objects should appear as JS null

---
 src/declarative/qml/qdeclarativeobjectscriptclass.cpp                 | 3 ++-
 tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml  | 4 ++--
 .../declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 170f440..8b64e0e 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -104,7 +104,8 @@ QScriptValue QDeclarativeObjectScriptClass::newQObject(QObject *object, int type
     QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
 
     if (!object)
-        return newObject(scriptEngine, this, new ObjectData(object, type));
+        return scriptEngine->nullValue();
+//        return newObject(scriptEngine, this, new ObjectData(object, type));
 
     if (QObjectPrivate::get(object)->wasDeleted)
        return scriptEngine->undefinedValue();
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
index 72b59ae..2337e44 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml
@@ -19,7 +19,7 @@ QtObject {
 
         myObject.deleteOnSet = 1;
 
-        test3 = myObject.value == undefined;
-        test4 = obj.value == undefined;
+        test3 = myObject == null
+        test4 = obj == null
     }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 6d39be2..8c9290f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -1104,7 +1104,7 @@ void tst_qdeclarativeecmascript::exceptionClearsOnReeval()
     QDeclarativeComponent component(&engine, TEST_FILE("exceptionClearsOnReeval.qml"));
     QString url = component.url().toString();
 
-    QString warning = url + ":4: TypeError: Result of expression 'objectProperty.objectProperty' [undefined] is not an object.";
+    QString warning = url + ":4: TypeError: Result of expression 'objectProperty' [null] is not an object.";
 
     QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
     MyQmlObject *object = qobject_cast(component.create());
-- 
cgit v0.12


From dcee637a9f7a024803f0e5cc1bf57d878dca2ac3 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 5 May 2010 09:50:53 +1000
Subject: Doc improvements, simplify example code

---
 doc/src/declarative/advtutorial.qdoc               | 50 +++++++++++++++----
 doc/src/declarative/tutorial.qdoc                  | 15 +++---
 .../declarative/tutorials/helloworld/tutorial1.qml |  3 +-
 .../declarative/tutorials/helloworld/tutorial2.qml |  3 +-
 .../declarative/tutorials/helloworld/tutorial3.qml |  3 +-
 .../tutorials/samegame/samegame1/Block.qml         |  2 +-
 .../tutorials/samegame/samegame1/Button.qml        | 17 +++++--
 .../tutorials/samegame/samegame1/samegame.qml      |  7 ++-
 .../tutorials/samegame/samegame2/Block.qml         |  2 +-
 .../tutorials/samegame/samegame2/Button.qml        | 17 +++++--
 .../tutorials/samegame/samegame2/samegame.qml      |  5 +-
 .../tutorials/samegame/samegame3/Button.qml        | 17 +++++--
 .../tutorials/samegame/samegame3/Dialog.qml        | 33 ++++++-------
 .../tutorials/samegame/samegame3/samegame.js       |  9 ++--
 .../tutorials/samegame/samegame3/samegame.qml      | 14 +++---
 .../samegame/samegame4/content/Button.qml          | 17 +++++--
 .../samegame/samegame4/content/Dialog.qml          | 57 ++++++++++++++++------
 .../samegame/samegame4/content/samegame.js         | 17 ++++---
 .../tutorials/samegame/samegame4/samegame.qml      | 38 +++++----------
 19 files changed, 208 insertions(+), 118 deletions(-)

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 42ce246..7d2967e 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -109,12 +109,16 @@ Notice the anchors for the \c Item, \c Button and \c Text elements are set using
 
 \section2 Adding \c Button and \c Block components
 
-The \c Button item in the code above is defined in a separate file named \c Button.qml.
+The \c Button item in the code above is defined in a separate component file named \c Button.qml.
 To create a functional button, we use the QML elements \l Text and \l MouseArea inside a \l Rectangle.
 Here is the \c Button.qml code:
 
 \snippet declarative/tutorials/samegame/samegame1/Button.qml 0
 
+This essentially defines a rectangle that contains text and can be clicked. The \l MouseArea
+has an \c onClicked() handler that is implemented to emit the \c clicked() signal of the
+\c container when the area is clicked.
+
 In Same Game, the screen is filled with small blocks when the game begins.
 Each block is just an item that contains an image. The block
 code is defined in a separate \c Block.qml file:
@@ -226,14 +230,14 @@ until it is won or lost.
 To do this, we have added the following functions to \c samegame.js:
 
 \list
-\o function \c{handleClick(x,y)}
-\o function \c{floodFill(xIdx,yIdx,type)}
-\o function \c{shuffleDown()}
-\o function \c{victoryCheck()}
-\o function \c{floodMoveCheck(xIdx, yIdx, type)}
+\o \c{handleClick(x,y)}
+\o \c{floodFill(xIdx,yIdx,type)}
+\o \c{shuffleDown()}
+\o \c{victoryCheck()}
+\o \c{floodMoveCheck(xIdx, yIdx, type)}
 \endlist
 
-As this is a tutorial about QML, not game design, we will only discuss \c handleClick() and \c victoryCheck() below since they interface directly with the QML elements. Note that although the game logic here is written in JavaScript, it could have been written in C++ and then exposed to JavaScript. 
+As this is a tutorial about QML, not game design, we will only discuss \c handleClick() and \c victoryCheck() below since they interface directly with the QML elements. Note that although the game logic here is written in JavaScript, it could have been written in C++ and then exposed to QML. 
 
 \section3 Enabling mouse click interaction
 
@@ -269,6 +273,8 @@ And this is how it is used in the main \c samegame.qml file:
 
 \snippet declarative/tutorials/samegame/samegame3/samegame.qml 2
 
+We give the dialog a \l {Item::z}{z} value of 100 to ensure it is displayed on top of our other components. The default \c z value for an item is 0.
+
 
 \section3 A dash of color
 
@@ -383,15 +389,41 @@ The theme change here is produced simply by replacing the block images. This can
 
 Another feature we might want to add to the game is a method of storing and retrieving high scores.
 
-In \c samegame.qml we now pop up a dialog when the game is over and requests the player's name so it can be added to a High Scores table. The dialog is created using \c Dialog.qml:
+To do this, we will show a dialog when the game is over to request the player's name and add it to a High Scores table.
+This requires a few changes to \c Dialog.qml. In addition to a \c Text element, it now has a
+\c TextInput child item for receiving keyboard text input:
+
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 0
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 2
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 3
+
+We'll also add a \c showWithInput() function. The text input will only be visible if this function
+is called instead of \c show(). When the dialog is closed, it emits a \c closed() signal, and
+other elements can retrieve the text entered by the user through an \c inputText property:
+
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 0
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 1
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/Dialog.qml 3
+
+Now the dialog can be used in \c samegame.qml:
 
 \snippet declarative/tutorials/samegame/samegame4/samegame.qml 0
 
-When the dialog is closed, we call the new \c saveHighScore() function in \c samegame.js, which stores the high score locally in an SQL database and also send the score to an online database if possible. 
+When the dialog emits the \c closed signal, we call the new \c saveHighScore() function in \c samegame.js, which stores the high score locally in an SQL database and also send the score to an online database if possible. 
 
+The \c nameInputDialog is activated in the \c victoryCheck() function in \c samegame.js:
+
+\snippet declarative/tutorials/samegame/samegame4/content/samegame.js 3
+\dots 4
+\snippet declarative/tutorials/samegame/samegame4/content/samegame.js 4
 
 \section3 Storing high scores offline
 
+Now we need to implement the functionality to actually save the High Scores table.
+
 Here is the \c saveHighScore() function in \c samegame.js:
 
 \snippet declarative/tutorials/samegame/samegame4/content/samegame.js 2
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 1a93d05..4cfb999 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -86,7 +86,7 @@ Here is the QML code for the application:
 \section2 Import
 
 First, we need to import the types that we need for this example. Most QML files will import the built-in QML
-types (like \l{Rectangle}, \l{Image}, ...) that come with Qt with:
+types (like \l{Rectangle}, \l{Image}, ...) that come with Qt, using:
 
 \snippet examples/declarative/tutorials/helloworld/tutorial1.qml 3
 
@@ -95,7 +95,7 @@ types (like \l{Rectangle}, \l{Image}, ...) that come with Qt with:
 \snippet examples/declarative/tutorials/helloworld/tutorial1.qml 1
 
 We declare a root element of type \l{Rectangle}. It is one of the basic building blocks you can use to create an application in QML.
-We give it an \c{id} to be able to refer to it later. In this case, we call it \e page.
+We give it an \c{id} to be able to refer to it later. In this case, we call it "page".
 We also set the \c width, \c height and \c color properties.
 The \l{Rectangle} element contains many other properties (such as \c x and \c y), but these are left at their default values.
 
@@ -103,15 +103,16 @@ The \l{Rectangle} element contains many other properties (such as \c x and \c y)
 
 \snippet examples/declarative/tutorials/helloworld/tutorial1.qml 2
 
-We add a \l Text element as a child of our root element that will display the text 'Hello world!'.
+We add a \l Text element as a child of the root Rectangle element that displays the text 'Hello world!'.
 
 The \c y property is used to position the text vertically at 30 pixels from the top of its parent.
 
-The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
-
 The \c anchors.horizontalCenter property refers to the horizontal center of an element.
 In this case, we specify that our text element should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-based Layout}).
 
+The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
+
+
 \section2 Viewing the example
 
 To view what you have created, run the \l{Qt Declarative UI Runtime}{qml} tool (located in the \c bin directory) with your filename as the first argument.
@@ -134,10 +135,10 @@ This chapter adds a color picker to change the color of the text.
 \image declarative-tutorial2.png
 
 Our color picker is made of six cells with different colors.
-To avoid writing the same code multiple times, we first create a new \c Cell component.
+To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
 A component provides a way of defining a new type that we can re-use in other QML files.
 A QML component is like a black-box and interacts with the outside world through properties, signals and slots and is generally
-defined in its own QML file (for more details, see \l {Defining new Components}).
+defined in its own QML file. (For more details, see \l {Defining new Components}).
 The component's filename must always start with a capital letter.
 
 Here is the QML code for \c Cell.qml:
diff --git a/examples/declarative/tutorials/helloworld/tutorial1.qml b/examples/declarative/tutorials/helloworld/tutorial1.qml
index 5e27b45..04cd155 100644
--- a/examples/declarative/tutorials/helloworld/tutorial1.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial1.qml
@@ -14,8 +14,9 @@ Rectangle {
     Text {
         id: helloText
         text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
         font.pointSize: 24; font.bold: true
-        y: 30; anchors.horizontalCenter: page.horizontalCenter
     }
 //![2]
 }
diff --git a/examples/declarative/tutorials/helloworld/tutorial2.qml b/examples/declarative/tutorials/helloworld/tutorial2.qml
index 085efa4..66be509 100644
--- a/examples/declarative/tutorials/helloworld/tutorial2.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial2.qml
@@ -9,8 +9,9 @@ Rectangle {
     Text {
         id: helloText
         text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
         font.pointSize: 24; font.bold: true
-        y: 30; anchors.horizontalCenter: page.horizontalCenter
     }
 
     Grid {
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 4bf4970..041d9a9 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -9,8 +9,9 @@ Rectangle {
     Text {
         id: helloText
         text: "Hello world!"
+        y: 30
+        anchors.horizontalCenter: page.horizontalCenter
         font.pointSize: 24; font.bold: true
-        y: 30; anchors.horizontalCenter: page.horizontalCenter
 
 //![1]
         MouseArea { id: mouseArea; anchors.fill: parent }
diff --git a/examples/declarative/tutorials/samegame/samegame1/Block.qml b/examples/declarative/tutorials/samegame/samegame1/Block.qml
index a23654b..11fd844 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Block.qml
@@ -7,7 +7,7 @@ Item {
     Image {
         id: img
         anchors.fill: parent
-        source: "../shared/pics/redStone.png";
+        source: "../shared/pics/redStone.png"
     }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame1/Button.qml b/examples/declarative/tutorials/samegame/samegame1/Button.qml
index e84b1ce..96a80eb 100644
--- a/examples/declarative/tutorials/samegame/samegame1/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/Button.qml
@@ -8,9 +8,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -27,8 +27,17 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index b6e01fd..f2974be 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -22,21 +22,20 @@ Rectangle {
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 30
         color: activePalette.window
         anchors.bottom: screen.bottom
 
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game" 
             onClicked: console.log("This doesn't do anything yet...")
         }
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: Who knows?"
-            font.bold: true
         }
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame2/Block.qml b/examples/declarative/tutorials/samegame/samegame2/Block.qml
index 4e71e60..39da84e 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Block.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Block.qml
@@ -6,6 +6,6 @@ Item {
     Image {
         id: img
         anchors.fill: parent
-        source: "../shared/pics/redStone.png";
+        source: "../shared/pics/redStone.png"
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame2/Button.qml b/examples/declarative/tutorials/samegame/samegame2/Button.qml
index 737d886..4ed856b 100644
--- a/examples/declarative/tutorials/samegame/samegame2/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/Button.qml
@@ -7,9 +7,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -26,7 +26,16 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
index a7d1fba..9b4d4d5 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
@@ -30,7 +30,7 @@ Rectangle {
 
 //![1]
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game"
             onClicked: SameGame.startNewGame()
         }
@@ -38,9 +38,8 @@ Rectangle {
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: Who knows?"
-            font.bold: true
         }
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame3/Button.qml b/examples/declarative/tutorials/samegame/samegame3/Button.qml
index 737d886..4ed856b 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Button.qml
@@ -7,9 +7,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -26,7 +26,16 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
index 15b3b2f..3efed2f 100644
--- a/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/Dialog.qml
@@ -2,31 +2,30 @@
 import Qt 4.7
 
 Rectangle {
-    id: page
+    id: container
 
-    signal closed
-
-    function forceClose() {
-        page.closed();
-        page.opacity = 0;
+    function show(text) {
+        dialogText.text = text;
+        container.opacity = 1;
     }
 
-    function show(txt) {
-        dialogText.text = txt;
-        page.opacity = 1;
+    function hide() {
+        container.opacity = 0;
     }
 
-    width: dialogText.width + 20; height: dialogText.height + 20
-    color: "white"
-    border.width: 1
+    width: dialogText.width + 20
+    height: dialogText.height + 20
     opacity: 0
 
-    Behavior on opacity {
-        NumberAnimation { duration: 1000 }
+    Text {
+        id: dialogText
+        anchors.centerIn: parent
+        text: ""
     }
 
-    Text { id: dialogText; anchors.centerIn: parent; text: "Hello World!" }
-
-    MouseArea { anchors.fill: parent; onClicked: forceClose(); }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: hide();
+    }
 }
 //![0]
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js
index 4256aee..84439fc 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js
@@ -17,7 +17,7 @@ function startNewGame() {
     maxIndex = maxRow * maxColumn;
 
     //Close dialogs
-    dialog.forceClose();
+    dialog.hide();
 
     //Initialize Board
     board = new Array(maxIndex);
@@ -59,10 +59,9 @@ function createBlock(column, row) {
     return true;
 }
 
-var fillFound;
-//Set after a floodFill call to the number of blocks found
-var floodBoard;
-//Set to 1 if the floodFill reaches off that node
+var fillFound; //Set after a floodFill call to the number of blocks found
+var floodBoard; //Set to 1 if the floodFill reaches off that node
+
 //![1]
 function handleClick(xPos, yPos) {
     var column = Math.floor(xPos / gameCanvas.blockSize);
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 50f9d5d..ac93eb1 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -30,7 +30,6 @@ Rectangle {
             width: parent.width - (parent.width % blockSize)
             height: parent.height - (parent.height % blockSize)
             anchors.centerIn: parent
-            z: 20
 
             MouseArea {
                 anchors.fill: parent
@@ -41,26 +40,29 @@ Rectangle {
     }
 
 //![2]
-    Dialog { id: dialog; anchors.centerIn: parent; z: 21 }
+    Dialog {
+        id: dialog
+        anchors.centerIn: parent
+        z: 100
+    }
 //![2]
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 30
         color: activePalette.window
         anchors.bottom: screen.bottom
 
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game"
             onClicked: SameGame.startNewGame()
         }
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: Who knows?"
-            font.bold: true
         }
     }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
index 737d886..4ed856b 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Button.qml
@@ -7,9 +7,9 @@ Rectangle {
 
     signal clicked
 
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    smooth: true
+    width: buttonLabel.width + 20; height: buttonLabel.height + 5
     border { width: 1; color: Qt.darker(activePalette.button) }
+    smooth: true
     radius: 8
 
     // color the button with a gradient
@@ -26,7 +26,16 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseArea { id: mouseArea; anchors.fill: parent; onClicked: container.clicked() }
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked();
+    }
 
-    Text { id: buttonLabel; text: container.text; anchors.centerIn: container; color: activePalette.buttonText }
+    Text {
+        id: buttonLabel
+        anchors.centerIn: container
+        color: activePalette.buttonText
+        text: container.text
+    }
 }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
index 6848534..2f45362 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/Dialog.qml
@@ -1,30 +1,59 @@
 import Qt 4.7
 
+//![0]
 Rectangle {
-    id: page
+    id: container
+//![0]
 
+//![1]
+    property string inputText: textInput.text
     signal closed
 
-    function forceClose() {
-        page.closed();
-        page.opacity = 0;
+    function show(text) {
+        dialogText.text = text;
+        container.opacity = 1;
+        textInput.opacity = 0;
     }
 
-    function show(txt) {
-        dialogText.text = txt;
-        page.opacity = 1;
+    function showWithInput(text) {
+        show(text);
+        textInput.opacity = 1;
+        textInput.text = ""
     }
 
-    width: dialogText.width + 20; height: dialogText.height + 20
-    color: "white"
-    border.width: 1
+    function hide() {
+        container.opacity = 0;
+        container.closed();
+    }
+//![1]
+
+    width: dialogText.width + textInput.width + 20
+    height: dialogText.height + 20
     opacity: 0
 
-    Behavior on opacity {
-        NumberAnimation { duration: 1000 }
+    Text {
+        id: dialogText
+        anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: 10 }
+        text: ""
+    }
+
+//![2]
+    TextInput {
+        id: textInput
+        anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
+        width: 80
+        focus: true
+        text: ""
+
+        onAccepted: container.hide()    // close dialog when Enter is pressed
     }
+//![2]
 
-    Text { id: dialogText; anchors.centerIn: parent; text: "Hello World!" }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: hide();
+    }
 
-    MouseArea { anchors.fill: parent; onClicked: forceClose(); }
+//![3]
 }
+//![3]
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index 961cd66..06d21e6 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -25,8 +25,8 @@ function startNewGame() {
     maxIndex = maxRow * maxColumn;
 
     //Close dialogs
-    nameInputDialog.forceClose();
-    dialog.forceClose();
+    nameInputDialog.hide();
+    dialog.hide();
 
     //Initialize Board
     board = new Array(maxIndex);
@@ -72,10 +72,9 @@ function createBlock(column, row) {
     return true;
 }
 
-var fillFound;
-//Set after a floodFill call to the number of blocks found
-var floodBoard;
-//Set to 1 if the floodFill reaches off that node
+var fillFound; //Set after a floodFill call to the number of blocks found
+var floodBoard; //Set to 1 if the floodFill reaches off that node
+
 function handleClick(xPos, yPos) {
     var column = Math.floor(xPos / gameCanvas.blockSize);
     var row = Math.floor(yPos / gameCanvas.blockSize);
@@ -157,7 +156,9 @@ function shuffleDown() {
     }
 }
 
+//![3]
 function victoryCheck() {
+//![3]
     //Award bonus points if no blocks left
     var deservesBonus = true;
     for (var column = maxColumn - 1; column >= 0; column--)
@@ -166,12 +167,14 @@ function victoryCheck() {
     if (deservesBonus)
         gameCanvas.score += 500;
 
+//![4]
     //Check whether game has finished
     if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1))) {
         gameDuration = new Date() - gameDuration;
-        nameInputDialog.show("You won! Please enter your name:                 ");
+        nameInputDialog.showWithInput("You won! Please enter your name: ");
     }
 }
+//![4]
 
 //only floods up and right, to see if it can find adjacent same-typed blocks 
 function floodMoveCheck(column, row, type) {
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index 404af0a..feb61fd 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -25,7 +25,7 @@ Rectangle {
             property int score: 0
             property int blockSize: 40
 
-            z: 20; anchors.centerIn: parent
+            anchors.centerIn: parent
             width: parent.width - (parent.width % blockSize);
             height: parent.height - (parent.height % blockSize);
 
@@ -35,53 +35,41 @@ Rectangle {
         }
     }
 
-    Dialog { id: dialog; anchors.centerIn: parent; z: 21 }
+    Dialog {
+        id: dialog
+        anchors.centerIn: parent
+        z: 100
+    }
 
     //![0]
     Dialog {
         id: nameInputDialog
-
         anchors.centerIn: parent
-        z: 22
+        z: 100
 
-        Text {
-            id: dialogText
-            opacity: 0
-            text: "   You won! Please enter your name:"
-        }
-
-        TextInput {
-            id: nameInput
-            width: 72
-            anchors { verticalCenter: parent.verticalCenter; left: dialogText.right }
-            focus: true
-
-            onAccepted: {
-                if (nameInputDialog.opacity == 1 && nameInput.text != "")
-                    SameGame.saveHighScore(nameInput.text);
-                nameInputDialog.forceClose();
-            }
+        onClosed: {
+            if (nameInputDialog.inputText != "")
+                SameGame.saveHighScore(nameInputDialog.inputText);
         }
     }
     //![0]
 
     Rectangle {
         id: toolBar
-        width: parent.width; height: 32
+        width: parent.width; height: 30
         color: activePalette.window
         anchors.bottom: screen.bottom
 
         Button {
-            anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { left: parent.left; verticalCenter: parent.verticalCenter }
             text: "New Game"
             onClicked: SameGame.startNewGame()
         }
 
         Text {
             id: score
-            anchors { right: parent.right; rightMargin: 3; verticalCenter: parent.verticalCenter }
+            anchors { right: parent.right; verticalCenter: parent.verticalCenter }
             text: "Score: " + gameCanvas.score
-            font.bold: true
         }
     }
 }
-- 
cgit v0.12


From c76d98da76fd687d2953f0026b16bca3c7fcf485 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 13:24:25 +1000
Subject: Allow translations without extra command-line args, and document
 both.

---
 doc/src/declarative/qmlruntime.qdoc | 17 +++++++++
 tools/qml/qmlruntime.cpp            | 72 +++++++++++++++++++++++--------------
 tools/qml/qmlruntime.h              |  6 ++++
 3 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index a724c7d..23c5c32 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -112,6 +112,23 @@
 
     When run with the \c -help option, qml shows available options.
 
+    \section2 Translations
+
+    When the runtime loads an initial QML file, it will install a translation file from
+    a "i18n" subdirectory relative to that initial QML file. The actual translation file
+    loaded will be according to the system locale and have the form
+    "qml_.qm", where  is a two-letter ISO 639 language,
+    such as "qml_fr.qm", optionally followed by an underscore and an uppercase two-letter ISO 3166 country
+    code, such as "qml_fr_FR.qm" or "qml_fr_CA.qm".
+
+    Such files can be created using \l{Qt Linguist}.
+
+    See \l{scripting.html#internationalization} for information about how to make
+    the JavaScript in QML files use translatable strings.
+
+    Additionally, the QML runtime will load translation files specified on the
+    command line via the \c -translation option.
+
     \section2 Dummy Data
 
     The secondary use of the qml runtime is to allow QML files to be viewed with
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 008f163..da31284 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -464,6 +465,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
       , frame_stream(0), scaleSkin(true), mb(0)
       , portraitOrientation(0), landscapeOrientation(0)
       , m_scriptOptions(0), tester(0), useQmlFileBrowser(true)
+      , translator(0)
 {
     QDeclarativeViewer::registerTypes();
     setWindowTitle(tr("Qt Qml Runtime"));
@@ -937,6 +939,46 @@ void QDeclarativeViewer::launch(const QString& file_or_url)
     QMetaObject::invokeMethod(this, "open", Qt::QueuedConnection, Q_ARG(QString, file_or_url));
 }
 
+void QDeclarativeViewer::loadTranslationFile(const QString& directory)
+{
+    if (!translator) {
+        translator = new QTranslator(this);
+        QApplication::installTranslator(translator);
+    }
+
+    translator->load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n"));
+}
+
+void QDeclarativeViewer::loadDummyDataFiles(const QString& directory)
+{
+    QDir dir(directory+"/dummydata", "*.qml");
+    QStringList list = dir.entryList();
+    for (int i = 0; i < list.size(); ++i) {
+        QString qml = list.at(i);
+        QFile f(dir.filePath(qml));
+        f.open(QIODevice::ReadOnly);
+        QByteArray data = f.readAll();
+        QDeclarativeComponent comp(canvas->engine());
+        comp.setData(data, QUrl());
+        QObject *dummyData = comp.create();
+
+        if(comp.isError()) {
+            QList errors = comp.errors();
+            foreach (const QDeclarativeError &error, errors) {
+                qWarning() << error;
+            }
+            if (tester) tester->executefailure();
+        }
+
+        if (dummyData) {
+            qWarning() << "Loaded dummy data:" << dir.filePath(qml);
+            qml.truncate(qml.length()-4);
+            canvas->rootContext()->setContextProperty(qml, dummyData);
+            dummyData->setParent(this);
+        }
+    }
+}
+
 bool QDeclarativeViewer::open(const QString& file_or_url)
 {
     currentFileOrUrl = file_or_url;
@@ -966,39 +1008,15 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
 
     QString fileName = url.toLocalFile();
     if (!fileName.isEmpty()) {
-        QFileInfo fi(fileName);
         if (fi.exists()) {
             if (fi.suffix().toLower() != QLatin1String("qml")) {
                 qWarning() << "qml cannot open non-QML file" << fileName;
                 return false;
             }
 
-            QDir dir(fi.path()+"/dummydata", "*.qml");
-            QStringList list = dir.entryList();
-            for (int i = 0; i < list.size(); ++i) {
-                QString qml = list.at(i);
-                QFile f(dir.filePath(qml));
-                f.open(QIODevice::ReadOnly);
-                QByteArray data = f.readAll();
-                QDeclarativeComponent comp(canvas->engine());
-                comp.setData(data, QUrl());
-                QObject *dummyData = comp.create();
-
-                if(comp.isError()) {
-                    QList errors = comp.errors();
-                    foreach (const QDeclarativeError &error, errors) {
-                        qWarning() << error;
-                    }
-                    if (tester) tester->executefailure();
-                }
-
-                if (dummyData) {
-                    qWarning() << "Loaded dummy data:" << dir.filePath(qml);
-                    qml.truncate(qml.length()-4);
-                    ctxt->setContextProperty(qml, dummyData);
-                    dummyData->setParent(this);
-                }
-            }
+            QFileInfo fi(fileName);
+            loadTranslationFile(fi.path());
+            loadDummyDataFiles(fi.path());
         } else {
             qWarning() << "qml cannot find file:" << fileName;
             return false;
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 2a0a07d..0b23303 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -59,6 +59,7 @@ class QDeclarativeTester;
 class QNetworkReply;
 class QNetworkCookieJar;
 class NetworkAccessManagerFactory;
+class QTranslator;
 
 class QDeclarativeViewer
 #if defined(Q_OS_SYMBIAN)
@@ -192,6 +193,11 @@ private:
     NetworkAccessManagerFactory *namFactory;
 
     bool useQmlFileBrowser;
+
+    QTranslator *translator;
+    void loadTranslationFile(const QString& directory);
+
+    void loadDummyDataFiles(const QString& directory);
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeViewer::ScriptOptions)
 
-- 
cgit v0.12


From 9719866c686805d69b0026f555c97594e09c836f Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 13:35:11 +1000
Subject: Example i18n.

---
 examples/declarative/i18n/i18n.qml          |  33 ++++++++++++++++++++++++++++
 examples/declarative/i18n/i18n/base.ts      |  12 ++++++++++
 examples/declarative/i18n/i18n/qml_en_AU.qm | Bin 0 -> 81 bytes
 examples/declarative/i18n/i18n/qml_en_AU.ts |  12 ++++++++++
 examples/declarative/i18n/i18n/qml_fr.qm    | Bin 0 -> 85 bytes
 examples/declarative/i18n/i18n/qml_fr.ts    |  12 ++++++++++
 6 files changed, 69 insertions(+)
 create mode 100644 examples/declarative/i18n/i18n.qml
 create mode 100644 examples/declarative/i18n/i18n/base.ts
 create mode 100644 examples/declarative/i18n/i18n/qml_en_AU.qm
 create mode 100644 examples/declarative/i18n/i18n/qml_en_AU.ts
 create mode 100644 examples/declarative/i18n/i18n/qml_fr.qm
 create mode 100644 examples/declarative/i18n/i18n/qml_fr.ts

diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml
new file mode 100644
index 0000000..3b1279a
--- /dev/null
+++ b/examples/declarative/i18n/i18n.qml
@@ -0,0 +1,33 @@
+import Qt 4.7
+
+//
+// The QML runtime automatically loads a translation from the i18n subdirectory of the root
+// QML file, based on the system language.
+//
+// The files are created/updated by running:
+//
+//   lupdate i18n.qml -ts i18n/*.ts
+//
+// The .ts files can then be edited with Linguist:
+//
+//   linguist i18n/qml_fr.ts
+//
+// The run-time translation files are then generaeted by running:
+//
+//   lrelease i18n/*.ts
+//
+// Translations for new languages are created by copying i18n/base.ts to i18n/qml_.ts
+// and editing the result with Linguist.
+//
+
+Column {
+    Text {
+        text: "If a translation is available for the system language (eg. Franch) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'."
+        width: 200
+        wrapMode: Text.WordWrap
+    }
+    Text {
+        text: qsTr("Hello")
+        font.pointSize: 25
+    }
+}
diff --git a/examples/declarative/i18n/i18n/base.ts b/examples/declarative/i18n/i18n/base.ts
new file mode 100644
index 0000000..82547a1
--- /dev/null
+++ b/examples/declarative/i18n/i18n/base.ts
@@ -0,0 +1,12 @@
+
+
+
+
+    i18n
+    
+        
+        Hello
+        
+    
+
+
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.qm b/examples/declarative/i18n/i18n/qml_en_AU.qm
new file mode 100644
index 0000000..fb8b710
Binary files /dev/null and b/examples/declarative/i18n/i18n/qml_en_AU.qm differ
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.ts b/examples/declarative/i18n/i18n/qml_en_AU.ts
new file mode 100644
index 0000000..e991aff
--- /dev/null
+++ b/examples/declarative/i18n/i18n/qml_en_AU.ts
@@ -0,0 +1,12 @@
+
+
+
+
+    i18n
+    
+        
+        Hello
+        G'day
+    
+
+
diff --git a/examples/declarative/i18n/i18n/qml_fr.qm b/examples/declarative/i18n/i18n/qml_fr.qm
new file mode 100644
index 0000000..583562e
Binary files /dev/null and b/examples/declarative/i18n/i18n/qml_fr.qm differ
diff --git a/examples/declarative/i18n/i18n/qml_fr.ts b/examples/declarative/i18n/i18n/qml_fr.ts
new file mode 100644
index 0000000..365abd9
--- /dev/null
+++ b/examples/declarative/i18n/i18n/qml_fr.ts
@@ -0,0 +1,12 @@
+
+
+
+
+    i18n
+    
+        
+        Hello
+        Bonjour
+    
+
+
-- 
cgit v0.12


From 846210c6381827396868d15cdbb6d42daabda147 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 5 May 2010 14:32:45 +1000
Subject: Don't start valuesource animations until all component objects have
 been completed.

Task-number: QTBUG-9413
---
 src/declarative/util/qdeclarativeanimation.cpp                 | 10 ++++++++++
 src/declarative/util/qdeclarativeanimation_p.h                 |  1 +
 .../animation/pauseAnimation/pauseAnimation-visual.qml         |  4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 4059522..d9abe71 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -178,6 +179,10 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
         d->running = r;
         if (r == false)
             d->avoidPropertyValueSourceStart = true;
+        else {
+            QDeclarativeEnginePrivate *engPriv = QDeclarativeEnginePrivate::get(qmlEngine(this));
+            engPriv->registerFinalizedParserStatusObject(this, this->metaObject()->indexOfSlot("componentFinalized()"));
+        }
         return;
     }
 
@@ -268,6 +273,11 @@ void QDeclarativeAbstractAnimation::componentComplete()
 {
     Q_D(QDeclarativeAbstractAnimation);
     d->componentComplete = true;
+}
+
+void QDeclarativeAbstractAnimation::componentFinalized()
+{
+    Q_D(QDeclarativeAbstractAnimation);
     if (d->running) {
         d->running = false;
         setRunning(true);
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 40c893c..e7cd8a8 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -133,6 +133,7 @@ public:
 
 private Q_SLOTS:
     void timelineComplete();
+    void componentFinalized();
 
 private:
     virtual void setTarget(const QDeclarativeProperty &);
diff --git a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
index d82c6df..cc9a639 100644
--- a/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/pauseAnimation/pauseAnimation-visual.qml
@@ -16,7 +16,7 @@ Rectangle {
         id: img
         source: "pics/qtlogo.png"
         x: 60-width/2
-        y: 100
+        y: 200-img.height
         SequentialAnimation on y {
             loops: Animation.Infinite
             NumberAnimation {
@@ -24,7 +24,7 @@ Rectangle {
                 easing.type: "InOutQuad"
             }
             NumberAnimation {
-                to: 100
+                to: 200-img.height
                 easing.type: "OutBounce"
                 duration: 2000
             }
-- 
cgit v0.12


From ce9bc843443f2c61361afa75a62a7d39029557e6 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 14:38:55 +1000
Subject: QList models now update their properties when they change.

Task-number: QTBUG-10348
---
 doc/src/declarative/qdeclarativemodels.qdoc           | 11 +++++++++--
 examples/declarative/objectlistmodel/dataobject.cpp   | 10 ++++++++--
 examples/declarative/objectlistmodel/dataobject.h     |  8 ++++++--
 examples/declarative/objectlistmodel/view.qml         |  2 +-
 src/declarative/QmlChanges.txt                        |  4 ++++
 .../graphicsitems/qdeclarativevisualitemmodel.cpp     |  8 ++++++--
 .../declarative/qdeclarativerepeater/data/objlist.qml |  2 +-
 .../qdeclarativerepeater/tst_qdeclarativerepeater.cpp | 19 ++++++++++++++-----
 8 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 91acb3c..9b706a1 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -283,7 +283,9 @@ QDeclarativeContext *ctxt = view.rootContext();
 ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
 \endcode
 
-The properties of the object may then be accessed in the delegate:
+The QObject* is available as the \c modelData property.  As a convenience,
+the properties of the object are also made available directly in the
+delegate's context:
 
 \code
 ListView {
@@ -295,13 +297,18 @@ ListView {
        Rectangle {
             height: 25
             width: 100
-            color: model.color
+            color: model.modelData.color
             Text { text: name }
        }
    }
 }
 \endcode
 
+Note the use of the fully qualified access to the \c color property.  
+The properties of the object are not replicated in the \c model
+object, since they are easily available via the modelData
+object.
+
 Note: There is no way for the view to know that the contents of a QList
 have changed.  If the QList is changed, it will be necessary to reset
 the model by calling QDeclarativeContext::setContextProperty() again.
diff --git a/examples/declarative/objectlistmodel/dataobject.cpp b/examples/declarative/objectlistmodel/dataobject.cpp
index 4c44ee4..14be1b9 100644
--- a/examples/declarative/objectlistmodel/dataobject.cpp
+++ b/examples/declarative/objectlistmodel/dataobject.cpp
@@ -59,7 +59,10 @@ QString DataObject::name() const
 
 void DataObject::setName(const QString &name)
 {
-    m_name = name;
+    if (name != m_name) {
+        m_name = name;
+        emit nameChanged();
+    }
 }
 
 QString DataObject::color() const
@@ -69,5 +72,8 @@ QString DataObject::color() const
 
 void DataObject::setColor(const QString &color)
 {
-    m_color = color;
+    if (color != m_color) {
+        m_color = color;
+        emit colorChanged();
+    }
 }
diff --git a/examples/declarative/objectlistmodel/dataobject.h b/examples/declarative/objectlistmodel/dataobject.h
index 6804474..852110d 100644
--- a/examples/declarative/objectlistmodel/dataobject.h
+++ b/examples/declarative/objectlistmodel/dataobject.h
@@ -48,8 +48,8 @@ class DataObject : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString color READ color WRITE setColor)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
     DataObject(QObject *parent=0);
@@ -61,6 +61,10 @@ public:
     QString color() const;
     void setColor(const QString &color);
 
+signals:
+    void nameChanged();
+    void colorChanged();
+
 private:
     QString m_name;
     QString m_color;
diff --git a/examples/declarative/objectlistmodel/view.qml b/examples/declarative/objectlistmodel/view.qml
index 908e388..2b8383f 100644
--- a/examples/declarative/objectlistmodel/view.qml
+++ b/examples/declarative/objectlistmodel/view.qml
@@ -9,7 +9,7 @@ ListView {
         Rectangle {
             height: 25
             width: 100
-            color: model.color
+            color: model.modelData.color
             Text { text: name }
         }
     }
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 7218f78..dfc4244 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -4,6 +4,10 @@ The changes below are pre Qt 4.7.0 RC
 Flickable: overShoot is replaced by boundsBehavior enumeration.
 Component: isReady, isLoading, isError and isNull properties removed, use
     status property instead
+QList models no longer provide properties in model object.  The
+properties are now updated when the object changes.  An object's property
+"foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo"
+
 
 C++ API
 -------
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 2addc77..f01d4c2 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -437,8 +437,7 @@ int QDeclarativeVisualDataModelDataMetaObject::createProperty(const char *name,
     if ((!model->m_listModelInterface || !model->m_abstractItemModel) && model->m_listAccessor) {
         if (model->m_listAccessor->type() == QDeclarativeListAccessor::ListProperty) {
             model->ensureRoles();
-            QObject *object = model->m_listAccessor->at(data->m_index).value();
-            if (object && (object->property(name).isValid() || qstrcmp(name,"modelData")==0))
+            if (qstrcmp(name,"modelData") == 0)
                 return QDeclarativeOpenMetaObject::createProperty(name, type);
         }
     }
@@ -1029,6 +1028,11 @@ QDeclarativeItem *QDeclarativeVisualDataModel::item(int index, const QByteArray
         if (!ccontext) ccontext = qmlContext(this);
         QDeclarativeContext *ctxt = new QDeclarativeContext(ccontext);
         QDeclarativeVisualDataModelData *data = new QDeclarativeVisualDataModelData(index, this);
+        if ((!d->m_listModelInterface || !d->m_abstractItemModel) && d->m_listAccessor
+            && d->m_listAccessor->type() == QDeclarativeListAccessor::ListProperty) {
+            ctxt->setContextObject(d->m_listAccessor->at(index).value());
+            ctxt = new QDeclarativeContext(ctxt, ctxt);
+        }
         ctxt->setContextProperty(QLatin1String("model"), data);
         ctxt->setContextObject(data);
         d->m_completePending = false;
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
index 17c5d8d..e1bd2e2 100644
--- a/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
+++ b/tests/auto/declarative/qdeclarativerepeater/data/objlist.qml
@@ -14,7 +14,7 @@ Rectangle {
         property int instantiated: 0
         Component {
             Item{
-                Component.onCompleted: {if(index!=model.idx) repeater.errors += 1; repeater.instantiated++}
+                Component.onCompleted: {if(index!=modelData.idx) repeater.errors += 1; repeater.instantiated++}
             }
         }
     }
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index 8be7d80..e6b2fdd 100644
--- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -185,15 +185,24 @@ void tst_QDeclarativeRepeater::numberModel()
     delete canvas;
 }
 
+class MyObject : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int idx READ idx CONSTANT)
+public:
+    MyObject(int i) : QObject(), m_idx(i) {}
+
+    int idx() const { return m_idx; }
+
+    int m_idx;
+};
+
 void tst_QDeclarativeRepeater::objectList()
 {
     QDeclarativeView *canvas = createView();
-
     QObjectList data;
-    for(int i=0; i<100; i++){
-        data << new QObject();
-        data.back()->setProperty("idx", i);
-    }
+    for(int i=0; i<100; i++)
+        data << new MyObject(i);
 
     QDeclarativeContext *ctxt = canvas->rootContext();
     ctxt->setContextProperty("testData", QVariant::fromValue(data));
-- 
cgit v0.12


From de5728c826d44808529a681472b899f30e18e325 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 5 May 2010 14:51:11 +1000
Subject: doc

Task-number: QTBUG-10386
---
 .../graphicsitems/qdeclarativeborderimage.cpp      |  14 +--
 .../graphicsitems/qdeclarativeflickable.cpp        |  14 +--
 .../graphicsitems/qdeclarativeflipable.cpp         |   2 +-
 .../graphicsitems/qdeclarativegridview.cpp         |  18 ++--
 .../graphicsitems/qdeclarativeimage.cpp            |  20 ++--
 src/declarative/graphicsitems/qdeclarativeitem.cpp |   2 +-
 .../graphicsitems/qdeclarativelistview.cpp         |  18 ++--
 .../graphicsitems/qdeclarativeloader.cpp           |   8 +-
 .../graphicsitems/qdeclarativepathview.cpp         |   8 +-
 .../graphicsitems/qdeclarativepositioners.cpp      |  14 +--
 src/declarative/graphicsitems/qdeclarativetext.cpp |  73 +++++++------
 .../graphicsitems/qdeclarativetextedit.cpp         |  46 ++++-----
 .../graphicsitems/qdeclarativetextinput.cpp        |  28 ++---
 src/declarative/qml/qdeclarativecomponent.cpp      |   8 +-
 src/declarative/util/qdeclarativeanimation.cpp     | 114 ++++++++++-----------
 src/declarative/util/qdeclarativefontloader.cpp    |   8 +-
 .../util/qdeclarativesmoothedanimation.cpp         |   6 +-
 .../util/qdeclarativesmoothedfollow.cpp            |   6 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp  |   8 +-
 19 files changed, 210 insertions(+), 205 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 14a2cab..018bd55 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -102,10 +102,10 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 
     This property holds the status of image loading.  It can be one of:
     \list
-    \o Null - no image has been set
-    \o Ready - the image has been loaded
-    \o Loading - the image is currently being loaded
-    \o Error - an error occurred while loading the image
+    \o BorderImage.Null - no image has been set
+    \o BorderImage.Ready - the image has been loaded
+    \o BorderImage.Loading - the image is currently being loaded
+    \o BorderImage.Error - an error occurred while loading the image
     \endlist
 
     \sa progress
@@ -300,9 +300,9 @@ QDeclarativeScaleGrid *QDeclarativeBorderImage::border()
     This property describes how to repeat or stretch the middle parts of the border image.
 
     \list
-    \o Stretch - Scale the image to fit to the available area.
-    \o Repeat - Tile the image until there is no more space. May crop the last image.
-    \o Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
+    \o BorderImage.Stretch - Scale the image to fit to the available area.
+    \o BorderImage.Repeat - Tile the image until there is no more space. May crop the last image.
+    \o BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
     \endlist
 */
 QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::horizontalTileMode() const
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 35aa0f8..3128851 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -587,13 +587,13 @@ QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea()
     This property determines which directions the view can be flicked.
 
     \list
-    \o AutoFlickDirection (default) - allows flicking vertically if the
+    \o Flickable.AutoFlickDirection (default) - allows flicking vertically if the
     \e contentHeight is not equal to the \e height of the Flickable.
     Allows flicking horizontally if the \e contentWidth is not equal
     to the \e width of the Flickable.
-    \o HorizontalFlick - allows flicking horizontally.
-    \o VerticalFlick - allows flicking vertically.
-    \o HorizontalAndVerticalFlick - allows flicking in both directions.
+    \o Flickable.HorizontalFlick - allows flicking horizontally.
+    \o Flickable.VerticalFlick - allows flicking vertically.
+    \o Flickable.HorizontalAndVerticalFlick - allows flicking in both directions.
     \endlist
 */
 QDeclarativeFlickable::FlickDirection QDeclarativeFlickable::flickDirection() const
@@ -1031,11 +1031,11 @@ void QDeclarativeFlickable::setOverShoot(bool o)
     The \c boundsBehavior can be one of:
 
     \list
-    \o \e StopAtBounds - the contents can not be dragged beyond the boundary
+    \o \e Flickable.StopAtBounds - the contents can not be dragged beyond the boundary
     of the flickable, and flicks will not overshoot.
-    \o \e DragOverBounds - the contents can be dragged beyond the boundary
+    \o \e Flickable.DragOverBounds - the contents can be dragged beyond the boundary
     of the Flickable, but flicks will not overshoot.
-    \o \e DragAndOvershootBounds (default) - the contents can be dragged
+    \o \e Flickable.DragAndOvershootBounds (default) - the contents can be dragged
     beyond the boundary of the Flickable, and can overshoot the
     boundary when flicked.
     \endlist
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 85f40c3..e2fc809 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -167,7 +167,7 @@ void QDeclarativeFlipable::retransformBack()
   \qmlproperty enumeration Flipable::side
 
   The side of the Flippable currently visible. Possible values are \c
-  Front and \c Back.
+  Flippable.Front and \c Flippable.Back.
 */
 QDeclarativeFlipable::Side QDeclarativeFlipable::side() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 8fb3632..f55c483 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1280,17 +1280,17 @@ void QDeclarativeGridView::setHighlightMoveDuration(int duration)
     highlight range. Furthermore, the behaviour of the current item index will occur
     whether or not a highlight exists.
 
-    If highlightRangeMode is set to \e ApplyRange the view will
+    If highlightRangeMode is set to \e GridView.ApplyRange the view will
     attempt to maintain the highlight within the range, however
     the highlight can move outside of the range at the ends of the list
     or due to a mouse interaction.
 
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    If highlightRangeMode is set to \e GridView.StrictlyEnforceRange the highlight will never
     move outside of the range.  This means that the current item will change
     if a keyboard or mouse action would cause the highlight to move
     outside of the range.
 
-    The default value is \e NoHighlightRange.
+    The default value is \e GridView.NoHighlightRange.
 
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
@@ -1348,10 +1348,10 @@ void QDeclarativeGridView::setHighlightRangeMode(HighlightRangeMode mode)
   \qmlproperty enumeration GridView::flow
   This property holds the flow of the grid.
 
-  Possible values are \c LeftToRight (default) and \c TopToBottom.
+  Possible values are \c GridView.LeftToRight (default) and \c GridView.TopToBottom.
 
-  If \a flow is \c LeftToRight, the view will scroll vertically.
-  If \a flow is \c TopToBottom, the view will scroll horizontally.
+  If \a flow is \c GridView.LeftToRight, the view will scroll vertically.
+  If \a flow is \c GridView.TopToBottom, the view will scroll horizontally.
 */
 QDeclarativeGridView::Flow QDeclarativeGridView::flow() const
 {
@@ -1474,10 +1474,10 @@ void QDeclarativeGridView::setCellHeight(int cellHeight)
     The allowed values are:
 
     \list
-    \o NoSnap (default) - the view will stop anywhere within the visible area.
-    \o SnapToRow - the view will settle with a row (or column for TopToBottom flow)
+    \o GridView.NoSnap (default) - the view will stop anywhere within the visible area.
+    \o GridView.SnapToRow - the view will settle with a row (or column for TopToBottom flow)
     aligned with the start of the view.
-    \o SnapOneRow - the view will settle no more than one row (or column for TopToBottom flow)
+    \o GridView.SnapOneRow - the view will settle no more than one row (or column for TopToBottom flow)
     away from the first visible row at the time the mouse button is released.
     This mode is particularly useful for moving one page at a time.
     \endlist
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 1c32b45..aeddb15 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -199,12 +199,12 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap)
     than the size of the item.
 
     \list
-    \o Stretch - the image is scaled to fit
-    \o PreserveAspectFit - the image is scaled uniformly to fit without cropping
-    \o PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
-    \o Tile - the image is duplicated horizontally and vertically
-    \o TileVertically - the image is stretched horizontally and tiled vertically
-    \o TileHorizontally - the image is stretched vertically and tiled horizontally
+    \o Image.Stretch - the image is scaled to fit
+    \o Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping
+    \o Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary
+    \o Image.Tile - the image is duplicated horizontally and vertically
+    \o Image.TileVertically - the image is stretched horizontally and tiled vertically
+    \o Image.TileHorizontally - the image is stretched vertically and tiled horizontally
     \endlist
 
     \image declarative-image_fillMode.gif
@@ -243,10 +243,10 @@ qreal QDeclarativeImage::paintedHeight() const
 
     This property holds the status of image loading.  It can be one of:
     \list
-    \o Null - no image has been set
-    \o Ready - the image has been loaded
-    \o Loading - the image is currently being loaded
-    \o Error - an error occurred while loading the image
+    \o Image.Null - no image has been set
+    \o Image.Ready - the image has been loaded
+    \o Image.Loading - the image is currently being loaded
+    \o Image.Error - an error occurred while loading the image
     \endlist
 
     Note that a change in the status property does not cause anything to happen
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 14f6b4a..a0983cc 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1432,7 +1432,7 @@ QDeclarativeItem::~QDeclarativeItem()
     }
     \endqml
 
-    The default transform origin is \c Center.
+    The default transform origin is \c Item.Center.
 */
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 0f3ee61..3b77ff8 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1690,17 +1690,17 @@ void QDeclarativeListView::setHighlightFollowsCurrentItem(bool autoHighlight)
     highlight range. Furthermore, the behaviour of the current item index will occur
     whether or not a highlight exists.
 
-    If highlightRangeMode is set to \e ApplyRange the view will
+    If highlightRangeMode is set to \e ListView.ApplyRange the view will
     attempt to maintain the highlight within the range, however
     the highlight can move outside of the range at the ends of the list
     or due to a mouse interaction.
 
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    If highlightRangeMode is set to \e ListView.StrictlyEnforceRange the highlight will never
     move outside of the range.  This means that the current item will change
     if a keyboard or mouse action would cause the highlight to move
     outside of the range.
 
-    The default value is \e NoHighlightRange.
+    The default value is \e ListView.NoHighlightRange.
 
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
@@ -1780,9 +1780,9 @@ void QDeclarativeListView::setSpacing(qreal spacing)
 
     Possible values are \c Vertical (default) and \c Horizontal.
 
-    Vertical Example:
+    ListView.Vertical Example:
     \image trivialListView.png
-    Horizontal Example:
+    ListView.Horizontal Example:
     \image ListViewHorizontal.png
 */
 QDeclarativeListView::Orientation QDeclarativeListView::orientation() const
@@ -1996,17 +1996,17 @@ void QDeclarativeListView::setHighlightResizeDuration(int duration)
     The allowed values are:
 
     \list
-    \o NoSnap (default) - the view will stop anywhere within the visible area.
-    \o SnapToItem - the view will settle with an item aligned with the start of
+    \o ListView.NoSnap (default) - the view will stop anywhere within the visible area.
+    \o ListView.SnapToItem - the view will settle with an item aligned with the start of
     the view.
-    \o SnapOneItem - the view will settle no more than one item away from the first
+    \o ListView.SnapOneItem - the view will settle no more than one item away from the first
     visible item at the time the mouse button is released.  This mode is particularly
     useful for moving one page at a time.
     \endlist
 
     snapMode does not affect the currentIndex.  To update the
     currentIndex as the list is moved set \e highlightRangeMode
-    to \e StrictlyEnforceRange.
+    to \e ListView.StrictlyEnforceRange.
 
     \sa highlightRangeMode
 */
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 62fa4db..7edd53c 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -329,10 +329,10 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
 
     This property holds the status of QML loading.  It can be one of:
     \list
-    \o Null - no QML source has been set
-    \o Ready - the QML source has been loaded
-    \o Loading - the QML source is currently being loaded
-    \o Error - an error occurred while loading the QML source
+    \o Loader.Null - no QML source has been set
+    \o Loader.Ready - the QML source has been loaded
+    \o Loader.Loading - the QML source is currently being loaded
+    \o Loader.Error - an error occurred while loading the QML source
     \endlist
 
     Note that a change in the status property does not cause anything to happen
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 7cb723c..9ae6f9d 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -618,12 +618,12 @@ QDeclarativeItem *QDeclarativePathView::highlightItem()
     These properties set the preferred range of the highlight (current item)
     within the view.  The preferred values must be in the range 0.0-1.0.
 
-    If highlightRangeMode is set to \e ApplyRange the view will
+    If highlightRangeMode is set to \e PathView.ApplyRange the view will
     attempt to maintain the highlight within the range, however
     the highlight can move outside of the range at the ends of the path
     or due to a mouse interaction.
 
-    If highlightRangeMode is set to \e StrictlyEnforceRange the highlight will never
+    If highlightRangeMode is set to \e PathView.StrictlyEnforceRange the highlight will never
     move outside of the range.  This means that the current item will change
     if a keyboard or mouse action would cause the highlight to move
     outside of the range.
@@ -631,14 +631,14 @@ QDeclarativeItem *QDeclarativePathView::highlightItem()
     Note that this is the correct way to influence where the
     current item ends up when the view moves. For example, if you want the
     currently selected item to be in the middle of the path, then set the
-    highlight range to be 0.5,0.5 and highlightRangeMode to StrictlyEnforceRange.
+    highlight range to be 0.5,0.5 and highlightRangeMode to PathView.StrictlyEnforceRange.
     Then, when the path scrolls,
     the currently selected item will be the item at that position. This also applies to
     when the currently selected item changes - it will scroll to within the preferred
     highlight range. Furthermore, the behaviour of the current item index will occur
     whether or not a highlight exists.
 
-    The default value is \e StrictlyEnforceRange.
+    The default value is \e PathView.StrictlyEnforceRange.
 
     Note that a valid range requires preferredHighlightEnd to be greater
     than or equal to preferredHighlightBegin.
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 7e4549f..206b09d 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -738,14 +738,14 @@ void QDeclarativeGrid::setRows(const int rows)
 }
 
 /*!
-    \qmlproperty enumeration Flow::flow
+    \qmlproperty enumeration Grid::flow
     This property holds the flow of the layout.
 
-    Possible values are \c LeftToRight (default) and \c TopToBottom.
+    Possible values are \c Grid.LeftToRight (default) and \c Grid.TopToBottom.
 
-    If \a flow is \c LeftToRight, the items are positioned next to
+    If \a flow is \c Grid.LeftToRight, the items are positioned next to
     to each other from left to right, then wrapped to the next line.
-    If \a flow is \c TopToBottom, the items are positioned next to each
+    If \a flow is \c Grid.TopToBottom, the items are positioned next to each
     other from top to bottom, then wrapped to the next column.
 */
 QDeclarativeGrid::Flow QDeclarativeGrid::flow() const
@@ -952,12 +952,12 @@ QDeclarativeFlow::QDeclarativeFlow(QDeclarativeItem *parent)
     \qmlproperty enumeration Flow::flow
     This property holds the flow of the layout.
 
-    Possible values are \c LeftToRight (default) and \c TopToBottom.
+    Possible values are \c Flow.LeftToRight (default) and \c Flow.TopToBottom.
 
-    If \a flow is \c LeftToRight, the items are positioned next to
+    If \a flow is \c Flow.LeftToRight, the items are positioned next to
     to each other from left to right until the width of the Flow
     is exceeded, then wrapped to the next line.
-    If \a flow is \c TopToBottom, the items are positioned next to each
+    If \a flow is \c Flow.TopToBottom, the items are positioned next to each
     other from top to bottom until the height of the Flow is exceeded,
     then wrapped to the next column.
 */
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index eeff0c3..4e7e0fd 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -200,11 +200,11 @@ QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
 
     The weight can be one of:
     \list
-    \o Light
-    \o Normal - the default
-    \o DemiBold
-    \o Bold
-    \o Black
+    \o Font.Light
+    \o Font.Normal - the default
+    \o Font.DemiBold
+    \o Font.Bold
+    \o Font.Black
     \endlist
 
     \qml
@@ -277,11 +277,11 @@ QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
     Sets the capitalization for the text.
 
     \list
-    \o MixedCase - This is the normal text rendering option where no capitalization change is applied.
-    \o AllUppercase - This alters the text to be rendered in all uppercase type.
-    \o AllLowercase	 - This alters the text to be rendered in all lowercase type.
-    \o SmallCaps -	This alters the text to be rendered in small-caps type.
-    \o Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
+    \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied.
+    \o Font.AllUppercase - This alters the text to be rendered in all uppercase type.
+    \o Font.AllLowercase	 - This alters the text to be rendered in all lowercase type.
+    \o Font.SmallCaps -	This alters the text to be rendered in small-caps type.
+    \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
     \endlist
 
     \qml
@@ -380,10 +380,10 @@ QColor QDeclarativeText::color() const
 
     Supported text styles are:
     \list
-    \o Normal - the default
-    \o Outline
-    \o Raised
-    \o Sunken
+    \o Text.Normal - the default
+    \o Text.Outline
+    \o Text.Raised
+    \o Text.Sunken
     \endlist
 
     \qml
@@ -451,9 +451,14 @@ QColor QDeclarativeText::styleColor() const
     Sets the horizontal and vertical alignment of the text within the Text items
     width and height.  By default, the text is top-left aligned.
 
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
-    and \c AlignVCenter.
+    The valid values for \c horizontalAlignment are \c Text.AlignLeft, \c Text.AlignRight and
+    \c Text.AlignHCenter.  The valid values for \c verticalAlignment are \c Text.AlignTop, \c Text.AlignBottom
+    and \c Text.AlignVCenter.
+
+    Note that for a single line of text, the size of the text is the area of the text. In this common case,
+    all alignments are equivalent. If you want the text to be, say, centered in it parent, then you will
+    need to either modify the Item::anchors, or set horizontalAlignment to Text.AlignHCenter and bind the width to 
+    that of the parent.
 */
 QDeclarativeText::HAlignment QDeclarativeText::hAlign() const
 {
@@ -494,16 +499,16 @@ void QDeclarativeText::setVAlign(VAlignment align)
     wrap if an explicit width has been set.  wrapMode can be one of:
 
     \list
-    \o NoWrap - no wrapping will be performed.
-    \o WordWrap - wrapping is done on word boundaries. If the text cannot be
+    \o Text.NoWrap - no wrapping will be performed.
+    \o Text.WordWrap - wrapping is done on word boundaries. If the text cannot be
     word-wrapped to the specified width it will be partially drawn outside of the item's bounds.
     If this is undesirable then enable clipping on the item (Item::clip).
-    \o WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
-    \o WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
+    \o Text.WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
+    \o Text.WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
        will occur at the appropriate point on the line, even in the middle of a word.
     \endlist
 
-    The default is NoWrap.
+    The default is Text.NoWrap.
 */
 QDeclarativeText::WrapMode QDeclarativeText::wrapMode() const
 {
@@ -533,17 +538,17 @@ void QDeclarativeText::setWrapMode(WrapMode mode)
     Supported text formats are:
     
     \list
-    \o AutoText
-    \o PlainText
-    \o RichText
-    \o StyledText
+    \o Text.AutoText
+    \o Text.PlainText
+    \o Text.RichText
+    \o Text.StyledText
     \endlist
 
-    The default is AutoText.  If the text format is AutoText the text element
+    The default is Text.AutoText.  If the text format is Text.AutoText the text element
     will automatically determine whether the text should be treated as
     rich text.  This determination is made using Qt::mightBeRichText().
 
-    StyledText is an optimized format supporting some basic text
+    Text.StyledText is an optimized format supporting some basic text
     styling markup, in the style of html 3.2:
 
     \code
@@ -554,7 +559,7 @@ void QDeclarativeText::setWrapMode(WrapMode mode)
     > < &
     \endcode
 
-    \c StyledText parser is strict, requiring tags to be correctly nested.
+    \c Text.StyledText parser is strict, requiring tags to be correctly nested.
 
     \table
     \row
@@ -622,13 +627,13 @@ void QDeclarativeText::setTextFormat(TextFormat format)
 
     Eliding can be:
     \list
-    \o ElideNone  - the default
-    \o ElideLeft
-    \o ElideMiddle
-    \o ElideRight
+    \o Text.ElideNone  - the default
+    \o Text.ElideLeft
+    \o Text.ElideMiddle
+    \o Text.ElideRight
     \endlist
 
-    If the text is a multi-length string, and the mode is not \c ElideNone,
+    If the text is a multi-length string, and the mode is not \c Text.ElideNone,
     the first string that fits will be used, otherwise the last will be elided.
 
     Multi-length strings are ordered from longest to shortest, separated by the
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 762640c..d0ee2ee 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -138,11 +138,11 @@ QString QDeclarativeTextEdit::text() const
 
     The weight can be one of:
     \list
-    \o Light
-    \o Normal - the default
-    \o DemiBold
-    \o Bold
-    \o Black
+    \o Font.Light
+    \o Font.Normal - the default
+    \o Font.DemiBold
+    \o Font.Bold
+    \o Font.Black
     \endlist
 
     \qml
@@ -215,11 +215,11 @@ QString QDeclarativeTextEdit::text() const
     Sets the capitalization for the text.
 
     \list
-    \o MixedCase - This is the normal text rendering option where no capitalization change is applied.
-    \o AllUppercase - This alters the text to be rendered in all uppercase type.
-    \o AllLowercase	 - This alters the text to be rendered in all lowercase type.
-    \o SmallCaps -	This alters the text to be rendered in small-caps type.
-    \o Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
+    \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied.
+    \o Font.AllUppercase - This alters the text to be rendered in all uppercase type.
+    \o Font.AllLowercase	 - This alters the text to be rendered in all lowercase type.
+    \o Font.SmallCaps -	This alters the text to be rendered in small-caps type.
+    \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
     \endlist
 
     \qml
@@ -255,13 +255,13 @@ void QDeclarativeTextEdit::setText(const QString &text)
     The way the text property should be displayed.
 
     \list
-    \o AutoText
-    \o PlainText
-    \o RichText
-    \o StyledText
+    \o TextEdit.AutoText
+    \o TextEdit.PlainText
+    \o TextEdit.RichText
+    \o TextEdit.StyledText
     \endlist
 
-    The default is AutoText.  If the text format is AutoText the text edit
+    The default is TextEdit.AutoText.  If the text format is TextEdit.AutoText the text edit
     will automatically determine whether the text should be treated as
     rich text.  This determination is made using Qt::mightBeRichText().
 
@@ -428,9 +428,9 @@ void QDeclarativeTextEdit::setSelectedTextColor(const QColor &color)
     Sets the horizontal and vertical alignment of the text within the TextEdit items
     width and height.  By default, the text is top-left aligned.
 
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.  The valid values for \c verticalAlignment are \c AlignTop, \c AlignBottom
-    and \c AlignVCenter.
+    The valid values for \c horizontalAlignment are \c TextEdit.AlignLeft, \c TextEdit.AlignRight and
+    \c TextEdit.AlignHCenter.  The valid values for \c verticalAlignment are \c TextEdit.AlignTop, \c TextEdit.AlignBottom
+    and \c TextEdit.AlignVCenter.
 */
 QDeclarativeTextEdit::HAlignment QDeclarativeTextEdit::hAlign() const
 {
@@ -473,14 +473,14 @@ void QDeclarativeTextEdit::setVAlign(QDeclarativeTextEdit::VAlignment alignment)
     The text will only wrap if an explicit width has been set.
 
     \list
-    \o NoWrap - no wrapping will be performed.
-    \o WordWrap - wrapping is done on word boundaries.
-    \o WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
-    \o WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
+    \o TextEdit.NoWrap - no wrapping will be performed.
+    \o TextEdit.WordWrap - wrapping is done on word boundaries.
+    \o TextEdit.WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word.
+    \o TextEdit.WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it
        will occur at the appropriate point on the line, even in the middle of a word.
     \endlist
 
-    The default is NoWrap.
+    The default is TextEdit.NoWrap.
 */
 QDeclarativeTextEdit::WrapMode QDeclarativeTextEdit::wrapMode() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 775450a..b04e36e 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -118,11 +118,11 @@ void QDeclarativeTextInput::setText(const QString &s)
 
     The weight can be one of:
     \list
-    \o Light
-    \o Normal - the default
-    \o DemiBold
-    \o Bold
-    \o Black
+    \o Font.Light
+    \o Font.Normal - the default
+    \o Font.DemiBold
+    \o Font.Bold
+    \o Font.Black
     \endlist
 
     \qml
@@ -195,11 +195,11 @@ void QDeclarativeTextInput::setText(const QString &s)
     Sets the capitalization for the text.
 
     \list
-    \o MixedCase - This is the normal text rendering option where no capitalization change is applied.
-    \o AllUppercase - This alters the text to be rendered in all uppercase type.
-    \o AllLowercase	 - This alters the text to be rendered in all lowercase type.
-    \o SmallCaps -	This alters the text to be rendered in small-caps type.
-    \o Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
+    \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied.
+    \o Font.AllUppercase - This alters the text to be rendered in all uppercase type.
+    \o Font.AllLowercase	 - This alters the text to be rendered in all lowercase type.
+    \o Font.SmallCaps -	This alters the text to be rendered in small-caps type.
+    \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character.
     \endlist
 
     \qml
@@ -308,8 +308,8 @@ void QDeclarativeTextInput::setSelectedTextColor(const QColor &color)
     vertically. You can use anchors to align it however you want within
     another item.
 
-    The valid values for \c horizontalAlignment are \c AlignLeft, \c AlignRight and
-    \c AlignHCenter.
+    The valid values for \c horizontalAlignment are \c TextInput.AlignLeft, \c TextInput.AlignRight and
+    \c TextInput.AlignHCenter.
 */
 QDeclarativeTextInput::HAlignment QDeclarativeTextInput::hAlign() const
 {
@@ -600,9 +600,9 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
     This property holds the notation of how a string can describe a number.
 
     The values for this property are DoubleValidator.StandardNotation or DoubleValidator.ScientificNotation.
-    If this property is set to ScientificNotation, the written number may have an exponent part(i.e. 1.5E-2).
+    If this property is set to DoubleValidator.ScientificNotation, the written number may have an exponent part(i.e. 1.5E-2).
 
-    By default, this property is set to ScientificNotation.
+    By default, this property is set to DoubleValidator.ScientificNotation.
 */
 
 /*!
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3ca0707..fb799dc 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -241,10 +241,10 @@ QDeclarativeComponent::~QDeclarativeComponent()
     \qmlproperty enumeration Component::status
     This property holds the status of component loading.  It can be one of:
     \list
-    \o Null - no data is available for the component
-    \o Ready - the component has been loaded, and can be used to create instances.
-    \o Loading - the component is currently being loaded
-    \o Error - an error occurred while loading the component.
+    \o Component.Null - no data is available for the component
+    \o Component.Ready - the component has been loaded, and can be used to create instances.
+    \o Component.Loading - the component is currently being loaded
+    \o Component.Error - an error occurred while loading the component.
                Calling errorsString() will provide a human-readable description of any errors.
     \endlist
  */
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 4059522..067565d 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1320,27 +1320,27 @@ void QDeclarativeRotationAnimation::setTo(qreal t)
 /*!
     \qmlproperty enumeration RotationAnimation::direction
     The direction in which to rotate.
-    Possible values are Numerical, Clockwise, Counterclockwise,
-    or Shortest.
+
+    Possible values are:
 
     \table
     \row
-        \o Numerical
+        \o RotationAnimation.Numerical
         \o Rotate by linearly interpolating between the two numbers.
            A rotation from 10 to 350 will rotate 340 degrees clockwise.
     \row
-        \o Clockwise
+        \o RotationAnimation.Clockwise
         \o Rotate clockwise between the two values
     \row
-        \o Counterclockwise
+        \o RotationAnimation.Counterclockwise
         \o Rotate counterclockwise between the two values
     \row
-        \o Shortest
+        \o RotationAnimation.Shortest
         \o Rotate in the direction that produces the shortest animation path.
            A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
     \endtable
 
-    The default direction is Numerical.
+    The default direction is RotationAnimation.Numerical.
 */
 QDeclarativeRotationAnimation::RotationDirection QDeclarativeRotationAnimation::direction() const
 {
@@ -1754,189 +1754,189 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
     Linear.
 
     \qml
-    PropertyAnimation { properties: "y"; easing.type: "InOutElastic"; easing.amplitude: 2.0; easing.period: 1.5 }
+    PropertyAnimation { properties: "y"; easing.type: Easing.InOutElastic; easing.amplitude: 2.0; easing.period: 1.5 }
     \endqml
 
     Available types are:
 
     \table
     \row
-        \o \c Linear
+        \o \c Easing.Linear
         \o Easing curve for a linear (t) function: velocity is constant.
         \o \inlineimage qeasingcurve-linear.png
     \row
-        \o \c InQuad
+        \o \c Easing.InQuad
         \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquad.png
     \row
-        \o \c OutQuad
+        \o \c Easing.OutQuad
         \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
         \o \inlineimage qeasingcurve-outquad.png
     \row
-        \o \c InOutQuad
+        \o \c Easing.InOutQuad
         \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquad.png
     \row
-        \o \c OutInQuad
+        \o \c Easing.OutInQuad
         \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquad.png
     \row
-        \o \c InCubic
+        \o \c Easing.InCubic
         \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-incubic.png
     \row
-        \o \c OutCubic
+        \o \c Easing.OutCubic
         \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outcubic.png
     \row
-        \o \c InOutCubic
+        \o \c Easing.InOutCubic
         \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutcubic.png
     \row
-        \o \c OutInCubic
+        \o \c Easing.OutInCubic
         \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outincubic.png
     \row
-        \o \c InQuart
+        \o \c Easing.InQuart
         \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquart.png
     \row
-        \o \c OutQuart
+        \o \c Easing.OutQuart
         \o Easing curve for a cubic (t^4) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outquart.png
     \row
-        \o \c InOutQuart
+        \o \c Easing.InOutQuart
         \o Easing curve for a cubic (t^4) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquart.png
     \row
-        \o \c OutInQuart
+        \o \c Easing.OutInQuart
         \o Easing curve for a cubic (t^4) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquart.png
     \row
-        \o \c InQuint
+        \o \c Easing.InQuint
         \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inquint.png
     \row
-        \o \c OutQuint
+        \o \c Easing.OutQuint
         \o Easing curve for a cubic (t^5) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outquint.png
     \row
-        \o \c InOutQuint
+        \o \c Easing.InOutQuint
         \o Easing curve for a cubic (t^5) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutquint.png
     \row
-        \o \c OutInQuint
+        \o \c Easing.OutInQuint
         \o Easing curve for a cubic (t^5) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinquint.png
     \row
-        \o \c InSine
+        \o \c Easing.InSine
         \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-insine.png
     \row
-        \o \c OutSine
+        \o \c Easing.OutSine
         \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outsine.png
     \row
-        \o \c InOutSine
+        \o \c Easing.InOutSine
         \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutsine.png
     \row
-        \o \c OutInSine
+        \o \c Easing.OutInSine
         \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinsine.png
     \row
-        \o \c InExpo
+        \o \c Easing.InExpo
         \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inexpo.png
     \row
-        \o \c OutExpo
+        \o \c Easing.OutExpo
         \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outexpo.png
     \row
-        \o \c InOutExpo
+        \o \c Easing.InOutExpo
         \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutexpo.png
     \row
-        \o \c OutInExpo
+        \o \c Easing.OutInExpo
         \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinexpo.png
     \row
-        \o \c InCirc
+        \o \c Easing.InCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-incirc.png
     \row
-        \o \c OutCirc
+        \o \c Easing.OutCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outcirc.png
     \row
-        \o \c InOutCirc
+        \o \c Easing.InOutCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutcirc.png
     \row
-        \o \c OutInCirc
+        \o \c Easing.OutInCirc
         \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outincirc.png
     \row
-        \o \c InElastic
+        \o \c Easing.InElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
         \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
         \o \inlineimage qeasingcurve-inelastic.png
     \row
-        \o \c OutElastic
+        \o \c Easing.OutElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
         \br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
         \o \inlineimage qeasingcurve-outelastic.png
     \row
-        \o \c InOutElastic
+        \o \c Easing.InOutElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutelastic.png
     \row
-        \o \c OutInElastic
+        \o \c Easing.OutInElastic
         \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinelastic.png
     \row
-        \o \c InBack
+        \o \c Easing.InBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inback.png
     \row
-        \o \c OutBack
+        \o \c Easing.OutBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
         \o \inlineimage qeasingcurve-outback.png
     \row
-        \o \c InOutBack
+        \o \c Easing.InOutBack
         \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutback.png
     \row
-        \o \c OutInBack
+        \o \c Easing.OutInBack
         \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinback.png
     \row
-        \o \c InBounce
+        \o \c Easing.InBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
         \o \inlineimage qeasingcurve-inbounce.png
     \row
-        \o \c OutBounce
+        \o \c Easing.OutBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
         \o \inlineimage qeasingcurve-outbounce.png
     \row
-        \o \c InOutBounce
+        \o \c Easing.InOutBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
         \o \inlineimage qeasingcurve-inoutbounce.png
     \row
-        \o \c OutInBounce
+        \o \c Easing.OutInBounce
         \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
         \o \inlineimage qeasingcurve-outinbounce.png
     \endtable
 
-    easing.amplitude is not applicable for all curve types. It is only applicable for bounce and elastic curves (curves of type
-    QEasingCurve::InBounce, QEasingCurve::OutBounce, QEasingCurve::InOutBounce, QEasingCurve::OutInBounce, QEasingCurve::InElastic,
-    QEasingCurve::OutElastic, QEasingCurve::InOutElastic or QEasingCurve::OutInElastic).
+    easing.amplitude is only applicable for bounce and elastic curves (curves of type
+    Easing.InBounce, Easing.OutBounce, Easing.InOutBounce, Easing.OutInBounce, Easing.InElastic,
+    Easing.OutElastic, Easing.InOutElastic or Easing.OutInElastic).
 
-    easing.overshoot is not applicable for all curve types. It is only applicable if type is: QEasingCurve::InBack, QEasingCurve::OutBack,
-    QEasingCurve::InOutBack or QEasingCurve::OutInBack.
+    easing.overshoot is only applicable if type is: Easing.InBack, Easing.OutBack,
+    Easing.InOutBack or Easing.OutInBack.
 
-    easing.period is not applicable for all curve types. It is only applicable if type is: QEasingCurve::InElastic, QEasingCurve::OutElastic,
-    QEasingCurve::InOutElastic or QEasingCurve::OutInElastic.
+    easing.period is only applicable if type is: Easing.InElastic, Easing.OutElastic,
+    Easing.InOutElastic or Easing.OutInElastic.
 */
 QEasingCurve QDeclarativePropertyAnimation::easing() const
 {
@@ -2730,7 +2730,7 @@ void QDeclarativeAnchorAnimation::setDuration(int duration)
     Linear.
 
     \qml
-    AnchorAnimation { easing.type: "InOutQuad" }
+    AnchorAnimation { easing.type: Easing.InOutQuad }
     \endqml
 
     See the \l{PropertyAnimation::easing.type} documentation for information
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index f98ce8b..adfcd62 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -185,10 +185,10 @@ void QDeclarativeFontLoader::setName(const QString &name)
 
     This property holds the status of font loading.  It can be one of:
     \list
-    \o Null - no font has been set
-    \o Ready - the font has been loaded
-    \o Loading - the font is currently being loaded
-    \o Error - an error occurred while loading the font
+    \o FontLoader.Null - no font has been set
+    \o FontLoader.Ready - the font has been loaded
+    \o FontLoader.Loading - the font is currently being loaded
+    \o FontLoader.Error - an error occurred while loading the font
     \endlist
 
     Note that a change in the status property does not cause anything to happen
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 19a00ee..bd48ef0 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -388,10 +388,10 @@ void QDeclarativeSmoothedAnimation::transition(QDeclarativeStateActions &actions
 
     Sets how the SmoothedAnimation behaves if an animation direction is reversed.
 
-    If reversing mode is \c Eased, the animation will smoothly decelerate, and
-    then reverse direction.  If the reversing mode is \c Immediate, the
+    If reversing mode is \c SmoothedAnimation.Eased, the animation will smoothly decelerate, and
+    then reverse direction.  If the reversing mode is \c SmoothedAnimation.Immediate, the
     animation will immediately begin accelerating in the reverse direction,
-    begining with a velocity of 0.  If the reversing mode is \c Sync, the
+    begining with a velocity of 0.  If the reversing mode is \c SmoothedAnimation.Sync, the
     property is immediately set to the target value.
 */
 QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode() const
diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index 3ed9257..e919282 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -143,10 +143,10 @@ QDeclarativeSmoothedFollowPrivate::QDeclarativeSmoothedFollowPrivate()
 
     Sets how the SmoothedFollow behaves if an animation direction is reversed.
 
-    If reversing mode is \c Eased, the animation will smoothly decelerate, and
-    then reverse direction.  If the reversing mode is \c Immediate, the
+    If reversing mode is \SmoothedFollow.c Eased, the animation will smoothly decelerate, and
+    then reverse direction.  If the reversing mode is \c SmoothedFollow.Immediate, the
     animation will immediately begin accelerating in the reverse direction,
-    begining with a velocity of 0.  If the reversing mode is \c Sync, the
+    begining with a velocity of 0.  If the reversing mode is \c SmoothedFollow.Sync, the
     property is immediately set to the target value.
 */
 QDeclarativeSmoothedFollow::ReversingMode QDeclarativeSmoothedFollow::reversingMode() const
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index bdebadf..ae3b5d7 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -675,10 +675,10 @@ void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarati
     Specifies the model loading status, which can be one of the following:
 
     \list
-    \o Null - No XML data has been set for this model.
-    \o Ready - The XML data has been loaded into the model.
-    \o Loading - The model is in the process of reading and loading XML data.
-    \o Error - An error occurred while the model was loading.
+    \o XmlListModel.Null - No XML data has been set for this model.
+    \o XmlListModel.Ready - The XML data has been loaded into the model.
+    \o XmlListModel.Loading - The model is in the process of reading and loading XML data.
+    \o XmlListModel.Error - An error occurred while the model was loading.
     \endlist
 
     \sa progress
-- 
cgit v0.12


From b1bf4b23fb34337ea1b5ebdd5aedaad48f5c9f4a Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 15:13:35 +1000
Subject: Test for QList model with object properties changing.

---
 .../tst_qdeclarativevisualdatamodel.cpp            | 99 ++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
index 7de15a3..c238ef9 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp
@@ -44,6 +44,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -74,9 +78,50 @@ public:
 
 private slots:
     void rootIndex();
+    void objectListModel();
 
 private:
     QDeclarativeEngine engine;
+    template
+    T *findItem(QGraphicsObject *parent, const QString &objectName, int index);
+};
+
+class DataObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
+
+public:
+    DataObject(QObject *parent=0) : QObject(parent) {}
+    DataObject(const QString &name, const QString &color, QObject *parent=0)
+        : QObject(parent), m_name(name), m_color(color) { }
+
+
+    QString name() const { return m_name; }
+    void setName(const QString &name) {
+        if (name != m_name) {
+            m_name = name;
+            emit nameChanged();
+        }
+    }
+
+    QString color() const { return m_color; }
+    void setColor(const QString &color) {
+        if (color != m_color) {
+            m_color = color;
+            emit colorChanged();
+        }
+    }
+
+signals:
+    void nameChanged();
+    void colorChanged();
+
+private:
+    QString m_name;
+    QString m_color;
 };
 
 tst_qdeclarativevisualdatamodel::tst_qdeclarativevisualdatamodel()
@@ -105,6 +150,60 @@ void tst_qdeclarativevisualdatamodel::rootIndex()
     delete obj;
 }
 
+void tst_qdeclarativevisualdatamodel::objectListModel()
+{
+    QDeclarativeView view;
+
+    QList dataList;
+    dataList.append(new DataObject("Item 1", "red"));
+    dataList.append(new DataObject("Item 2", "green"));
+    dataList.append(new DataObject("Item 3", "blue"));
+    dataList.append(new DataObject("Item 4", "yellow"));
+
+    QDeclarativeContext *ctxt = view.rootContext();
+    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+
+    view.setSource(QUrl::fromLocalFile(SRCDIR "/data/objectlist.qml"));
+
+    QDeclarativeListView *listview = qobject_cast(view.rootObject());
+    QVERIFY(listview != 0);
+
+    QDeclarativeItem *viewport = listview->viewport();
+    QVERIFY(viewport != 0);
+
+    QDeclarativeText *name = findItem(viewport, "name", 0);
+    QCOMPARE(name->text(), QString("Item 1"));
+
+    dataList[0]->setProperty("name", QLatin1String("Changed"));
+    QCOMPARE(name->text(), QString("Changed"));
+}
+
+template
+T *tst_qdeclarativevisualdatamodel::findItem(QGraphicsObject *parent, const QString &objectName, int index)
+{
+    const QMetaObject &mo = T::staticMetaObject;
+    //qDebug() << parent->childItems().count() << "children";
+    for (int i = 0; i < parent->childItems().count(); ++i) {
+        QDeclarativeItem *item = qobject_cast(parent->childItems().at(i));
+        if(!item)
+            continue;
+        //qDebug() << "try" << item;
+        if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
+            if (index != -1) {
+                QDeclarativeExpression e(qmlContext(item), "index", item);
+                if (e.evaluate().toInt() == index)
+                    return static_cast(item);
+            } else {
+                return static_cast(item);
+            }
+        }
+        item = findItem(item, objectName, index);
+        if (item)
+        return static_cast(item);
+    }
+
+    return 0;
+}
 
 QTEST_MAIN(tst_qdeclarativevisualdatamodel)
 
-- 
cgit v0.12


From ba8ff70b5ac7b68be57a4b63e439fd5a37c4aafa Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 15:24:53 +1000
Subject: Turn off smooth rendering for qDrawBorderPixmap() with transforms. On
 non-gl graphics systems smooth rendering of qDrawBorderPixmap() with a
 transform applied resulted in ugly artifacts.  Better to draw without smooth
 and get a correct looking result, though with jaggy edges.

Task-number: QTBUG-5687
Reviewed-by: Gunnar
---
 src/gui/painting/qdrawutil.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index a62f06b..ef9b18c 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1137,6 +1137,15 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     xTarget.resize(columns + 1);
     yTarget.resize(rows + 1);
 
+    bool oldAA = painter->testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = painter->testRenderHint(QPainter::SmoothPixmapTransform);
+    if (painter->paintEngine()->type() != QPaintEngine::OpenGL
+        && painter->paintEngine()->type() != QPaintEngine::OpenGL2
+        && (oldSmooth || oldAA) && painter->combinedTransform().type() != QTransform::TxNone) {
+        painter->setRenderHint(QPainter::Antialiasing, false);
+        painter->setRenderHint(QPainter::SmoothPixmapTransform, false);
+    }
+
     xTarget[0] = targetRect.left();
     xTarget[1] = targetCenterLeft;
     xTarget[columns - 1] = targetCenterRight;
@@ -1342,6 +1351,11 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
         painter->drawPixmapFragments(opaqueData.data(), opaqueData.size(), pixmap, QPainter::OpaqueHint);
     if (translucentData.size())
         painter->drawPixmapFragments(translucentData.data(), translucentData.size(), pixmap);
+
+    if (oldAA)
+        painter->setRenderHint(QPainter::Antialiasing, true);
+    if (oldSmooth)
+        painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
 }
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 06c8e20cd7c04c5a11eee5b5a255099fa29bb3e4 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 5 May 2010 14:29:16 +1000
Subject: Fix qdoc errors

---
 doc/src/declarative/advtutorial.qdoc                      | 2 +-
 src/declarative/graphicsitems/qdeclarativeitem.cpp        | 8 +-------
 src/declarative/graphicsitems/qdeclarativepainteditem.cpp | 2 +-
 src/declarative/graphicsitems/qdeclarativetextinput.cpp   | 4 ++--
 src/declarative/qml/qdeclarativeengine.cpp                | 2 +-
 src/declarative/qml/qdeclarativepropertyvaluesource.cpp   | 3 +++
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 7d2967e..8f95190 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -468,6 +468,6 @@ By following this tutorial you've seen how you can write a fully functional appl
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
-demos and examples and the \l {Declarative UI (QML)}{documentation} to find out all the things you can do with QML!
+demos and examples and the \l {Declarative UI Using QML}{documentation} to find out all the things you can do with QML!
 
 */
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index a0983cc..0395766 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1632,10 +1632,6 @@ void QDeclarativeItemPrivate::parentProperty(QObject *o, void *rv, QDeclarativeN
     specify it.
  */
 
-/*!
-    \internal
-*/
-
 /*! \internal */
 QDeclarativeListProperty QDeclarativeItemPrivate::data()
 {
@@ -1646,7 +1642,7 @@ QDeclarativeListProperty QDeclarativeItemPrivate::data()
     \property QDeclarativeItem::childrenRect
     \brief The geometry of an item's children.
 
-    childrenRect provides an easy way to access the (collective) position and size of the item's children.
+    This property holds the (collective) position and size of the item's children.
 */
 QRectF QDeclarativeItem::childrenRect()
 {
@@ -2966,7 +2962,6 @@ void QDeclarativeItem::setFocus(bool focus)
 }
 
 /*!
-    \reimp
     \internal
 */
 void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
@@ -2974,7 +2969,6 @@ void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidg
 }
 
 /*!
-    \reimp
     \internal
 */
 bool QDeclarativeItem::event(QEvent *ev)
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index 5dd7e5d..6430fae 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -231,7 +231,7 @@ void QDeclarativePaintedItem::setCacheFrozen(bool frozen)
 }
 
 /*!
-    \reimp
+    \internal
 */
 void QDeclarativePaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index b04e36e..a1fa8c6 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -828,7 +828,7 @@ void QDeclarativeTextInput::moveCursor()
 }
 
 /*!
-    \qmlmethod int xToPosition(int x)
+    \qmlmethod int TextInput::xToPosition(int x)
 
     This function returns the character position at
     x pixels from the left of the textInput. Position 0 is before the
@@ -1097,7 +1097,7 @@ QString QDeclarativeTextInput::displayText() const
 }
 
 /*!
-    \qmlmethod void moveCursorSelection(int position)
+    \qmlmethod void TextInput::moveCursorSelection(int position)
 
     Moves the cursor to \a position and updates the selection accordingly.
     (To only move the cursor, set the \l cursorPosition property.)
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index dee5ec6..ac60758 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1550,7 +1550,7 @@ QStringList QDeclarativeEngine::importPathList() const
 }
 
 /*!
-  Sets the list of directories where the engine searches for
+  Sets \a paths as the list of directories where the engine searches for
   installed modules in a URL-based directory structure.
 
   By default, the list contains the paths specified in the \c QML_IMPORT_PATH environment
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
index a0ed78f..039998f 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.cpp
@@ -60,6 +60,9 @@ QDeclarativePropertyValueSource::QDeclarativePropertyValueSource()
 {
 }
 
+/*!
+    Destroys the value source.
+*/
 QDeclarativePropertyValueSource::~QDeclarativePropertyValueSource()
 {
 }
-- 
cgit v0.12


From dc4f8e4b23a4b07efe1605c2ae479e219b456df9 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 5 May 2010 15:41:08 +1000
Subject: Docs - point to property types from tutorial and QML Basic Types page

---
 doc/src/declarative/basictypes.qdoc |  9 ++++++---
 doc/src/declarative/tutorial.qdoc   | 14 +++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 6901947..8db1c35 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -43,9 +43,12 @@
   \page qdeclarativebasictypes.html
   \title QML Basic Types
 
-  QML uses a set of property types, which are primitive within QML.
-  These basic types are referenced throughout the documentation of the
-  QML elements. Almost all of them are exactly what you would expect.
+  QML has a set of primitive types, as listed below, that are used throughout
+  the \l {QML Elements}.
+
+  The simpler types in this list can also be used for defining a new
+  \c property in a component. See \l{Extending types from QML} for the
+  list of types that can be used for custom properties.
 
   \annotatedlist qmlbasictypes
 */
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index 4cfb999..75c0f851 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -57,10 +57,10 @@ The tutorial's source code is located in the $QTDIR/examples/declarative/tutoria
 
 Tutorial chapters:
 
-\list
-\o \l {QML Tutorial 1 - Basic Types}
-\o \l {QML Tutorial 2 - QML Component}
-\o \l {QML Tutorial 3 - States and Transitions}
+\list 1
+\o \l {QML Tutorial 1 - Basic Types}{Basic Types}
+\o \l {QML Tutorial 2 - QML Components}{QML Components}
+\o \l {QML Tutorial 3 - States and Transitions}{States and Transitions}
 \endlist
 
 */
@@ -125,7 +125,7 @@ bin/qml $QTDIR/examples/declarative/tutorials/helloworld/tutorial1.qml
 
 /*!
 \page qml-tutorial2.html
-\title QML Tutorial 2 - QML Component
+\title QML Tutorial 2 - QML Components
 \contentspage QML Tutorial
 \previouspage QML Tutorial 1 - Basic Types
 \nextpage QML Tutorial 3 - States and Transitions
@@ -137,7 +137,7 @@ This chapter adds a color picker to change the color of the text.
 Our color picker is made of six cells with different colors.
 To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
 A component provides a way of defining a new type that we can re-use in other QML files.
-A QML component is like a black-box and interacts with the outside world through properties, signals and slots and is generally
+A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally
 defined in its own QML file. (For more details, see \l {Defining new Components}).
 The component's filename must always start with a capital letter.
 
@@ -158,7 +158,7 @@ An \l Item is the most basic visual element in QML and is often used as a contai
 
 We declare a \c cellColor property. This property is accessible from  \e outside our component, this allows us
 to instantiate the cells with different colors.
-This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{intro-properties}{Properties}).
+This property is just an alias to an existing property - the color of the rectangle that compose the cell (see \l{Adding new properties}).
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 5
 
-- 
cgit v0.12


From f8af54e12bcb6e991315c53eca758c43653610fa Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 15:54:33 +1000
Subject: little doc fix.

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

diff --git a/src/declarative/util/qdeclarativesmoothedfollow.cpp b/src/declarative/util/qdeclarativesmoothedfollow.cpp
index e919282..f70df9d 100644
--- a/src/declarative/util/qdeclarativesmoothedfollow.cpp
+++ b/src/declarative/util/qdeclarativesmoothedfollow.cpp
@@ -143,7 +143,7 @@ QDeclarativeSmoothedFollowPrivate::QDeclarativeSmoothedFollowPrivate()
 
     Sets how the SmoothedFollow behaves if an animation direction is reversed.
 
-    If reversing mode is \SmoothedFollow.c Eased, the animation will smoothly decelerate, and
+    If reversing mode is \c SmoothedFollow.Eased, the animation will smoothly decelerate, and
     then reverse direction.  If the reversing mode is \c SmoothedFollow.Immediate, the
     animation will immediately begin accelerating in the reverse direction,
     begining with a velocity of 0.  If the reversing mode is \c SmoothedFollow.Sync, the
-- 
cgit v0.12


From 80c04413ba2c1a20a5d93d69df92ba908c26d81d Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 16:03:16 +1000
Subject: Document delegate life cycle.

Task-number: QTBUG-10353
---
 src/declarative/graphicsitems/qdeclarativegridview.cpp | 3 +++
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 3 +++
 src/declarative/graphicsitems/qdeclarativepathview.cpp | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index f55c483..4c72482 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -908,6 +908,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     In this case ListModel is a handy way for us to test our UI.  In practice
     the model would be implemented in C++, or perhaps via a SQL data source.
 
+    Delegates are instantiated as needed and may be destroyed at any time.
+    State should \e never be stored in a delegate.
+
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 589b8e2..3877fab 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1314,6 +1314,9 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     In this case ListModel is a handy way for us to test our UI.  In practice
     the model would be implemented in C++, or perhaps via a SQL data source.
 
+    Delegates are instantiated as needed and may be destroyed at any time.
+    State should \e never be stored in a delegate.
+
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 9ae6f9d..5c3a3c0 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -308,12 +308,16 @@ void QDeclarativePathViewPrivate::regenerate()
 
     The model is typically provided by a QAbstractListModel "C++ model object", but can also be created directly in QML.
 
-    The items are laid out along a path defined by a \l Path and may be flicked to scroll.
+    The \l delegate is instantiated for each item on the \l path.
+    The items may be flicked to move them along the path.
 
     \snippet doc/src/snippets/declarative/pathview/pathview.qml 0
 
     \image pathview.gif
 
+    Delegates are instantiated as needed and may be destroyed at any time.
+    State should \e never be stored in a delegate.
+
     \bold Note that views do not enable \e clip automatically.  If the view
     is not clipped by another item or the screen, it will be necessary
     to set \e {clip: true} in order to have the out of view items clipped
-- 
cgit v0.12


From f5e3e21e95275a8cf31cddf2063dfa497e92872e Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Wed, 5 May 2010 16:22:51 +1000
Subject: Use enum rather than string for easing type.

---
 demos/declarative/calculator/calculator.qml        |   4 +-
 demos/declarative/flickr/flickr.qml                |   4 +-
 demos/declarative/flickr/mobile/GridDelegate.qml   |   6 +-
 demos/declarative/flickr/mobile/ImageDetails.qml   |   2 +-
 demos/declarative/flickr/mobile/TitleBar.qml       |   2 +-
 demos/declarative/minehunt/MinehuntCore/Tile.qml   |   2 +-
 .../photoviewer/PhotoViewerCore/AlbumDelegate.qml  |   8 +-
 .../twitter/TwitterCore/HomeTitleBar.qml           |   2 +-
 .../twitter/TwitterCore/MultiTitleBar.qml          |   2 +-
 demos/declarative/twitter/TwitterCore/TitleBar.qml |   2 +-
 demos/declarative/twitter/twitter.qml              |   2 +-
 .../content/RetractingWebBrowserHeader.qml         |   2 +-
 demos/declarative/webbrowser/webbrowser.qml        |   4 +-
 examples/declarative/animations/easing.qml         | 104 +++++++++++----------
 .../declarative/animations/property-animation.qml  |   4 +-
 .../declarative/behaviors/behavior-example.qml     |   4 +-
 .../border-image/content/MyBorderImage.qml         |  20 +++-
 .../connections/connections-example.qml            |   2 +-
 examples/declarative/focus/Core/ListViews.qml      |   6 +-
 examples/declarative/focus/focus.qml               |   4 +-
 examples/declarative/fonts/hello.qml               |   2 +-
 examples/declarative/layouts/Button.qml            |  42 ++++++---
 examples/declarative/layouts/positioners.qml       |  16 ++--
 examples/declarative/parallax/qml/Smiley.qml       |   4 +-
 examples/declarative/proxywidgets/proxywidgets.qml |   2 +-
 .../declarative/slideswitch/content/Switch.qml     |   2 +-
 examples/declarative/states/transitions.qml        |   4 +-
 .../declarative/tutorials/helloworld/tutorial3.qml |   2 +-
 examples/declarative/xmldata/yahoonews.qml         |   2 +-
 .../graphicsitems/qdeclarativegridview.cpp         |   2 +-
 .../graphicsitems/qdeclarativelistview.cpp         |   2 +-
 .../graphicsitems/qdeclarativepositioners.cpp      |   2 +-
 src/declarative/util/qdeclarativeanimation.cpp     |   2 +-
 src/declarative/util/qdeclarativebehavior.cpp      |   2 +-
 src/declarative/util/qdeclarativespringfollow.cpp  |   2 +-
 35 files changed, 154 insertions(+), 120 deletions(-)

diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 286a4d1..75f5735 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -98,8 +98,8 @@ Rectangle {
         transitions: Transition {
             SequentialAnimation {
                 PropertyAction { target: rotateButton; property: "operation" }
-                NumberAnimation { properties: "rotation"; duration: 300; easing.type: "InOutQuint" }
-                NumberAnimation { properties: "x,y,width,height"; duration: 300; easing.type: "InOutQuint" }
+                NumberAnimation { properties: "rotation"; duration: 300; easing.type: Easing.InOutQuint }
+                NumberAnimation { properties: "x,y,width,height"; duration: 300; easing.type: Easing.InOutQuint }
             }
         }
     }
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 8b73beb..29763d4 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -38,7 +38,7 @@ Item {
             }
 
             transitions: Transition {
-                NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
+                NumberAnimation { properties: "x"; duration: 500; easing.type: Easing.InOutQuad }
             }
         }
 
@@ -76,7 +76,7 @@ Item {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "x"; duration: 500; easing.type: "InOutQuad" }
+            NumberAnimation { properties: "x"; duration: 500; easing.type: Easing.InOutQuad }
         }
     }
 }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 5ab7b87..eccdc34 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -21,7 +21,7 @@
          Item {
              anchors.centerIn: parent
              scale: 0.0
-             Behavior on scale { NumberAnimation { easing.type: "InOutQuad"} }
+             Behavior on scale { NumberAnimation { easing.type: Easing.InOutQuad} }
              id: scaleMe
 
              Rectangle { height: 79; width: 79; id: blackRect;  anchors.centerIn: parent; color: "black"; smooth: true }
@@ -53,14 +53,14 @@
                  Transition {
                      from: "Show"; to: "Details"
                      ParentAnimation {
-                         NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
+                         NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad }
                      }
                  },
                  Transition {
                      from: "Details"; to: "Show"
                      SequentialAnimation {
                          ParentAnimation {
-                            NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" }
+                            NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad }
                          }
                          PropertyAction { targets: wrapper; properties: "z" }
                      }
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 58b0b83..310c9df 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -114,7 +114,7 @@ Flipable {
     transitions: Transition {
         SequentialAnimation {
             PropertyAction { target: bigImage; property: "smooth"; value: false }
-            NumberAnimation { easing.type: "InOutQuad"; properties: "angle"; duration: 500 }
+            NumberAnimation { easing.type: Easing.InOutQuad; properties: "angle"; duration: 500 }
             PropertyAction { target: bigImage; property: "smooth"; value: !flickable.moving }
         }
     }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index bb57429..025b897 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -81,6 +81,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad }
     }
 }
diff --git a/demos/declarative/minehunt/MinehuntCore/Tile.qml b/demos/declarative/minehunt/MinehuntCore/Tile.qml
index f3620f4..98b2017 100644
--- a/demos/declarative/minehunt/MinehuntCore/Tile.qml
+++ b/demos/declarative/minehunt/MinehuntCore/Tile.qml
@@ -57,7 +57,7 @@ Flipable {
             PauseAnimation {
                 duration: pauseDur
             }
-            RotationAnimation { easing.type: "InOutQuad" }
+            RotationAnimation { easing.type: Easing.InOutQuad }
             ScriptAction { script: if (modelData.hasMine && modelData.flipped) { expl.explode = true } }
         }
     }
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index d39b7bc..142735f 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -78,11 +78,11 @@ Component {
             ]
 
             GridView.onAdd: NumberAnimation {
-                target: albumWrapper; properties: "scale"; from: 0.0; to: 1.0; easing.type: "OutQuad"
+                target: albumWrapper; properties: "scale"; from: 0.0; to: 1.0; easing.type: Easing.OutQuad
             }
             GridView.onRemove: SequentialAnimation {
                 PropertyAction { target: albumWrapper; property: "GridView.delayRemove"; value: true }
-                NumberAnimation { target: albumWrapper; property: "scale"; from: 1.0; to: 0.0; easing.type: "OutQuad" }
+                NumberAnimation { target: albumWrapper; property: "scale"; from: 1.0; to: 0.0; easing.type: Easing.OutQuad }
                 PropertyAction { target: albumWrapper; property: "GridView.delayRemove"; value: false }
             }
 
@@ -92,12 +92,12 @@ Component {
                 SequentialAnimation {
                     NumberAnimation { properties: 'opacity'; duration: 250 }
                     PauseAnimation { duration: 350 }
-                    NumberAnimation { target: backButton; properties: "y"; duration: 200; easing.type: "OutQuad" }
+                    NumberAnimation { target: backButton; properties: "y"; duration: 200; easing.type: Easing.OutQuad }
                 }
             },
             Transition {
                 from: 'inGrid'; to: '*'
-                NumberAnimation { properties: "y,opacity"; easing.type: "OutQuad"; duration: 300 }
+                NumberAnimation { properties: "y,opacity"; easing.type: Easing.OutQuad; duration: 300 }
             }
             ]
         }
diff --git a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
index c1ae3e5..11aa74f 100644
--- a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
@@ -113,7 +113,7 @@ Item {
     transitions: [
         Transition {
             from: "*"; to: "*"
-            NumberAnimation { properties: "x,y,width,height"; easing.type: "InOutQuad" }
+            NumberAnimation { properties: "x,y,width,height"; easing.type: Easing.InOutQuad }
         }
     ]
 }
diff --git a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
index 8c27e2b..445eda4 100644
--- a/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
@@ -18,7 +18,7 @@ Item {
         }
     ]
     transitions: [
-        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
+        Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } }
     ]
 }
 
diff --git a/demos/declarative/twitter/TwitterCore/TitleBar.qml b/demos/declarative/twitter/TwitterCore/TitleBar.qml
index 87ceec5..5256de4 100644
--- a/demos/declarative/twitter/TwitterCore/TitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/TitleBar.qml
@@ -70,6 +70,6 @@ Item {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: "InOutQuad" }
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad }
     }
 }
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index 0e3ec3e..f86388e 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -88,7 +88,7 @@ Item {
             }
         ]
         transitions: [
-            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: "InOutQuad" } }
+            Transition { NumberAnimation { properties: "x,y"; duration: 500; easing.type: Easing.InOutQuad } }
         ]
     }
 }
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
index f5bfadf..b02a5bf 100644
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
@@ -105,7 +105,7 @@ Image {
             NumberAnimation {
                 targets: header
                 properties: "progressOff"
-                easing.type: "InOutQuad"
+                easing.type: Easing.InOutQuad
                 duration: 300
             }
         }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index fbbe7b2..f1a6034 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -99,7 +99,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing.type: "InOutQuad"
+                            easing.type: Easing.InOutQuad
                             duration: 300
                         }
                     }
@@ -155,7 +155,7 @@ Item {
                     Transition {
                         NumberAnimation {
                             properties: "opacity"
-                            easing.type: "InOutQuad"
+                            easing.type: Easing.InOutQuad
                             duration: 320
                         }
                     }
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index b0f9669..939d43b 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -6,47 +6,47 @@ Rectangle {
 
     ListModel {
         id: easingTypes
-        ListElement { type: "Linear"; ballColor: "DarkRed" }
-        ListElement { type: "InQuad"; ballColor: "IndianRed" }
-        ListElement { type: "OutQuad"; ballColor: "Salmon" }
-        ListElement { type: "InOutQuad"; ballColor: "Tomato" }
-        ListElement { type: "OutInQuad"; ballColor: "DarkOrange" }
-        ListElement { type: "InCubic"; ballColor: "Gold" }
-        ListElement { type: "OutCubic"; ballColor: "Yellow" }
-        ListElement { type: "InOutCubic"; ballColor: "PeachPuff" }
-        ListElement { type: "OutInCubic"; ballColor: "Thistle" }
-        ListElement { type: "InQuart"; ballColor: "Orchid" }
-        ListElement { type: "OutQuart"; ballColor: "Purple" }
-        ListElement { type: "InOutQuart"; ballColor: "SlateBlue" }
-        ListElement { type: "OutInQuart"; ballColor: "Chartreuse" }
-        ListElement { type: "InQuint"; ballColor: "LimeGreen" }
-        ListElement { type: "OutQuint"; ballColor: "SeaGreen" }
-        ListElement { type: "InOutQuint"; ballColor: "DarkGreen" }
-        ListElement { type: "OutInQuint"; ballColor: "Olive" }
-        ListElement { type: "InSine"; ballColor: "DarkSeaGreen" }
-        ListElement { type: "OutSine"; ballColor: "Teal" }
-        ListElement { type: "InOutSine"; ballColor: "Turquoise" }
-        ListElement { type: "OutInSine"; ballColor: "SteelBlue" }
-        ListElement { type: "InExpo"; ballColor: "SkyBlue" }
-        ListElement { type: "OutExpo"; ballColor: "RoyalBlue" }
-        ListElement { type: "InOutExpo"; ballColor: "MediumBlue" }
-        ListElement { type: "OutInExpo"; ballColor: "MidnightBlue" }
-        ListElement { type: "InCirc"; ballColor: "CornSilk" }
-        ListElement { type: "OutCirc"; ballColor: "Bisque" }
-        ListElement { type: "InOutCirc"; ballColor: "RosyBrown" }
-        ListElement { type: "OutInCirc"; ballColor: "SandyBrown" }
-        ListElement { type: "InElastic"; ballColor: "DarkGoldenRod" }
-        ListElement { type: "OutElastic"; ballColor: "Chocolate" }
-        ListElement { type: "InOutElastic"; ballColor: "SaddleBrown" }
-        ListElement { type: "OutInElastic"; ballColor: "Brown" }
-        ListElement { type: "InBack"; ballColor: "Maroon" }
-        ListElement { type: "OutBack"; ballColor: "LavenderBlush" }
-        ListElement { type: "InOutBack"; ballColor: "MistyRose" }
-        ListElement { type: "OutInBack"; ballColor: "Gainsboro" }
-        ListElement { type: "OutBounce"; ballColor: "Silver" }
-        ListElement { type: "InBounce"; ballColor: "DimGray" }
-        ListElement { type: "InOutBounce"; ballColor: "SlateGray" }
-        ListElement { type: "OutInBounce"; ballColor: "DarkSlateGray" }
+        ListElement { name: "Easing.Linear"; type: Easing.Linear; ballColor: "DarkRed" }
+        ListElement { name: "Easing.InQuad"; type: Easing.InQuad; ballColor: "IndianRed" }
+        ListElement { name: "Easing.OutQuad"; type: Easing.OutQuad; ballColor: "Salmon" }
+        ListElement { name: "Easing.InOutQuad"; type: Easing.InOutQuad; ballColor: "Tomato" }
+        ListElement { name: "Easing.OutInQuad"; type: Easing.OutInQuad; ballColor: "DarkOrange" }
+        ListElement { name: "Easing.InCubic"; type: Easing.InCubic; ballColor: "Gold" }
+        ListElement { name: "Easing.OutCubic"; type: Easing.OutCubic; ballColor: "Yellow" }
+        ListElement { name: "Easing.InOutCubic"; type: Easing.InOutCubic; ballColor: "PeachPuff" }
+        ListElement { name: "Easing.OutInCubic"; type: Easing.OutInCubic; ballColor: "Thistle" }
+        ListElement { name: "Easing.InQuart"; type: Easing.InQuart; ballColor: "Orchid" }
+        ListElement { name: "Easing.OutQuart"; type: Easing.OutQuart; ballColor: "Purple" }
+        ListElement { name: "Easing.InOutQuart"; type: Easing.InOutQuart; ballColor: "SlateBlue" }
+        ListElement { name: "Easing.OutInQuart"; type: Easing.OutInQuart; ballColor: "Chartreuse" }
+        ListElement { name: "Easing.InQuint"; type: Easing.InQuint; ballColor: "LimeGreen" }
+        ListElement { name: "Easing.OutQuint"; type: Easing.OutQuint; ballColor: "SeaGreen" }
+        ListElement { name: "Easing.InOutQuint"; type: Easing.InOutQuint; ballColor: "DarkGreen" }
+        ListElement { name: "Easing.OutInQuint"; type: Easing.OutInQuint; ballColor: "Olive" }
+        ListElement { name: "Easing.InSine"; type: Easing.InSine; ballColor: "DarkSeaGreen" }
+        ListElement { name: "Easing.OutSine"; type: Easing.OutSine; ballColor: "Teal" }
+        ListElement { name: "Easing.InOutSine"; type: Easing.InOutSine; ballColor: "Turquoise" }
+        ListElement { name: "Easing.OutInSine"; type: Easing.OutInSine; ballColor: "SteelBlue" }
+        ListElement { name: "Easing.InExpo"; type: Easing.InExpo; ballColor: "SkyBlue" }
+        ListElement { name: "Easing.OutExpo"; type: Easing.OutExpo; ballColor: "RoyalBlue" }
+        ListElement { name: "Easing.InOutExpo"; type: Easing.InOutExpo; ballColor: "MediumBlue" }
+        ListElement { name: "Easing.OutInExpo"; type: Easing.OutInExpo; ballColor: "MidnightBlue" }
+        ListElement { name: "Easing.InCirc"; type: Easing.InCirc; ballColor: "CornSilk" }
+        ListElement { name: "Easing.OutCirc"; type: Easing.OutCirc; ballColor: "Bisque" }
+        ListElement { name: "Easing.InOutCirc"; type: Easing.InOutCirc; ballColor: "RosyBrown" }
+        ListElement { name: "Easing.OutInCirc"; type: Easing.OutInCirc; ballColor: "SandyBrown" }
+        ListElement { name: "Easing.InElastic"; type: Easing.InElastic; ballColor: "DarkGoldenRod" }
+        ListElement { name: "Easing.InElastic"; type: Easing.OutElastic; ballColor: "Chocolate" }
+        ListElement { name: "Easing.InOutElastic"; type: Easing.InOutElastic; ballColor: "SaddleBrown" }
+        ListElement { name: "Easing.OutInElastic"; type: Easing.OutInElastic; ballColor: "Brown" }
+        ListElement { name: "Easing.InBack"; type: Easing.InBack; ballColor: "Maroon" }
+        ListElement { name: "Easing.OutBack"; type: Easing.OutBack; ballColor: "LavenderBlush" }
+        ListElement { name: "Easing.InOutBack"; type: Easing.InOutBack; ballColor: "MistyRose" }
+        ListElement { name: "Easing.OutInBack"; type: Easing.OutInBack; ballColor: "Gainsboro" }
+        ListElement { name: "Easing.OutBounce"; type: Easing.OutBounce; ballColor: "Silver" }
+        ListElement { name: "Easing.InBounce"; type: Easing.InBounce; ballColor: "DimGray" }
+        ListElement { name: "Easing.InOutBounce"; type: Easing.InOutBounce; ballColor: "SlateGray" }
+        ListElement { name: "Easing.OutInBounce"; type: Easing.OutInBounce; ballColor: "DarkSlateGray" }
     }
 
     Component {
@@ -54,19 +54,26 @@ Rectangle {
 
         Item {
             height: 42; width: window.width
-            Text { text: type; anchors.centerIn: parent; color: "White" }
+
+            Text { text: name; anchors.centerIn: parent; color: "White" }
+
             Rectangle {
                 id: slot1; color: "#121212"; x: 30; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8; anchors.verticalCenter: parent.verticalCenter
+                border.color: "#343434"; border.width: 1; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
             }
+
             Rectangle {
                 id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8; anchors.verticalCenter: parent.verticalCenter
+                border.color: "#343434"; border.width: 1; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
             }
+
             Rectangle {
                 id: rect; x: 30; color: "#454545"
                 border.color: "White"; border.width: 2
-                height: 32; width: 32; radius: 8; anchors.verticalCenter: parent.verticalCenter
+                height: 32; width: 32; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
 
                 MouseArea {
                     onClicked: if (rect.state == '') rect.state = "right"; else rect.state = ''
@@ -79,10 +86,8 @@ Rectangle {
                 }
 
                 transitions: Transition {
-                    // ParallelAnimation {
-                        NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
-                        ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
-                    // }
+                    NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
+                    ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
                 }
             }
         }
@@ -90,6 +95,7 @@ Rectangle {
 
     Flickable {
         anchors.fill: parent; contentHeight: layout.height
+
         Column {
             id: layout
             anchors.left: parent.left; anchors.right: parent.right
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 5afe8ef..6360511 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -48,13 +48,13 @@ Item {
             // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing.type: "OutExpo"; duration: 300
+                easing.type: Easing.OutExpo; duration: 300
             }
 
             // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing.type: "OutBounce"; duration: 1000
+                easing.type: Easing.OutBounce; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/behaviors/behavior-example.qml b/examples/declarative/behaviors/behavior-example.qml
index b7bae6c..1f17b81 100644
--- a/examples/declarative/behaviors/behavior-example.qml
+++ b/examples/declarative/behaviors/behavior-example.qml
@@ -49,12 +49,12 @@ Rectangle {
 
             // Setting an 'elastic' behavior on the focusRect's x property.
             Behavior on x {
-                NumberAnimation { easing.type: "OutElastic"; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
+                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
             }
 
             // Setting an 'elastic' behavior on the focusRect's y property.
             Behavior on y {
-                NumberAnimation { easing.type: "OutElastic"; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
+                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
             }
 
             Text {
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
index 2573a14..b47df7b 100644
--- a/examples/declarative/border-image/content/MyBorderImage.qml
+++ b/examples/declarative/border-image/content/MyBorderImage.qml
@@ -20,14 +20,26 @@ Item {
 
         SequentialAnimation on width {
             loops: Animation.Infinite
-            NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
+            NumberAnimation {
+                from: container.minWidth; to: container.maxWidth
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+            NumberAnimation {
+                from: container.maxWidth; to: container.minWidth
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
         }
 
         SequentialAnimation on height {
             loops: Animation.Infinite
-            NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
-            NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
+            NumberAnimation {
+                from: container.minHeight; to: container.maxHeight
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+            NumberAnimation {
+                from: container.maxHeight; to: container.minHeight
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
         }
 
         border.top: container.margin
diff --git a/examples/declarative/connections/connections-example.qml b/examples/declarative/connections/connections-example.qml
index fbef968..1dd10ab 100644
--- a/examples/declarative/connections/connections-example.qml
+++ b/examples/declarative/connections/connections-example.qml
@@ -17,7 +17,7 @@ Rectangle {
         rotation: window.angle
 
         Behavior on rotation {
-            NumberAnimation { easing.type: "OutCubic"; duration: 300 }
+            NumberAnimation { easing.type: Easing.OutCubic; duration: 300 }
         }
     }
 
diff --git a/examples/declarative/focus/Core/ListViews.qml b/examples/declarative/focus/Core/ListViews.qml
index 089f821..32a5d4c 100644
--- a/examples/declarative/focus/Core/ListViews.qml
+++ b/examples/declarative/focus/Core/ListViews.qml
@@ -14,7 +14,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -26,7 +26,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -38,7 +38,7 @@ FocusScope {
         delegate: ListViewDelegate {}
 
         Behavior on y {
-            NumberAnimation { duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
diff --git a/examples/declarative/focus/focus.qml b/examples/declarative/focus/focus.qml
index 22b0e50..8c992ae 100644
--- a/examples/declarative/focus/focus.qml
+++ b/examples/declarative/focus/focus.qml
@@ -38,7 +38,7 @@ Rectangle {
         }
 
         transitions: Transition {
-            NumberAnimation { properties: "y"; duration: 600; easing.type: "OutQuint" }
+            NumberAnimation { properties: "y"; duration: 600; easing.type: Easing.OutQuint }
         }
     }
 
@@ -64,6 +64,6 @@ Rectangle {
     }
 
     transitions: Transition {
-        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: "OutQuint" }
+        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: Easing.OutQuint }
     }
 }
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
index d4d0e4c..0d6f4cd 100644
--- a/examples/declarative/fonts/hello.qml
+++ b/examples/declarative/fonts/hello.qml
@@ -19,7 +19,7 @@ Rectangle {
 
             SequentialAnimation on font.letterSpacing {
                 loops: Animation.Infinite;
-                NumberAnimation { from: 100; to: 300; easing.type: "InQuad"; duration: 3000 }
+                NumberAnimation { from: 100; to: 300; easing.type: Easing.InQuad; duration: 3000 }
                 ScriptAction {
                     script: {
                         container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 0f08893..d03eeb5 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -1,22 +1,38 @@
 import Qt 4.7
 
-Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
+Rectangle {
+    id: page
+
     property string text
     property string icon
     signal clicked
 
-    Image { id: pix; x: 5; y:5; source: parent.icon}
-    Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
-    MouseArea{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
+    border.color: "black"; color: "steelblue"; radius: 5
+    width: pix.width + textelement.width + 13
+    height: pix.height + 10
+
+    Image { id: pix; x: 5; y:5; source: parent.icon }
+
+    Text {
+        id: textelement
+        text: page.text; color: "white"
+        x: pix.width + pix.x + 3
+        anchors.verticalCenter: pix.verticalCenter
+    }
+
+    MouseArea {
+        id: mr
+        anchors.fill: parent
+        onClicked: { parent.focus = true; page.clicked() }
+    }
 
-    states:
-        State{ name:"pressed"; when:mr.pressed
-            PropertyChanges {target:textelement; x: 5}
-            PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
-        }
+    states: State {
+        name: "pressed"; when: mr.pressed
+        PropertyChanges { target: textelement; x: 5 }
+        PropertyChanges { target: pix; x: textelement.x + textelement.width + 3 }
+    }
 
-    transitions:
-        Transition{
-            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
-        }
+    transitions: Transition {
+        NumberAnimation { properties: "x,left"; easing.type: Easing.InOutQuad; duration: 200 }
+    }
 }
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index 3703b59..2cb0b8b 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -8,10 +8,10 @@ Rectangle {
         id: layout1
         y: 0
         move: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "y"; easing.type: Easing.OutBounce }
         }
         add: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutQuad" }
+            NumberAnimation { properties: "y"; easing.type: Easing.OutQuad }
         }
 
         Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
@@ -43,10 +43,10 @@ Rectangle {
         id: layout2
         y: 300 
         move: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x"; easing.type: Easing.OutBounce }
         }
         add: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutQuad" }
+            NumberAnimation { properties: "x"; easing.type: Easing.OutQuad }
         }
 
         Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
@@ -117,11 +117,11 @@ Rectangle {
         columns: 3
 
         move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
@@ -167,11 +167,11 @@ Rectangle {
         x: 260; y: 250; width: 150
 
         move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
         }
 
         Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index b1e1ae8..cfa4fed 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -30,13 +30,13 @@ Item {
             // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
             NumberAnimation {
                 from: smiley.minHeight; to: smiley.maxHeight
-                easing.type: "OutExpo"; duration: 300
+                easing.type: Easing.OutExpo; duration: 300
             }
             
             // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-                easing.type: "OutBounce"; duration: 1000
+                easing.type: Easing.OutBounce; duration: 1000
             }
 
             // Then pause for 500ms
diff --git a/examples/declarative/proxywidgets/proxywidgets.qml b/examples/declarative/proxywidgets/proxywidgets.qml
index 46dcf99..88de37f 100644
--- a/examples/declarative/proxywidgets/proxywidgets.qml
+++ b/examples/declarative/proxywidgets/proxywidgets.qml
@@ -63,7 +63,7 @@ Rectangle {
 
     transitions: Transition {
         ParallelAnimation {
-            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: "OutQuad" }
+            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: Easing.OutQuad }
             ColorAnimation { target: window; duration: 600 }
         }
     }
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
index a8fa6ef..1aa7696 100644
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ b/examples/declarative/slideswitch/content/Switch.qml
@@ -69,7 +69,7 @@ Item {
 
 //![7]
     transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: "InOutQuad"; duration: 200 }
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad; duration: 200 }
     }
 //![7]
 }
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index d1b1dd6..ccc7060 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -72,14 +72,14 @@ Rectangle {
         // with OutBounce easing function.
         Transition {
             from: "*"; to: "middleRight"
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce"; duration: 1000 }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce; duration: 1000 }
         },
 
         // When transitioning to 'bottomLeft' move x,y over a duration of 2 seconds,
         // with InOutQuad easing function.
         Transition {
             from: "*"; to: "bottomLeft"
-            NumberAnimation { properties: "x,y"; easing.type: "InOutQuad"; duration: 2000 }
+            NumberAnimation { properties: "x,y"; easing.type: Easing.InOutQuad; duration: 2000 }
         },
 
         // For any other state changes move x,y linearly over duration of 200ms.
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 041d9a9..0da762c 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -28,7 +28,7 @@ Rectangle {
         transitions: Transition {
             from: ""; to: "down"; reversible: true
             ParallelAnimation {
-                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: "InOutQuad" }
+                NumberAnimation { properties: "y,rotation"; duration: 500; easing.type: Easing.InOutQuad }
                 ColorAnimation { duration: 500 }
             }
         }
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index 668778e..5bab463 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -65,7 +65,7 @@ Rectangle {
                 transitions: Transition {
                     from: "*"; to: "Details"; reversible: true
                     SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing.type: "OutQuad" }
+                        NumberAnimation { duration: 200; properties: "height"; easing.type: Easing.OutQuad }
                         NumberAnimation { duration: 200; properties: "opacity" }
                     }
                 }
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 4c72482..9ae7279 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -964,7 +964,7 @@ QDeclarativeGridView::~QDeclarativeGridView()
             id: wrapper
             GridView.onRemove: SequentialAnimation {
                 PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
+                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
                 PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: false }
             }
         }
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 3877fab..cef7e18 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1395,7 +1395,7 @@ QDeclarativeListView::~QDeclarativeListView()
             id: wrapper
             ListView.onRemove: SequentialAnimation {
                 PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" }
+                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
                 PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
             }
         }
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 206b09d..93bff3e 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -377,7 +377,7 @@ Column {
     move: Transition {
         NumberAnimation {
             properties: "y"
-            easing.type: "OutBounce"
+            easing.type: Easing.OutBounce
         }
     }
 }
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 9f95348..7f4d2e4 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1615,7 +1615,7 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
     Animate any objects that have changed their x or y properties in the target state using
     an InOutQuad easing curve:
     \qml
-    Transition { PropertyAnimation { properties: "x,y"; easing.type: "InOutQuad" } }
+    Transition { PropertyAnimation { properties: "x,y"; easing.type: Easing.InOutQuad } }
     \endqml
     \o In a Behavior
 
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 90344ab..ba90007 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -82,7 +82,7 @@ public:
         y: 200  // initial value
         Behavior on y {
             NumberAnimation {
-                easing.type: "OutBounce"
+                easing.type: Easing.OutBounce
                 easing.amplitude: 100
                 duration: 200
             }
diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp
index 70077f3..aae66ac 100644
--- a/src/declarative/util/qdeclarativespringfollow.cpp
+++ b/src/declarative/util/qdeclarativespringfollow.cpp
@@ -227,7 +227,7 @@ void QDeclarativeSpringFollowPrivate::stop()
             loops: Animation.Infinite
             NumberAnimation {
                 to: 200
-                easing.type: "OutBounce"
+                easing.type: Easing.OutBounce
                 easing.amplitude: 100
                 duration: 2000
             }
-- 
cgit v0.12


From ab030e931e05a060b4f6fabf4235f05aeb0c252c Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 5 May 2010 16:39:05 +1000
Subject: Fix cacheBuffer documentation.

Task-number: QTBUG-10385
---
 .../graphicsitems/qdeclarativegridview.cpp           | 20 ++++++++++++++------
 .../graphicsitems/qdeclarativelistview.cpp           | 18 +++++++++++++-----
 src/declarative/util/qdeclarativeanimation.cpp       |  2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 4c72482..528cb22 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1405,12 +1405,20 @@ void QDeclarativeGridView::setWrapEnabled(bool wrap)
 }
 
 /*!
-  \qmlproperty int GridView::cacheBuffer
-  This property holds the number of off-screen pixels to cache.
-
-  This property determines the number of pixels above the top of the view
-  and below the bottom of the view to cache.  Setting this value can make
-  scrolling the view smoother at the expense of additional memory usage.
+    \qmlproperty int GridView::cacheBuffer
+    This property determines whether delegates are retained outside the
+    visible area of the view.
+
+    If non-zero the view will keep as many delegates
+    instantiated as will fit within the buffer specified.  For example,
+    if in a vertical view the delegate is 20 pixels high and \c cacheBuffer is
+    set to 40, then up to 2 delegates above and 2 delegates below the visible
+    area may be retained.
+
+    Setting this value can make scrolling the list smoother at the expense
+    of additional memory usage.  It is not a substitute for creating efficient
+    delegates; the fewer elements in a delegate, the faster a view may be
+    scrolled.
 */
 int QDeclarativeGridView::cacheBuffer() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 3877fab..75cf547 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1839,11 +1839,19 @@ void QDeclarativeListView::setWrapEnabled(bool wrap)
 
 /*!
     \qmlproperty int ListView::cacheBuffer
-    This property holds the number of off-screen pixels to cache.
-
-    This property determines the number of pixels above the top of the list
-    and below the bottom of the list to cache.  Setting this value can make
-    scrolling the list smoother at the expense of additional memory usage.
+    This property determines whether delegates are retained outside the
+    visible area of the view.
+
+    If non-zero the view will keep as many delegates
+    instantiated as will fit within the buffer specified.  For example,
+    if in a vertical view the delegate is 20 pixels high and \c cacheBuffer is
+    set to 40, then up to 2 delegates above and 2 delegates below the visible
+    area may be retained.
+
+    Setting this value can make scrolling the list smoother at the expense
+    of additional memory usage.  It is not a substitute for creating efficient
+    delegates; the fewer elements in a delegate, the faster a view may be
+    scrolled.
 */
 int QDeclarativeListView::cacheBuffer() const
 {
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 9f95348..5b2954b 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -874,7 +874,7 @@ void QDeclarativePropertyActionPrivate::init()
     This property holds an explicit target object to animate.
 
     The exact effect of the \c target property depends on how the animation
-    is being used.  Refer to the \l animation documentation for details.
+    is being used.  Refer to the \l {QML Animation} documentation for details.
 */
 
 QObject *QDeclarativePropertyAction::target() const
-- 
cgit v0.12


From 238ed995be8f32e815ffb6883144d0547355a8eb Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Tue, 4 May 2010 14:14:46 +0200
Subject: Move Qt.widgets import to be an unsupported example

Layout examples for QML are also cleaned up a bit.
Layouts test removed, and LayoutItem test added, to clarify what we
support.

Reviewed-by: Michael Brasser
---
 examples/declarative/layouts/Button.qml            |  22 --
 examples/declarative/layouts/add.png               | Bin 1577 -> 0 bytes
 examples/declarative/layouts/del.png               | Bin 1661 -> 0 bytes
 .../layouts/graphicsLayouts/graphicslayouts.cpp    | 366 +++++++++++++++++++++
 .../layouts/graphicsLayouts/graphicslayouts.pro    |  13 +
 .../layouts/graphicsLayouts/graphicslayouts.qml    |  77 +++++
 .../layouts/graphicsLayouts/graphicslayouts.qrc    |   5 +
 .../layouts/graphicsLayouts/graphicslayouts_p.h    | 303 +++++++++++++++++
 .../declarative/layouts/graphicsLayouts/main.cpp   |  60 ++++
 .../declarative/layouts/layoutItem/layoutItem.pro  |  13 +
 .../declarative/layouts/layoutItem/layoutItem.qml  |  16 +
 .../declarative/layouts/layoutItem/layoutItem.qrc  |   5 +
 examples/declarative/layouts/layoutItem/main.cpp   |  73 ++++
 examples/declarative/layouts/layouts.qml           |  29 --
 examples/declarative/layouts/layouts.qmlproject    |  16 -
 examples/declarative/layouts/positioners.qml       | 213 ------------
 .../declarative/layouts/positioners/Button.qml     |  22 ++
 examples/declarative/layouts/positioners/add.png   | Bin 0 -> 1577 bytes
 examples/declarative/layouts/positioners/del.png   | Bin 0 -> 1661 bytes
 .../layouts/positioners/positioners.qml            | 213 ++++++++++++
 .../layouts/positioners/positioners.qmlproject     |  18 +
 .../positioners/positioners.qmlproject.user        |  41 +++
 src/imports/imports.pro                            |   2 +-
 src/imports/widgets/graphicslayouts.cpp            | 366 ---------------------
 src/imports/widgets/graphicslayouts_p.h            | 303 -----------------
 src/imports/widgets/qmldir                         |   1 -
 src/imports/widgets/widgets.cpp                    |  71 ----
 src/imports/widgets/widgets.pro                    |  30 --
 .../qdeclarativelayoutitem/data/layoutItem.qml     |   9 +
 .../qdeclarativelayoutitem.pro                     |   8 +
 .../tst_qdeclarativelayoutitem.cpp                 | 115 +++++++
 .../qdeclarativelayouts/data/layouts.qml           |  31 --
 .../qdeclarativelayouts/qdeclarativelayouts.pro    |  10 -
 .../tst_qdeclarativelayouts.cpp                    | 147 ---------
 34 files changed, 1358 insertions(+), 1240 deletions(-)
 delete mode 100644 examples/declarative/layouts/Button.qml
 delete mode 100644 examples/declarative/layouts/add.png
 delete mode 100644 examples/declarative/layouts/del.png
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
 create mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
 create mode 100644 examples/declarative/layouts/graphicsLayouts/main.cpp
 create mode 100644 examples/declarative/layouts/layoutItem/layoutItem.pro
 create mode 100644 examples/declarative/layouts/layoutItem/layoutItem.qml
 create mode 100644 examples/declarative/layouts/layoutItem/layoutItem.qrc
 create mode 100644 examples/declarative/layouts/layoutItem/main.cpp
 delete mode 100644 examples/declarative/layouts/layouts.qml
 delete mode 100644 examples/declarative/layouts/layouts.qmlproject
 delete mode 100644 examples/declarative/layouts/positioners.qml
 create mode 100644 examples/declarative/layouts/positioners/Button.qml
 create mode 100644 examples/declarative/layouts/positioners/add.png
 create mode 100644 examples/declarative/layouts/positioners/del.png
 create mode 100644 examples/declarative/layouts/positioners/positioners.qml
 create mode 100644 examples/declarative/layouts/positioners/positioners.qmlproject
 create mode 100644 examples/declarative/layouts/positioners/positioners.qmlproject.user
 delete mode 100644 src/imports/widgets/graphicslayouts.cpp
 delete mode 100644 src/imports/widgets/graphicslayouts_p.h
 delete mode 100644 src/imports/widgets/qmldir
 delete mode 100644 src/imports/widgets/widgets.cpp
 delete mode 100644 src/imports/widgets/widgets.pro
 create mode 100644 tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
 create mode 100644 tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
 create mode 100644 tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
 delete mode 100644 tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
 delete mode 100644 tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
 delete mode 100644 tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp

diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
deleted file mode 100644
index 0f08893..0000000
--- a/examples/declarative/layouts/Button.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.7
-
-Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
-    property string text
-    property string icon
-    signal clicked
-
-    Image { id: pix; x: 5; y:5; source: parent.icon}
-    Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
-    MouseArea{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
-
-    states:
-        State{ name:"pressed"; when:mr.pressed
-            PropertyChanges {target:textelement; x: 5}
-            PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
-        }
-
-    transitions:
-        Transition{
-            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
-        }
-}
diff --git a/examples/declarative/layouts/add.png b/examples/declarative/layouts/add.png
deleted file mode 100644
index f29d84b..0000000
Binary files a/examples/declarative/layouts/add.png and /dev/null differ
diff --git a/examples/declarative/layouts/del.png b/examples/declarative/layouts/del.png
deleted file mode 100644
index 1d753a3..0000000
Binary files a/examples/declarative/layouts/del.png and /dev/null differ
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
new file mode 100644
index 0000000..25cf994
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
@@ -0,0 +1,366 @@
+/****************************************************************************
+**
+** 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 "graphicslayouts_p.h"
+
+#include 
+#include 
+
+QT_BEGIN_NAMESPACE
+
+LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
+: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
+{
+}
+
+void LinearLayoutAttached::setStretchFactor(int f)
+{
+    if (_stretch == f)
+        return;
+
+    _stretch = f;
+    emit stretchChanged(reinterpret_cast(parent()), _stretch);
+}
+
+void LinearLayoutAttached::setSpacing(int s)
+{
+    if (_spacing == s)
+        return;
+
+    _spacing = s;
+    emit spacingChanged(reinterpret_cast(parent()), _spacing);
+}
+
+void LinearLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
+}
+
+QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+Q_UNUSED(which);
+Q_UNUSED(constraint);
+return QSizeF();
+}
+
+
+QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+{
+}
+
+void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+{
+insertItem(index, item);
+
+//connect attached properties
+if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
+    setStretchFactor(item, obj->stretchFactor());
+    setAlignment(item, obj->alignment());
+    updateSpacing(item, obj->spacing());
+    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsLinearLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsLinearLayoutObject::contentsMargin() const
+{
+    qreal a,b,c,d;
+    getContentsMargins(&a, &b, &c, &d);
+    if(a==b && a==c && a==d)
+        return a;
+    return -1;
+}
+
+void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m,m,m,m);
+}
+
+void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+{
+QGraphicsLinearLayout::setStretchFactor(item, stretch);
+}
+
+void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
+{
+    for(int i=0; i < count(); i++){
+        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
+            QGraphicsLinearLayout::setItemSpacing(i, spacing);
+            return;
+        }
+    }
+}
+
+void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsLinearLayout::setAlignment(item, alignment);
+}
+
+QHash QGraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast(obj))
+    return 0;
+LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
+attachedProperties.insert(qobject_cast(obj), rv);
+return rv;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// QGraphicsGridLayout-related classes
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+GridLayoutAttached::GridLayoutAttached(QObject *parent)
+: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
+    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
+    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
+{
+}
+
+void GridLayoutAttached::setRow(int r)
+{
+    if (_row == r)
+        return;
+
+    _row = r;
+    //emit rowChanged(reinterpret_cast(parent()), _row);
+}
+
+void GridLayoutAttached::setColumn(int c)
+{
+    if (_column == c)
+        return;
+
+    _column = c;
+    //emit columnChanged(reinterpret_cast(parent()), _column);
+}
+
+void GridLayoutAttached::setRowSpan(int rs)
+{
+    if (_rowspan == rs)
+        return;
+
+    _rowspan = rs;
+    //emit rowSpanChanged(reinterpret_cast(parent()), _rowSpan);
+}
+
+void GridLayoutAttached::setColumnSpan(int cs)
+{
+    if (_colspan == cs)
+        return;
+
+    _colspan = cs;
+    //emit columnSpanChanged(reinterpret_cast(parent()), _columnSpan);
+}
+
+void GridLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
+}
+
+void GridLayoutAttached::setRowStretchFactor(int f)
+{
+    _rowstretch = f;
+}
+
+void GridLayoutAttached::setColumnStretchFactor(int f)
+{
+    _colstretch = f;
+}
+
+void GridLayoutAttached::setRowSpacing(int s)
+{
+    _rowspacing = s;
+}
+
+void GridLayoutAttached::setColumnSpacing(int s)
+{
+    _colspacing = s;
+}
+
+
+QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+{
+}
+
+void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
+{
+//use attached properties
+if (QObject *obj = attachedProperties.value(qobject_cast(wid))) {
+    int row = static_cast(obj)->row();
+    int column = static_cast(obj)->column();
+    int rowSpan = static_cast(obj)->rowSpan();
+    int columnSpan = static_cast(obj)->columnSpan();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(wid, row, column, rowSpan, columnSpan);
+}
+}
+
+void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+{
+//use attached properties
+if (GridLayoutAttached *obj = attachedProperties.value(item)) {
+    int row = obj->row();
+    int column = obj->column();
+    int rowSpan = obj->rowSpan();
+    int columnSpan = obj->columnSpan();
+    Qt::Alignment alignment = obj->alignment();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    if(obj->rowSpacing() != -1)
+        setRowSpacing(row, obj->rowSpacing());
+    if(obj->columnSpacing() != -1)
+        setColumnSpacing(column, obj->columnSpacing());
+    if(obj->rowStretchFactor() != -1)
+        setRowStretchFactor(row, obj->rowStretchFactor());
+    if(obj->columnStretchFactor() != -1)
+        setColumnStretchFactor(column, obj->columnStretchFactor());
+    if(obj->rowPreferredHeight() != -1)
+        setRowPreferredHeight(row, obj->rowPreferredHeight());
+    if(obj->rowMaximumHeight() != -1)
+        setRowMaximumHeight(row, obj->rowMaximumHeight());
+    if(obj->rowMinimumHeight() != -1)
+        setRowMinimumHeight(row, obj->rowMinimumHeight());
+    if(obj->rowFixedHeight() != -1)
+        setRowFixedHeight(row, obj->rowFixedHeight());
+    if(obj->columnPreferredWidth() != -1)
+        setColumnPreferredWidth(row, obj->columnPreferredWidth());
+    if(obj->columnMaximumWidth() != -1)
+        setColumnMaximumWidth(row, obj->columnMaximumWidth());
+    if(obj->columnMinimumWidth() != -1)
+        setColumnMinimumWidth(row, obj->columnMinimumWidth());
+    if(obj->columnFixedWidth() != -1)
+        setColumnFixedWidth(row, obj->columnFixedWidth());
+    addItem(item, row, column, rowSpan, columnSpan);
+    if (alignment != -1)
+        setAlignment(item,alignment);
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsGridLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsGridLayoutObject::spacing() const
+{
+if (verticalSpacing() == horizontalSpacing())
+    return verticalSpacing();
+return -1;  //###
+}
+
+qreal QGraphicsGridLayoutObject::contentsMargin() const
+{
+    qreal a,b,c,d;
+    getContentsMargins(&a, &b, &c, &d);
+    if(a==b && a==c && a==d)
+        return a;
+    return -1;
+}
+
+void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m,m,m,m);
+}
+
+
+void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsGridLayout::setAlignment(item, alignment);
+}
+
+QHash QGraphicsGridLayoutObject::attachedProperties;
+GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast(obj))
+    return 0;
+GridLayoutAttached *rv = new GridLayoutAttached(obj);
+attachedProperties.insert(qobject_cast(obj), rv);
+return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
new file mode 100644
index 0000000..e5d91b2
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET  = graphicslayouts
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    main.cpp
+
+HEADERS += \
+    graphicslayouts_p.h
+
+RESOURCES += \
+    graphicslayouts.qrc
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
new file mode 100644
index 0000000..fcd78d5
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
@@ -0,0 +1,77 @@
+import Qt 4.7
+import GraphicsLayouts 4.7
+
+Item {
+    id: resizable
+
+    width: 800
+    height: 400
+
+    QGraphicsWidget {
+        size.width: parent.width/2
+        size.height: parent.height
+
+        layout: QGraphicsLinearLayout {
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+        }
+    }
+    QGraphicsWidget {
+        x: parent.width/2
+        size.width: parent.width/2
+        size.height: parent.height
+
+        layout: QGraphicsGridLayout {
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "red"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "100x100"
+                Rectangle { color: "orange"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 2
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "200x200"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "blue"; anchors.fill: parent }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
new file mode 100644
index 0000000..a199f8d
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
@@ -0,0 +1,5 @@
+
+
+    graphicslayouts.qml
+
+
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h b/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
new file mode 100644
index 0000000..ea9c614
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
@@ -0,0 +1,303 @@
+/****************************************************************************
+**
+** 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 GRAPHICSLAYOUTS_H
+#define GRAPHICSLAYOUTS_H
+
+#include 
+#include 
+#include 
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+public:
+    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+
+    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
+};
+
+class LinearLayoutAttached;
+class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty children READ children)
+    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsLinearLayoutObject(QObject * = 0);
+    ~QGraphicsLinearLayoutObject();
+
+    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+private Q_SLOTS:
+    void updateStretch(QGraphicsLayoutItem*,int);
+    void updateSpacing(QGraphicsLayoutItem*,int);
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class LinearLayoutAttached;
+    void clearChildren();
+    void insertLayoutItem(int, QGraphicsLayoutItem *);
+    static QHash attachedProperties;
+
+    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
+        static_cast(prop->object)->insertLayoutItem(-1, item);
+    }
+
+    static void children_clear(QDeclarativeListProperty *prop) {
+        static_cast(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty *prop) {
+        return static_cast(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
+        return static_cast(prop->object)->itemAt(index);
+    }
+};
+
+class GridLayoutAttached;
+class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty children READ children)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
+    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsGridLayoutObject(QObject * = 0);
+    ~QGraphicsGridLayoutObject();
+
+    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
+
+    qreal spacing() const;
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+    static GridLayoutAttached *qmlAttachedProperties(QObject *);
+
+private Q_SLOTS:
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class GraphicsLayoutAttached;
+    void addWidget(QGraphicsWidget *);
+    void clearChildren();
+    void addLayoutItem(QGraphicsLayoutItem *);
+    static QHash attachedProperties;
+
+    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
+        static_cast(prop->object)->addLayoutItem(item);
+    }
+
+    static void children_clear(QDeclarativeListProperty *prop) {
+        static_cast(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty *prop) {
+        return static_cast(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
+        return static_cast(prop->object)->itemAt(index);
+    }
+};
+
+class LinearLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+public:
+    LinearLayoutAttached(QObject *parent);
+
+    int stretchFactor() const { return _stretch; }
+    void setStretchFactor(int f);
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+    int spacing() const { return _spacing; }
+    void setSpacing(int s);
+
+Q_SIGNALS:
+    void stretchChanged(QGraphicsLayoutItem*,int);
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+    void spacingChanged(QGraphicsLayoutItem*,int);
+
+private:
+    int _stretch;
+    Qt::Alignment _alignment;
+    int _spacing;
+};
+
+class GridLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int row READ row WRITE setRow)
+    Q_PROPERTY(int column READ column WRITE setColumn)
+    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
+    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
+    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
+    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
+    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
+    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
+    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
+    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
+    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
+    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
+    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
+    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
+    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
+
+public:
+    GridLayoutAttached(QObject *parent);
+
+    int row() const { return _row; }
+    void setRow(int r);
+
+    int column() const { return _column; }
+    void setColumn(int c);
+
+    int rowSpan() const { return _rowspan; }
+    void setRowSpan(int rs);
+
+    int columnSpan() const { return _colspan; }
+    void setColumnSpan(int cs);
+
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+    int rowStretchFactor() const { return _rowstretch; }
+    void setRowStretchFactor(int f);
+    int columnStretchFactor() const { return _colstretch; }
+    void setColumnStretchFactor(int f);
+
+    int rowSpacing() const { return _rowspacing; }
+    void setRowSpacing(int s);
+    int columnSpacing() const { return _colspacing; }
+    void setColumnSpacing(int s);
+
+    int rowPreferredHeight() const { return _rowprefheight; }
+    void setRowPreferredHeight(int s) { _rowprefheight = s; }
+
+    int rowMaximumHeight() const { return _rowmaxheight; }
+    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
+
+    int rowMinimumHeight() const { return _rowminheight; }
+    void setRowMinimumHeight(int s) { _rowminheight = s; }
+
+    int rowFixedHeight() const { return _rowfixheight; }
+    void setRowFixedHeight(int s) { _rowfixheight = s; }
+
+    int columnPreferredWidth() const { return _colprefwidth; }
+    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
+
+    int columnMaximumWidth() const { return _colmaxwidth; }
+    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
+
+    int columnMinimumWidth() const { return _colminwidth; }
+    void setColumnMinimumWidth(int s) { _colminwidth = s; }
+
+    int columnFixedWidth() const { return _colfixwidth; }
+    void setColumnFixedWidth(int s) { _colfixwidth = s; }
+
+Q_SIGNALS:
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    int _row;
+    int _column;
+    int _rowspan;
+    int _colspan;
+    Qt::Alignment _alignment;
+    int _rowstretch;
+    int _colstretch;
+    int _rowspacing;
+    int _colspacing;
+    int _rowprefheight;
+    int _rowmaxheight;
+    int _rowminheight;
+    int _rowfixheight;
+    int _colprefwidth;
+    int _colmaxwidth;
+    int _colminwidth;
+    int _colfixwidth;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // GRAPHICSLAYOUTS_H
diff --git a/examples/declarative/layouts/graphicsLayouts/main.cpp b/examples/declarative/layouts/graphicsLayouts/main.cpp
new file mode 100644
index 0000000..89b69bf
--- /dev/null
+++ b/examples/declarative/layouts/graphicsLayouts/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 
+#include 
+#include "graphicslayouts_p.h"
+#include 
+
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+    QDeclarativeView view;
+    qmlRegisterInterface("QGraphicsLayoutItem");
+    qmlRegisterInterface("QGraphicsLayout");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayout");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsGridLayout");
+    view.setSource(QUrl(":graphicslayouts.qml"));
+    view.show();
+    return app.exec();
+};
+
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.pro b/examples/declarative/layouts/layoutItem/layoutItem.pro
new file mode 100644
index 0000000..4a3fc73
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/layoutItem.pro
@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue May 4 13:36:26 2010
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp
+RESOURCES += layoutItem.qrc
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qml b/examples/declarative/layouts/layoutItem/layoutItem.qml
new file mode 100644
index 0000000..9b9db22
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/layoutItem.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+import Qt.widgets 4.7
+
+LayoutItem {//Sized by the layout
+    id: resizable
+    minimumSize: "100x100"
+    maximumSize: "300x300"
+    preferredSize: "100x100"
+    Rectangle { color: "yellow"; anchors.fill: parent }
+    Rectangle { 
+        width: 100; height: 100; 
+        anchors.top: parent.top; 
+        anchors.right: parent.right;
+        color: "green"; 
+    }
+}
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qrc b/examples/declarative/layouts/layoutItem/layoutItem.qrc
new file mode 100644
index 0000000..deb0fba
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/layoutItem.qrc
@@ -0,0 +1,5 @@
+
+
+    layoutItem.qml
+
+
diff --git a/examples/declarative/layouts/layoutItem/main.cpp b/examples/declarative/layouts/layoutItem/main.cpp
new file mode 100644
index 0000000..a104251
--- /dev/null
+++ b/examples/declarative/layouts/layoutItem/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* This example demonstrates using a LayoutItem to let QML snippets integrate
+   nicely with existing QGraphicsView applications designed with GraphicsLayouts
+*/
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+    //Set up a graphics scene with a QGraphicsWidget and Layout
+    QGraphicsView view;
+    QGraphicsScene scene;
+    QGraphicsWidget *widget = new QGraphicsWidget();
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    widget->setLayout(layout);
+    scene.addItem(widget);
+    view.setScene(&scene);
+    //Add the QML snippet into the layout
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl(":layoutItem.qml"));
+    QGraphicsLayoutItem* obj = qobject_cast(c.create());
+    layout->addItem(obj);
+
+    widget->setGeometry(QRectF(0,0, 400,400));
+    view.show();
+    return app.exec();
+}
diff --git a/examples/declarative/layouts/layouts.qml b/examples/declarative/layouts/layouts.qml
deleted file mode 100644
index 391eab7..0000000
--- a/examples/declarative/layouts/layouts.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.7
-import Qt.widgets 4.7
-
-Item {
-    id: resizable
-
-    width: 400
-    height: 400
-
-    QGraphicsWidget {
-        size.width: parent.width
-        size.height: parent.height
-
-        layout: QGraphicsLinearLayout {
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/layouts/layouts.qmlproject b/examples/declarative/layouts/layouts.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/layouts/layouts.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
deleted file mode 100644
index 3703b59..0000000
--- a/examples/declarative/layouts/positioners.qml
+++ /dev/null
@@ -1,213 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-    width: 420; height: 420
-
-    Column {
-        id: layout1
-        y: 0
-        move: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutBounce" }
-        }
-        add: Transition {
-            NumberAnimation { properties: "y"; easing.type: "OutQuad" }
-        }
-
-        Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueV1
-            width: 100; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueV2
-            width: 100; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
-    }
-
-    Row {
-        id: layout2
-        y: 300 
-        move: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutBounce" }
-        }
-        add: Transition {
-            NumberAnimation { properties: "x"; easing.type: "OutQuad" }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueH1
-            width: 50; height: 100
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueH2
-            width: 50; height: 100
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
-    }
-
-    Button {
-        x: 135; y: 90
-        text: "Remove"
-        icon: "del.png"
-
-        onClicked: {
-            blueH2.opacity = 0
-            blueH1.opacity = 0
-            blueV1.opacity = 0
-            blueV2.opacity = 0
-            blueG1.opacity = 0
-            blueG2.opacity = 0
-            blueG3.opacity = 0
-            blueF1.opacity = 0
-            blueF2.opacity = 0
-            blueF3.opacity = 0
-        }
-    }
-
-    Button {
-        x: 145; y: 140
-        text: "Add"
-        icon: "add.png"
-
-        onClicked: {
-            blueH2.opacity = 1
-            blueH1.opacity = 1
-            blueV1.opacity = 1
-            blueV2.opacity = 1
-            blueG1.opacity = 1
-            blueG2.opacity = 1
-            blueG3.opacity = 1
-            blueF1.opacity = 1
-            blueF2.opacity = 1
-            blueF3.opacity = 1
-        }
-    }
-
-    Grid {
-        x: 260; y: 0
-        columns: 3
-
-        move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG1
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG2
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG3
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-    }
-
-    Flow {
-        id: layout4
-        x: 260; y: 250; width: 150
-
-        move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueF1
-            width: 60; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 30; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueF2
-            width: 60; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle { 
-            id: blueF3
-            width: 40; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
-    }
-
-}
diff --git a/examples/declarative/layouts/positioners/Button.qml b/examples/declarative/layouts/positioners/Button.qml
new file mode 100644
index 0000000..0f08893
--- /dev/null
+++ b/examples/declarative/layouts/positioners/Button.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+
+Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.width + textelement.width + 13; height: pix.height + 10; id: page
+    property string text
+    property string icon
+    signal clicked
+
+    Image { id: pix; x: 5; y:5; source: parent.icon}
+    Text { id: textelement; text: page.text; color: "white"; x:pix.width+pix.x+3; anchors.verticalCenter: pix.verticalCenter;}
+    MouseArea{ id:mr; anchors.fill: parent; onClicked: {parent.focus = true; page.clicked()}}
+
+    states:
+        State{ name:"pressed"; when:mr.pressed
+            PropertyChanges {target:textelement; x: 5}
+            PropertyChanges {target:pix; x:textelement.x+textelement.width + 3}
+        }
+
+    transitions:
+        Transition{
+            NumberAnimation { properties:"x,left"; easing.type:"InOutQuad"; duration:200 }
+        }
+}
diff --git a/examples/declarative/layouts/positioners/add.png b/examples/declarative/layouts/positioners/add.png
new file mode 100644
index 0000000..f29d84b
Binary files /dev/null and b/examples/declarative/layouts/positioners/add.png differ
diff --git a/examples/declarative/layouts/positioners/del.png b/examples/declarative/layouts/positioners/del.png
new file mode 100644
index 0000000..1d753a3
Binary files /dev/null and b/examples/declarative/layouts/positioners/del.png differ
diff --git a/examples/declarative/layouts/positioners/positioners.qml b/examples/declarative/layouts/positioners/positioners.qml
new file mode 100644
index 0000000..3703b59
--- /dev/null
+++ b/examples/declarative/layouts/positioners/positioners.qml
@@ -0,0 +1,213 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    width: 420; height: 420
+
+    Column {
+        id: layout1
+        y: 0
+        move: Transition {
+            NumberAnimation { properties: "y"; easing.type: "OutBounce" }
+        }
+        add: Transition {
+            NumberAnimation { properties: "y"; easing.type: "OutQuad" }
+        }
+
+        Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueV1
+            width: 100; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueV2
+            width: 100; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
+    }
+
+    Row {
+        id: layout2
+        y: 300 
+        move: Transition {
+            NumberAnimation { properties: "x"; easing.type: "OutBounce" }
+        }
+        add: Transition {
+            NumberAnimation { properties: "x"; easing.type: "OutQuad" }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueH1
+            width: 50; height: 100
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueH2
+            width: 50; height: 100
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
+    }
+
+    Button {
+        x: 135; y: 90
+        text: "Remove"
+        icon: "del.png"
+
+        onClicked: {
+            blueH2.opacity = 0
+            blueH1.opacity = 0
+            blueV1.opacity = 0
+            blueV2.opacity = 0
+            blueG1.opacity = 0
+            blueG2.opacity = 0
+            blueG3.opacity = 0
+            blueF1.opacity = 0
+            blueF2.opacity = 0
+            blueF3.opacity = 0
+        }
+    }
+
+    Button {
+        x: 145; y: 140
+        text: "Add"
+        icon: "add.png"
+
+        onClicked: {
+            blueH2.opacity = 1
+            blueH1.opacity = 1
+            blueV1.opacity = 1
+            blueV2.opacity = 1
+            blueG1.opacity = 1
+            blueG2.opacity = 1
+            blueG3.opacity = 1
+            blueF1.opacity = 1
+            blueF2.opacity = 1
+            blueF3.opacity = 1
+        }
+    }
+
+    Grid {
+        x: 260; y: 0
+        columns: 3
+
+        move: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        add: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG1
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG2
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG3
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+    }
+
+    Flow {
+        id: layout4
+        x: 260; y: 250; width: 150
+
+        move: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        add: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: "OutBounce" }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueF1
+            width: 60; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 30; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueF2
+            width: 60; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle { 
+            id: blueF3
+            width: 40; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
+    }
+
+}
diff --git a/examples/declarative/layouts/positioners/positioners.qmlproject b/examples/declarative/layouts/positioners/positioners.qmlproject
new file mode 100644
index 0000000..e526217
--- /dev/null
+++ b/examples/declarative/layouts/positioners/positioners.qmlproject
@@ -0,0 +1,18 @@
+/* File generated by QtCreator */
+
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/layouts/positioners/positioners.qmlproject.user b/examples/declarative/layouts/positioners/positioners.qmlproject.user
new file mode 100644
index 0000000..593479d
--- /dev/null
+++ b/examples/declarative/layouts/positioners/positioners.qmlproject.user
@@ -0,0 +1,41 @@
+
+
+ 
+  ProjectExplorer.Project.ActiveTarget
+  0
+ 
+ 
+  ProjectExplorer.Project.EditorSettings
+  
+   UTF-8
+  
+ 
+ 
+  ProjectExplorer.Project.Target.0
+  
+   QML Runtime
+   QmlProjectManager.QmlTarget
+   -1
+   0
+   0
+   
+    QML Runtime
+    QmlProjectManager.QmlRunConfiguration
+    127.0.0.1
+    3768
+    positioners.qml
+    
+    
+   
+   1
+  
+ 
+ 
+  ProjectExplorer.Project.TargetCount
+  1
+ 
+ 
+  ProjectExplorer.Project.Updater.FileVersion
+  4
+ 
+
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index ecde0cc..1754908 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS += widgets particles
+SUBDIRS += particles
 
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
 contains(QT_CONFIG, mediaservices): SUBDIRS += multimedia
diff --git a/src/imports/widgets/graphicslayouts.cpp b/src/imports/widgets/graphicslayouts.cpp
deleted file mode 100644
index 25cf994..0000000
--- a/src/imports/widgets/graphicslayouts.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 "graphicslayouts_p.h"
-
-#include 
-#include 
-
-QT_BEGIN_NAMESPACE
-
-LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
-{
-}
-
-void LinearLayoutAttached::setStretchFactor(int f)
-{
-    if (_stretch == f)
-        return;
-
-    _stretch = f;
-    emit stretchChanged(reinterpret_cast(parent()), _stretch);
-}
-
-void LinearLayoutAttached::setSpacing(int s)
-{
-    if (_spacing == s)
-        return;
-
-    _spacing = s;
-    emit spacingChanged(reinterpret_cast(parent()), _spacing);
-}
-
-void LinearLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
-}
-
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-Q_UNUSED(which);
-Q_UNUSED(constraint);
-return QSizeF();
-}
-
-
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
-{
-}
-
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-insertItem(index, item);
-
-//connect attached properties
-if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-    setStretchFactor(item, obj->stretchFactor());
-    setAlignment(item, obj->alignment());
-    updateSpacing(item, obj->spacing());
-    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsLinearLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsLinearLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
-{
-    for(int i=0; i < count(); i++){
-        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
-            QGraphicsLinearLayout::setItemSpacing(i, spacing);
-            return;
-        }
-    }
-}
-
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast(obj))
-    return 0;
-LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-attachedProperties.insert(qobject_cast(obj), rv);
-return rv;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// QGraphicsGridLayout-related classes
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-GridLayoutAttached::GridLayoutAttached(QObject *parent)
-: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
-    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
-    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
-{
-}
-
-void GridLayoutAttached::setRow(int r)
-{
-    if (_row == r)
-        return;
-
-    _row = r;
-    //emit rowChanged(reinterpret_cast(parent()), _row);
-}
-
-void GridLayoutAttached::setColumn(int c)
-{
-    if (_column == c)
-        return;
-
-    _column = c;
-    //emit columnChanged(reinterpret_cast(parent()), _column);
-}
-
-void GridLayoutAttached::setRowSpan(int rs)
-{
-    if (_rowspan == rs)
-        return;
-
-    _rowspan = rs;
-    //emit rowSpanChanged(reinterpret_cast(parent()), _rowSpan);
-}
-
-void GridLayoutAttached::setColumnSpan(int cs)
-{
-    if (_colspan == cs)
-        return;
-
-    _colspan = cs;
-    //emit columnSpanChanged(reinterpret_cast(parent()), _columnSpan);
-}
-
-void GridLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
-}
-
-void GridLayoutAttached::setRowStretchFactor(int f)
-{
-    _rowstretch = f;
-}
-
-void GridLayoutAttached::setColumnStretchFactor(int f)
-{
-    _colstretch = f;
-}
-
-void GridLayoutAttached::setRowSpacing(int s)
-{
-    _rowspacing = s;
-}
-
-void GridLayoutAttached::setColumnSpacing(int s)
-{
-    _colspacing = s;
-}
-
-
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
-{
-}
-
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
-{
-//use attached properties
-if (QObject *obj = attachedProperties.value(qobject_cast(wid))) {
-    int row = static_cast(obj)->row();
-    int column = static_cast(obj)->column();
-    int rowSpan = static_cast(obj)->rowSpan();
-    int columnSpan = static_cast(obj)->columnSpan();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    addItem(wid, row, column, rowSpan, columnSpan);
-}
-}
-
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-//use attached properties
-if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-    int row = obj->row();
-    int column = obj->column();
-    int rowSpan = obj->rowSpan();
-    int columnSpan = obj->columnSpan();
-    Qt::Alignment alignment = obj->alignment();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    if(obj->rowSpacing() != -1)
-        setRowSpacing(row, obj->rowSpacing());
-    if(obj->columnSpacing() != -1)
-        setColumnSpacing(column, obj->columnSpacing());
-    if(obj->rowStretchFactor() != -1)
-        setRowStretchFactor(row, obj->rowStretchFactor());
-    if(obj->columnStretchFactor() != -1)
-        setColumnStretchFactor(column, obj->columnStretchFactor());
-    if(obj->rowPreferredHeight() != -1)
-        setRowPreferredHeight(row, obj->rowPreferredHeight());
-    if(obj->rowMaximumHeight() != -1)
-        setRowMaximumHeight(row, obj->rowMaximumHeight());
-    if(obj->rowMinimumHeight() != -1)
-        setRowMinimumHeight(row, obj->rowMinimumHeight());
-    if(obj->rowFixedHeight() != -1)
-        setRowFixedHeight(row, obj->rowFixedHeight());
-    if(obj->columnPreferredWidth() != -1)
-        setColumnPreferredWidth(row, obj->columnPreferredWidth());
-    if(obj->columnMaximumWidth() != -1)
-        setColumnMaximumWidth(row, obj->columnMaximumWidth());
-    if(obj->columnMinimumWidth() != -1)
-        setColumnMinimumWidth(row, obj->columnMinimumWidth());
-    if(obj->columnFixedWidth() != -1)
-        setColumnFixedWidth(row, obj->columnFixedWidth());
-    addItem(item, row, column, rowSpan, columnSpan);
-    if (alignment != -1)
-        setAlignment(item,alignment);
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsGridLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsGridLayoutObject::spacing() const
-{
-if (verticalSpacing() == horizontalSpacing())
-    return verticalSpacing();
-return -1;  //###
-}
-
-qreal QGraphicsGridLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-
-void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsGridLayout::setAlignment(item, alignment);
-}
-
-QHash QGraphicsGridLayoutObject::attachedProperties;
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast(obj))
-    return 0;
-GridLayoutAttached *rv = new GridLayoutAttached(obj);
-attachedProperties.insert(qobject_cast(obj), rv);
-return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/src/imports/widgets/graphicslayouts_p.h b/src/imports/widgets/graphicslayouts_p.h
deleted file mode 100644
index ea9c614..0000000
--- a/src/imports/widgets/graphicslayouts_p.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 GRAPHICSLAYOUTS_H
-#define GRAPHICSLAYOUTS_H
-
-#include 
-#include 
-#include 
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
-
-    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-private Q_SLOTS:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateSpacing(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-    static QHash attachedProperties;
-
-    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
-        static_cast(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QDeclarativeListProperty *prop) {
-        static_cast(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty *prop) {
-        return static_cast(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
-        return static_cast(prop->object)->itemAt(index);
-    }
-};
-
-class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
-
-    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private Q_SLOTS:
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class GraphicsLayoutAttached;
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-    static QHash attachedProperties;
-
-    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
-        static_cast(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QDeclarativeListProperty *prop) {
-        static_cast(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty *prop) {
-        return static_cast(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
-        return static_cast(prop->object)->itemAt(index);
-    }
-};
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-public:
-    LinearLayoutAttached(QObject *parent);
-
-    int stretchFactor() const { return _stretch; }
-    void setStretchFactor(int f);
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-    int spacing() const { return _spacing; }
-    void setSpacing(int s);
-
-Q_SIGNALS:
-    void stretchChanged(QGraphicsLayoutItem*,int);
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-    void spacingChanged(QGraphicsLayoutItem*,int);
-
-private:
-    int _stretch;
-    Qt::Alignment _alignment;
-    int _spacing;
-};
-
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
-    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
-    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
-    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
-    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
-    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
-    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
-    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
-    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
-    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
-    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
-    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
-
-public:
-    GridLayoutAttached(QObject *parent);
-
-    int row() const { return _row; }
-    void setRow(int r);
-
-    int column() const { return _column; }
-    void setColumn(int c);
-
-    int rowSpan() const { return _rowspan; }
-    void setRowSpan(int rs);
-
-    int columnSpan() const { return _colspan; }
-    void setColumnSpan(int cs);
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-
-    int rowStretchFactor() const { return _rowstretch; }
-    void setRowStretchFactor(int f);
-    int columnStretchFactor() const { return _colstretch; }
-    void setColumnStretchFactor(int f);
-
-    int rowSpacing() const { return _rowspacing; }
-    void setRowSpacing(int s);
-    int columnSpacing() const { return _colspacing; }
-    void setColumnSpacing(int s);
-
-    int rowPreferredHeight() const { return _rowprefheight; }
-    void setRowPreferredHeight(int s) { _rowprefheight = s; }
-
-    int rowMaximumHeight() const { return _rowmaxheight; }
-    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
-
-    int rowMinimumHeight() const { return _rowminheight; }
-    void setRowMinimumHeight(int s) { _rowminheight = s; }
-
-    int rowFixedHeight() const { return _rowfixheight; }
-    void setRowFixedHeight(int s) { _rowfixheight = s; }
-
-    int columnPreferredWidth() const { return _colprefwidth; }
-    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
-
-    int columnMaximumWidth() const { return _colmaxwidth; }
-    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
-
-    int columnMinimumWidth() const { return _colminwidth; }
-    void setColumnMinimumWidth(int s) { _colminwidth = s; }
-
-    int columnFixedWidth() const { return _colfixwidth; }
-    void setColumnFixedWidth(int s) { _colfixwidth = s; }
-
-Q_SIGNALS:
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _row;
-    int _column;
-    int _rowspan;
-    int _colspan;
-    Qt::Alignment _alignment;
-    int _rowstretch;
-    int _colstretch;
-    int _rowspacing;
-    int _colspacing;
-    int _rowprefheight;
-    int _rowmaxheight;
-    int _rowminheight;
-    int _rowfixheight;
-    int _colprefwidth;
-    int _colmaxwidth;
-    int _colminwidth;
-    int _colfixwidth;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // GRAPHICSLAYOUTS_H
diff --git a/src/imports/widgets/qmldir b/src/imports/widgets/qmldir
deleted file mode 100644
index 6f19878..0000000
--- a/src/imports/widgets/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin widgets
diff --git a/src/imports/widgets/widgets.cpp b/src/imports/widgets/widgets.cpp
deleted file mode 100644
index 20de1fe..0000000
--- a/src/imports/widgets/widgets.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 
-#include 
-#include 
-
-#include "graphicslayouts_p.h"
-#include 
-QT_BEGIN_NAMESPACE
-
-class QWidgetsQmlModule : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    virtual void registerTypes(const char *uri)
-    {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.widgets"));
-
-        qmlRegisterInterface("QGraphicsLayoutItem");
-        qmlRegisterInterface("QGraphicsLayout");
-        qmlRegisterType(uri,4,7,"QGraphicsLinearLayoutStretchItem");
-        qmlRegisterType(uri,4,7,"QGraphicsLinearLayout");
-        qmlRegisterType(uri,4,7,"QGraphicsGridLayout");
-    }
-};
-
-QT_END_NAMESPACE
-
-#include "widgets.moc"
-
-Q_EXPORT_PLUGIN2(qtwidgetsqmlmodule, QT_PREPEND_NAMESPACE(QWidgetsQmlModule));
-
diff --git a/src/imports/widgets/widgets.pro b/src/imports/widgets/widgets.pro
deleted file mode 100644
index 234ff1e..0000000
--- a/src/imports/widgets/widgets.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TARGET  = widgets
-TARGETPATH = Qt/widgets
-include(../qimportbase.pri)
-
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    widgets.cpp
-
-HEADERS += \
-    graphicslayouts_p.h
-
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
-target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-qmldir.files += $$PWD/qmldir
-qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-
-symbian:{
-    load(data_caging_paths)
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
-    
-    importFiles.sources = widgets.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-    
-    DEPLOYMENT = importFiles
-}
-
-INSTALLS += target qmldir
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
new file mode 100644
index 0000000..ee881a2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml
@@ -0,0 +1,9 @@
+import Qt 4.7
+
+LayoutItem {//Sized by the layout
+    id: resizable
+    objectName: "resizable"
+    minimumSize: "100x100"
+    maximumSize: "300x300"
+    preferredSize: "200x200"
+}
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
new file mode 100644
index 0000000..eeb784d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativelayoutitem.cpp
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
new file mode 100644
index 0000000..2207635
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "../../../shared/util.h"
+
+class tst_qdeclarativelayoutitem : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativelayoutitem();
+
+private slots:
+    void test_resizing();
+};
+
+tst_qdeclarativelayoutitem::tst_qdeclarativelayoutitem()
+{
+}
+
+void tst_qdeclarativelayoutitem::test_resizing()
+{
+    //Create Layout (must be done in C++)
+    QGraphicsView view;
+    QGraphicsScene scene;
+    QGraphicsWidget *widget = new QGraphicsWidget();
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    widget->setLayout(layout);
+    scene.addItem(widget);
+    view.setScene(&scene);
+    //Add the QML snippet into the layout
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl(SRCDIR "/data/layoutItem.qml"));
+    QDeclarativeLayoutItem* obj = static_cast(c.create());
+    layout->addItem(obj);
+    layout->setContentsMargins(0,0,0,0);
+    widget->setContentsMargins(0,0,0,0);
+    view.show();
+
+    QVERIFY(obj!= 0);
+
+    widget->setGeometry(QRectF(0,0, 400,400));
+    QCOMPARE(obj->width(), 300.0);
+    QCOMPARE(obj->height(), 300.0);
+
+    widget->setGeometry(QRectF(0,0, 300,300));
+    QCOMPARE(obj->width(), 300.0);
+    QCOMPARE(obj->height(), 300.0);
+
+    widget->setGeometry(QRectF(0,0, 200,200));
+    QCOMPARE(obj->width(), 200.0);
+    QCOMPARE(obj->height(), 200.0);
+
+    widget->setGeometry(QRectF(0,0, 100,100));
+    QCOMPARE(obj->width(), 100.0);
+    QCOMPARE(obj->height(), 100.0);
+
+    widget->setGeometry(QRectF(0,0, 40,40));
+    QCOMPARE(obj->width(), 100.0);
+    QCOMPARE(obj->height(), 100.0);
+
+    widget->setGeometry(QRectF(0,0, 412,112));
+    QCOMPARE(obj->width(), 300.0);
+    QCOMPARE(obj->height(), 112.0);
+}
+
+
+QTEST_MAIN(tst_qdeclarativelayoutitem)
+
+#include "tst_qdeclarativelayoutitem.moc"
diff --git a/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml b/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
deleted file mode 100644
index 0538738..0000000
--- a/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.7
-import Qt.widgets 4.7
-
-Item {
-    id: resizable
-    width:300
-    height:300
-    QGraphicsWidget {
-        x : resizable.x
-        y : resizable.y
-        width : resizable.width
-        height : resizable.height
-        layout: QGraphicsLinearLayout {
-            spacing: 0
-            LayoutItem {
-                objectName: "left"
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                objectName: "right"
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { objectName: "greenRect"; color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro b/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
deleted file mode 100644
index a2065f4..0000000
--- a/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qdeclarativelayouts.cpp
-macx:CONFIG -= app_bundle
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-CONFIG += parallel_test
-
diff --git a/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp b/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp
deleted file mode 100644
index 412c3b7..0000000
--- a/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-class tst_QDeclarativeLayouts : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QDeclarativeLayouts();
-
-private slots:
-    void test_qml();//GraphicsLayout set up in Qml
-    void test_cpp();//GraphicsLayout set up in C++
-
-private:
-    QDeclarativeView *createView(const QString &filename);
-};
-
-tst_QDeclarativeLayouts::tst_QDeclarativeLayouts()
-{
-}
-
-void tst_QDeclarativeLayouts::test_qml()
-{
-    QDeclarativeView *canvas = createView(SRCDIR "/data/layouts.qml");
-
-    qApp->processEvents();
-    QDeclarativeLayoutItem *left = static_cast(canvas->rootObject()->findChild("left"));
-    QVERIFY(left != 0);
-
-    QDeclarativeLayoutItem *right = static_cast(canvas->rootObject()->findChild("right"));
-    QVERIFY(right != 0);
-
-    qreal l = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
-    qreal r = QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin);
-    qreal t = QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    qreal b = QApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin);
-    QVERIFY2(l == r && r == t && t == b, "Test assumes equal margins.");
-    qreal gvMargin = l;
-
-    QDeclarativeItem *rootItem = qobject_cast(canvas->rootObject());
-    QVERIFY(rootItem != 0);
-
-    //Preferred Size
-    rootItem->setWidth(300 + 2*gvMargin);
-    rootItem->setHeight(300 + 2*gvMargin);
-
-    QCOMPARE(left->x(), gvMargin);
-    QCOMPARE(left->y(), gvMargin);
-    QCOMPARE(left->width(), 100.0);
-    QCOMPARE(left->height(), 300.0);
-
-    QCOMPARE(right->x(), 100.0 + gvMargin);
-    QCOMPARE(right->y(), 0.0 + gvMargin);
-    QCOMPARE(right->width(), 200.0);
-    QCOMPARE(right->height(), 300.0);
-
-    //Minimum Size
-    rootItem->setWidth(10+2*gvMargin);
-    rootItem->setHeight(10+2*gvMargin);
-
-    QCOMPARE(left->x(), gvMargin);
-    QCOMPARE(left->width(), 100.0);
-    QCOMPARE(left->height(), 100.0);
-
-    QCOMPARE(right->x(), 100.0 + gvMargin);
-    QCOMPARE(right->width(), 100.0);
-    QCOMPARE(right->height(), 100.0);
-
-    //Between preferred and Maximum Size
-    /*Note that if set to maximum size (or above) GraphicsLinearLayout behavior
-      is to shrink them down to preferred size. So the exact maximum size can't
-      be used*/
-    rootItem->setWidth(670 + 2*gvMargin);
-    rootItem->setHeight(300 + 2*gvMargin);
-
-    QCOMPARE(left->x(), gvMargin);
-    QCOMPARE(left->width(), 270.0);
-    QCOMPARE(left->height(), 300.0);
-
-    QCOMPARE(right->x(), 270.0 + gvMargin);
-    QCOMPARE(right->width(), 400.0);
-    QCOMPARE(right->height(), 300.0);
-
-    delete canvas;
-}
-
-void tst_QDeclarativeLayouts::test_cpp()
-{
-    //TODO: This test!
-}
-
-QDeclarativeView *tst_QDeclarativeLayouts::createView(const QString &filename)
-{
-    QDeclarativeView *canvas = new QDeclarativeView(0);
-    canvas->setSource(QUrl::fromLocalFile(filename));
-
-    return canvas;
-}
-
-
-QTEST_MAIN(tst_QDeclarativeLayouts)
-
-#include "tst_qdeclarativelayouts.moc"
-- 
cgit v0.12


From 39e992988f21553df7e839f36ced75ca5bf8588c Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Wed, 5 May 2010 18:06:20 +1000
Subject: Fix i18n example.

Add french translation to photoviewer demo.
---
 .../photoviewer/PhotoViewerCore/AlbumDelegate.qml  |   2 +-
 demos/declarative/photoviewer/i18n/base.ts         |  30 +++++++++++++++++++++
 demos/declarative/photoviewer/i18n/qml_fr.qm       | Bin 0 -> 268 bytes
 demos/declarative/photoviewer/i18n/qml_fr.ts       |  30 +++++++++++++++++++++
 demos/declarative/photoviewer/photoviewer.qml      |   6 ++---
 examples/declarative/i18n/i18n.qml                 |  30 ++++++++++++---------
 6 files changed, 81 insertions(+), 17 deletions(-)
 create mode 100644 demos/declarative/photoviewer/i18n/base.ts
 create mode 100644 demos/declarative/photoviewer/i18n/qml_fr.qm
 create mode 100644 demos/declarative/photoviewer/i18n/qml_fr.ts

diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 142735f..71d3cdc 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -56,7 +56,7 @@ Component {
 
             Tag {
                 anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: 10 }
-                frontLabel: tag; backLabel: "Delete"; flipped: mainWindow.editMode
+                frontLabel: tag; backLabel: qsTr("Remove"); flipped: mainWindow.editMode
                 onTagChanged: rssModel.tags = tag
                 onBackClicked: if (mainWindow.editMode) photosModel.remove(index);
             }
diff --git a/demos/declarative/photoviewer/i18n/base.ts b/demos/declarative/photoviewer/i18n/base.ts
new file mode 100644
index 0000000..1accfd2
--- /dev/null
+++ b/demos/declarative/photoviewer/i18n/base.ts
@@ -0,0 +1,30 @@
+
+
+
+
+    AlbumDelegate
+    
+        
+        Remove
+        
+    
+
+
+    photoviewer
+    
+        
+        Add
+        
+    
+    
+        
+        Edit
+        
+    
+    
+        
+        Back
+        
+    
+
+
diff --git a/demos/declarative/photoviewer/i18n/qml_fr.qm b/demos/declarative/photoviewer/i18n/qml_fr.qm
new file mode 100644
index 0000000..c24fcbc
Binary files /dev/null and b/demos/declarative/photoviewer/i18n/qml_fr.qm differ
diff --git a/demos/declarative/photoviewer/i18n/qml_fr.ts b/demos/declarative/photoviewer/i18n/qml_fr.ts
new file mode 100644
index 0000000..9f892db
--- /dev/null
+++ b/demos/declarative/photoviewer/i18n/qml_fr.ts
@@ -0,0 +1,30 @@
+
+
+
+
+    AlbumDelegate
+    
+        
+        Remove
+        Supprimer
+    
+
+
+    photoviewer
+    
+        
+        Add
+        Ajouter
+    
+    
+        
+        Edit
+        Éditer
+    
+    
+        
+        Back
+        Retour
+    
+
+
diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml
index 4094294..e384f46 100644
--- a/demos/declarative/photoviewer/photoviewer.qml
+++ b/demos/declarative/photoviewer/photoviewer.qml
@@ -27,7 +27,7 @@ Rectangle {
     Column {
         spacing: 20; anchors { bottom: parent.bottom; right: parent.right; rightMargin: 20; bottomMargin: 20 }
         Button {
-            id: newButton; label: "New"; rotation: 3
+            id: newButton; label: qsTr("Add"); rotation: 3
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: {
                 mainWindow.editMode = false
@@ -36,7 +36,7 @@ Rectangle {
             }
         }
         Button {
-            id: deleteButton; label: "Delete"; rotation: -2;
+            id: deleteButton; label: qsTr("Edit"); rotation: -2;
             onClicked: mainWindow.editMode = !mainWindow.editMode
             anchors.horizontalCenter: parent.horizontalCenter
         }
@@ -49,7 +49,7 @@ Rectangle {
 
     ListView { anchors.fill: parent; model: albumVisualModel.parts.browser; interactive: false }
 
-    Button { id: backButton; label: "Back"; rotation: 3; x: parent.width - backButton.width - 6; y: -backButton.height - 8 }
+    Button { id: backButton; label: qsTr("Back"); rotation: 3; x: parent.width - backButton.width - 6; y: -backButton.height - 8 }
 
     Rectangle { id: photosShade; color: 'black'; width: parent.width; height: parent.height; opacity: 0; visible: opacity != 0.0 }
 
diff --git a/examples/declarative/i18n/i18n.qml b/examples/declarative/i18n/i18n.qml
index 3b1279a..c3030b2 100644
--- a/examples/declarative/i18n/i18n.qml
+++ b/examples/declarative/i18n/i18n.qml
@@ -6,8 +6,9 @@ import Qt 4.7
 //
 // The files are created/updated by running:
 //
-//   lupdate i18n.qml -ts i18n/*.ts
+//   lupdate i18n.qml -ts i18n/base.ts
 //
+// Translations for new languages are created by copying i18n/base.ts to i18n/qml_.ts
 // The .ts files can then be edited with Linguist:
 //
 //   linguist i18n/qml_fr.ts
@@ -16,18 +17,21 @@ import Qt 4.7
 //
 //   lrelease i18n/*.ts
 //
-// Translations for new languages are created by copying i18n/base.ts to i18n/qml_.ts
-// and editing the result with Linguist.
-//
 
-Column {
-    Text {
-        text: "If a translation is available for the system language (eg. Franch) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'."
-        width: 200
-        wrapMode: Text.WordWrap
-    }
-    Text {
-        text: qsTr("Hello")
-        font.pointSize: 25
+Rectangle {
+    width: 640; height: 480
+
+    Column {
+        anchors.fill: parent; spacing: 20
+
+        Text {
+            text: "If a translation is available for the system language (eg. French) then the string below will translated (eg. 'Bonjour'). Otherwise is will show 'Hello'."
+            width: parent.width; wrapMode: Text.WordWrap
+        }
+
+        Text {
+            text: qsTr("Hello")
+            font.pointSize: 25; anchors.horizontalCenter: parent.horizontalCenter
+        }
     }
 }
-- 
cgit v0.12


From 0e5924bc207d7de29b28fb223a2027d5d2d694fa Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Wed, 5 May 2010 10:37:08 +0200
Subject: qdoc: Removed [module name] from class ref pages.

The module name is now a breadcrumb.
---
 tools/qdoc3/htmlgenerator.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 801e199..3120473 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1243,6 +1243,8 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
                      << Atom(Atom::LineBreak);
 
+#if 0
+    // No longer used because the modeule name is a breadcrumb.
     QString fixedModule = inner->moduleName();
     if (fixedModule == "Qt3SupportLight")
         fixedModule = "Qt3Support";
@@ -1263,6 +1265,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
             subtitleText << "]";
         }
     }
+#endif    
 
     generateHeader(title, inner, marker);
     sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
-- 
cgit v0.12


From a976ba471d35fd57857b05cee5fdb4d6aa64c961 Mon Sep 17 00:00:00 2001
From: Peter Hartmann 
Date: Wed, 5 May 2010 10:15:20 +0200
Subject: correct misleading note in configure on Windows

the option given in the note would not work if used as described.

Reviewed-by: Zeno Albisser
Task-number: QTBUG-2089
---
 configure.exe                    | Bin 1319424 -> 1318912 bytes
 tools/configure/configureapp.cpp |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.exe b/configure.exe
index 35116ff..161fa1d 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index bfa7445..79864f8 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3457,7 +3457,7 @@ void Configure::displayConfig()
         cout << "NOTE: When linking against OpenSSL, you can override the default" << endl;
         cout << "library names through OPENSSL_LIBS." << endl;
         cout << "For example:" << endl;
-        cout << "    configure -openssl-linked OPENSSL_LIBS='-lssleay32 -llibeay32'" << endl;
+        cout << "    configure -openssl-linked OPENSSL_LIBS=\"-lssleay32 -llibeay32\"" << endl;
     }
     if( dictionary[ "ZLIB_FORCED" ] == "yes" ) {
         QString which_zlib = "supplied";
-- 
cgit v0.12


From 6b02a101cb96dee4bc574ebec1f91c9243f278fb Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig 
Date: Wed, 5 May 2010 11:19:00 +0200
Subject: Some minor code cleanup

Removes unused code from gkt and cleanlooks.

Reviewed-by: Trust Me
---
 src/gui/styles/qcleanlooksstyle.cpp |  3 ---
 src/gui/styles/qgtkstyle.cpp        | 17 -----------------
 2 files changed, 20 deletions(-)

diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index ba24d97..d9f7df0 100644
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -1397,7 +1397,6 @@ void QCleanlooksStyle::drawControl(ControlElement element, const QStyleOption *o
                                                 dark.lighter(135), 60);
 
     QColor highlight = option->palette.highlight().color();
-    QColor highlightText = option->palette.highlightedText().color();
 
     switch(element) {
      case CE_RadioButton: //fall through
@@ -2723,7 +2722,6 @@ void QCleanlooksStyle::drawComplexControl(ComplexControl control, const QStyleOp
             {
                 // Fill title bar gradient
                 QColor titlebarColor = QColor(active ? highlight: palette.background().color());
-                QColor titleBarGradientStop(active ? highlight.darker(150): palette.background().color().darker(120));
                 QLinearGradient gradient(option->rect.center().x(), option->rect.top(),
                                          option->rect.center().x(), option->rect.bottom());
 
@@ -2986,7 +2984,6 @@ void QCleanlooksStyle::drawComplexControl(ComplexControl control, const QStyleOp
 
             painter->fillRect(option->rect, option->palette.background());
 
-            QRect rect = scrollBar->rect;
             QRect scrollBarSubLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget);
             QRect scrollBarAddLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget);
             QRect scrollBarSlider = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSlider, widget);
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 0988fd8..6c8d561 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -1163,7 +1163,6 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element,
         if (const QStyleOptionTabBarBase *tbb
                 = qstyleoption_cast(option)) {
             QRect tabRect = tbb->rect;
-            QRegion region(tabRect);
             painter->save();
             painter->setPen(QPen(option->palette.dark().color().dark(110), 0));
             switch (tbb->shape) {
@@ -1245,8 +1244,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
     else
         alphaCornerColor = mergedColors(option->palette.background().color(), darkOutline);
 
-    QPalette palette = option->palette;
-
     switch (control) {
 
     case CC_TitleBar:
@@ -1333,11 +1330,8 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
 
             bool isEnabled = (comboBox->state & State_Enabled);
             bool focus = isEnabled && (comboBox->state & State_HasFocus);
-            QColor buttonShadow = option->palette.dark().color();
             GtkStateType state = gtkPainter.gtkState(option);
             int appears_as_list = !proxy()->styleHint(QStyle::SH_ComboBox_Popup, comboBox, widget);
-            QPixmap cache;
-            QString pixmapName;
             QStyleOptionComboBox comboBoxCopy = *comboBox;
             comboBoxCopy.rect = option->rect;
 
@@ -1345,8 +1339,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
             QRect rect = option->rect;
             QRect arrowButtonRect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy,
                                                    SC_ComboBoxArrow, widget);
-            QRect editRect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy,
-                                            SC_ComboBoxEditField, widget);
 
             GtkShadowType shadow = (option->state & State_Sunken || option->state & State_On ) ?
                                    GTK_SHADOW_IN : GTK_SHADOW_OUT;
@@ -1414,9 +1406,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                 else if (option->state & State_MouseOver && comboBox->activeSubControls & SC_ComboBoxArrow)
                     buttonState = GTK_STATE_PRELIGHT;
 
-                QRect buttonrect = QRect(gtkToggleButton->allocation.x, gtkToggleButton->allocation.y,
-                                         gtkToggleButton->allocation.width, gtkToggleButton->allocation.height);
-
                 Q_ASSERT(gtkToggleButton);
                 gtkCachedPainter.paintBox( gtkToggleButton, "button", arrowButtonRect, buttonState,
                                      shadow, gtkToggleButton->style, buttonPath.toString() +
@@ -1436,8 +1425,6 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
                 if (focus)
                     GTK_WIDGET_UNSET_FLAGS(gtkToggleButton, GTK_HAS_FOCUS);
 
-            QHashableLatin1Literal buttonPath = comboBox->editable ? QHashableLatin1Literal("GtkComboBoxEntry.GtkToggleButton")
-                                                : QHashableLatin1Literal("GtkComboBox.GtkToggleButton");
 
                 // Draw the separator between label and arrows
                 QHashableLatin1Literal vSeparatorPath = comboBox->editable
@@ -2557,7 +2544,6 @@ void QGtkStyle::drawControl(ControlElement element,
                                      d->gtkWidget("GtkMenu.GtkMenuItem");
 
             style = gtkPainter.getStyle(gtkMenuItem);
-            QColor borderColor = option->palette.background().color().darker(160);
             QColor shadow = option->palette.dark().color();
 
             if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
@@ -2782,8 +2768,6 @@ void QGtkStyle::drawControl(ControlElement element,
 
             // Arrow
             if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu) {// draw sub menu arrow
-                QPoint buttonShift(pixelMetric(PM_ButtonShiftHorizontal, option, widget),
-                                   proxy()->pixelMetric(PM_ButtonShiftVertical, option, widget));
 
                 QFontMetrics fm(menuitem->font);
                 int arrow_size = fm.ascent() + fm.descent() - 2 * gtkMenuItem->style->ythickness;
@@ -3130,7 +3114,6 @@ QRect QGtkStyle::subControlRect(ComplexControl control, const QStyleOptionComple
     case CC_ComboBox:
         if (const QStyleOptionComboBox *box = qstyleoption_cast(option)) {
             // We employ the gtk widget to position arrows and separators for us
-            QString comboBoxPath = box->editable ? QLS("GtkComboBoxEntry") : QLS("GtkComboBox");
             GtkWidget *gtkCombo = box->editable ? d->gtkWidget("GtkComboBoxEntry")
                                                 : d->gtkWidget("GtkComboBox");
             d->gtk_widget_set_direction(gtkCombo, (option->direction == Qt::RightToLeft) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
-- 
cgit v0.12


From 95a69f37ec156a2506b140e5e349bb7f68e112a5 Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Mon, 26 Apr 2010 14:33:05 +0200
Subject: QHostInfo: Immediately delete aborted lookup requests.

Reviewed-by: Thiago
---
 src/network/kernel/qhostinfo.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index f287630..fd39347 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -596,6 +596,23 @@ void QHostInfoLookupManager::abortLookup(int id)
         return;
 
     QMutexLocker locker(&this->mutex);
+
+    // is postponed? delete and return
+    for (int i = 0; i < postponedLookups.length(); i++) {
+        if (postponedLookups.at(i)->id == id) {
+            delete postponedLookups.takeAt(i);
+            return;
+        }
+    }
+
+    // is scheduled? delete and return
+    for (int i = 0; i < scheduledLookups.length(); i++) {
+        if (scheduledLookups.at(i)->id == id) {
+            delete scheduledLookups.takeAt(i);
+            return;
+        }
+    }
+
     if (!abortedLookups.contains(id))
         abortedLookups.append(id);
 }
-- 
cgit v0.12


From ff2b6ddfd2763b6b365c7466d51a1e2374e4bd4b Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Wed, 5 May 2010 12:37:21 +0200
Subject: QHostInfo: Emit postponed lookup results when finishing current

Reviewed-by: Thiago
---
 src/network/kernel/qhostinfo.cpp | 12 ++++++++++++
 src/network/kernel/qhostinfo_p.h |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index fd39347..28a6c84 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -471,6 +471,18 @@ void QHostInfoRunnable::run()
     hostInfo.setLookupId(id);
     resultEmitter.emitResultsReady(hostInfo);
 
+    // now also iterate through the postponed ones
+    QMutableListIterator 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);
+        }
+    }
+
     manager->lookupFinished(this);
 
     // thread goes back to QThreadPool
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index e11766b..af270d8 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -173,6 +173,8 @@ public:
     bool wasAborted(int id);
 
     QHostInfoCache cache;
+
+    friend class QHostInfoRunnable;
 protected:
     QList currentLookups; // in progress
     QList postponedLookups; // postponed because in progress for same host
-- 
cgit v0.12


From 260212083c19e76e8e53dfe2ae44de70003769d7 Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Wed, 5 May 2010 14:13:24 +0200
Subject: QHostInfo: Avoid one tiny copy of QHostInfo object when emitting

Thanks rittk!

Reviewed-by: Olivier
---
 src/network/kernel/qhostinfo_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
index af270d8..85d14c2 100644
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -84,7 +84,7 @@ public Q_SLOTS:
     }
 
 Q_SIGNALS:
-    void resultsReady(const QHostInfo info);
+    void resultsReady(const QHostInfo &info);
 };
 
 // needs to be QObject because fromName calls tr()
-- 
cgit v0.12


From 6bc32600d2367e78ddc39dd93694e01d4d75958d Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" 
Date: Wed, 5 May 2010 13:59:31 +0200
Subject: Don't leak QVistaHelper from QWizard

The default QObject constructor was not called, meaning the vista helper
was never registered as a child of the QWizard (and therefore never
deleted when the QWizard was destructed).

Task-number: QTBUG-10203
Reviewed-by: olivier
---
 src/gui/dialogs/qwizard_win.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp
index 1390b21..e406cba 100644
--- a/src/gui/dialogs/qwizard_win.cpp
+++ b/src/gui/dialogs/qwizard_win.cpp
@@ -237,7 +237,8 @@ void QVistaBackButton::paintEvent(QPaintEvent *)
 */
 
 QVistaHelper::QVistaHelper(QWizard *wizard)
-    : pressed(false)
+    : QObject(wizard)
+    , pressed(false)
     , wizard(wizard)
     , backButton_(0)
 {
-- 
cgit v0.12


From bfbf4d4ccdfb4cf35592c61674f6bffc28932787 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin 
Date: Wed, 5 May 2010 13:57:29 +0200
Subject: Fix build key on Windows with MinGW.

Also, rebuilt configure.exe

Reviewed-by: Thiago Macieira
---
 configure.exe                    | Bin 1318912 -> 1318912 bytes
 tools/configure/configureapp.cpp |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.exe b/configure.exe
index 161fa1d..69e98dd 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 79864f8..e264426 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2373,7 +2373,7 @@ void Configure::generateBuildKey()
                        + buildSymbianKey + "\"\n"
                        "#else\n"
                        // Debug builds
-                       "# if (defined(_DEBUG) || defined(DEBUG))\n"
+                       "# if (!QT_NO_DEBUG)\n"
                        "#  if (defined(WIN64) || defined(_WIN64) || defined(__WIN64__))\n"
                        + build64Key.arg("debug") + "\"\n"
                        "#  else\n"
-- 
cgit v0.12


From b4bbb3d79a59c1225e1de58b6625f24de7df2013 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Wed, 5 May 2010 15:26:47 +0200
Subject: doc: Began reorganization of the top doc page.

Much more to come.
---
 doc/src/frameworks-technologies/animation.qdoc     |  1 +
 .../frameworks-technologies/eventsandfilters.qdoc  |  3 ++-
 doc/src/frameworks-technologies/graphicsview.qdoc  |  1 +
 .../model-view-programming.qdoc                    |  1 +
 doc/src/frameworks-technologies/threads.qdoc       |  1 +
 doc/src/objectmodel/metaobjects.qdoc               |  3 ++-
 doc/src/objectmodel/object.qdoc                    |  3 ++-
 doc/src/objectmodel/objecttrees.qdoc               |  3 ++-
 doc/src/objectmodel/properties.qdoc                |  3 ++-
 doc/src/objectmodel/signalsandslots.qdoc           |  3 ++-
 doc/src/overviews.qdoc                             | 23 ++++++++++++++++++++++
 doc/src/painting-and-printing/paintsystem.qdoc     |  1 +
 doc/src/widgets-and-layouts/layout.qdoc            |  1 +
 doc/src/widgets-and-layouts/styles.qdoc            |  1 +
 doc/src/widgets-and-layouts/widgets.qdoc           |  1 +
 doc/src/windows-and-dialogs/dialogs.qdoc           |  1 +
 doc/src/windows-and-dialogs/mainwindow.qdoc        |  1 +
 tools/qdoc3/test/qt-html-templates.qdocconf        | 19 ++++++------------
 18 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/doc/src/frameworks-technologies/animation.qdoc b/doc/src/frameworks-technologies/animation.qdoc
index 5548b57..dc705ba 100644
--- a/doc/src/frameworks-technologies/animation.qdoc
+++ b/doc/src/frameworks-technologies/animation.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page animation-overview.html
     \title The Animation Framework
+    \ingroup qt-gui-concepts
 
     \brief An overview of the Animation Framework
 
diff --git a/doc/src/frameworks-technologies/eventsandfilters.qdoc b/doc/src/frameworks-technologies/eventsandfilters.qdoc
index 96ee18c..0cd60b8 100644
--- a/doc/src/frameworks-technologies/eventsandfilters.qdoc
+++ b/doc/src/frameworks-technologies/eventsandfilters.qdoc
@@ -54,7 +54,8 @@
 
 /*!
     \page eventsandfilters.html
-    \title Events and Event Filters
+    \title The Event System
+    \ingroup qt-basic-concepts
     \brief A guide to event handling in Qt.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 6844aed..95b3182 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page graphicsview.html
     \title The Graphics View Framework
+    \ingroup qt-gui-concepts
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
 
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 7568981..e02f1eb 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -50,6 +50,7 @@
     \startpage index.html Qt Reference Documentation
 
     \title Model/View Programming
+    \ingroup qt-gui-concepts
     \brief A guide to the extensible model/view architecture used by Qt's
     item view classes.
 
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index fd6bebb..f7dde59 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page threads.html
     \title Thread Support in Qt
+    \ingroup qt-basic-concepts
     \brief A detailed discussion of thread handling in Qt.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/objectmodel/metaobjects.qdoc b/doc/src/objectmodel/metaobjects.qdoc
index c1b0ea6..e891183 100644
--- a/doc/src/objectmodel/metaobjects.qdoc
+++ b/doc/src/objectmodel/metaobjects.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page metaobjects.html
-    \title Meta-Object System
+    \title The Meta-Object System
+    \ingroup qt-basic-concepts
     \brief An overview of Qt's meta-object system and introspection capabilities.
     \keyword meta-object
 
diff --git a/doc/src/objectmodel/object.qdoc b/doc/src/objectmodel/object.qdoc
index 2f06004..e0ba6ed 100644
--- a/doc/src/objectmodel/object.qdoc
+++ b/doc/src/objectmodel/object.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page object.html
-    \title Qt Object Model
+    \title Object Model
+    \ingroup qt-basic-concepts
     \brief A description of the powerful features made possible by Qt's dynamic object model.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/objectmodel/objecttrees.qdoc b/doc/src/objectmodel/objecttrees.qdoc
index 11824ae..97d646a 100644
--- a/doc/src/objectmodel/objecttrees.qdoc
+++ b/doc/src/objectmodel/objecttrees.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page objecttrees.html
-    \title Object Trees and Object Ownership
+    \title Object Trees & Ownership
+    \ingroup qt-basic-concepts
     \brief Information about the parent-child pattern used to describe
     object ownership in Qt.
 
diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index a807caf..bc9554c 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page properties.html
-    \title Qt's Property System
+    \title The Property System
+    \ingroup qt-basic-concepts
     \brief An overview of Qt's property system.
 
     Qt provides a sophisticated property system similar to the ones
diff --git a/doc/src/objectmodel/signalsandslots.qdoc b/doc/src/objectmodel/signalsandslots.qdoc
index 0f3f618..f33badf 100644
--- a/doc/src/objectmodel/signalsandslots.qdoc
+++ b/doc/src/objectmodel/signalsandslots.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page signalsandslots.html
-    \title Signals and Slots
+    \title Signals & Slots
+    \ingroup qt-basic-concepts
     \brief An overview of Qt's signals and slots inter-object
     communication mechanism.
 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 7302e30..bc994af 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -48,6 +48,29 @@
 */
 
 /*!
+    \group qt-basic-concepts
+    \title Qt Basic Concepts
+
+    \brief The basic concepts of the Qt cross-platform application and UI framework.
+
+    Qt is a cross-platform application and UI framework for writing
+    web-enabled applications for desktop, mobile, and embedded
+    operating systems. These pages explain basic architectural
+    concepts of Qt:
+
+    \generatelist {related}
+ */
+
+/*!
+    \group qt-gui-concepts
+    \title Qt GUI Components
+
+    \brief The Qt components for constructing graphical user intefaces.
+
+    \generatelist {related}
+ */
+
+/*!
     \group frameworks-technologies
     \title Frameworks and Technologies
 
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index 802751f..56b638c 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -61,6 +61,7 @@
 /*!
     \page paintsystem.html
     \title The Paint System
+    \ingroup qt-gui-concepts
     \ingroup frameworks-technologies
 
     Qt's paint system enables painting on screen and print devices
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc
index 0cfde22..2ca202f 100644
--- a/doc/src/widgets-and-layouts/layout.qdoc
+++ b/doc/src/widgets-and-layouts/layout.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page layout.html
     \title Layout Management
+    \ingroup qt-gui-concepts
     \brief A tour of the standard layout managers and an introduction to custom
     layouts.
     
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index 9a28715..b4bec8c 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -48,6 +48,7 @@
 /*!
     \page style-reference.html
     \title Implementing Styles and Style Aware Widgets
+    \ingroup qt-gui-concepts
     \brief An overview of styles and the styling of widgets.
 
     \ingroup frameworks-technologies
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index 7bd27b6..ac0bf77 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page widgets-and-layouts.html
     \title Widgets and Layouts
+    \ingroup qt-gui-concepts
 
     \ingroup frameworks-technologies
 
diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc
index acee0c5..0b0a842 100644
--- a/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -52,6 +52,7 @@
 /*!
     \page dialogs.html
     \title Dialog Windows
+    \ingroup qt-gui-concepts
     \brief An overview over dialog windows.
     
     \previouspage The Application Main Window
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index 6adfa75..b282dab 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -47,6 +47,7 @@
 /*!
     \page application-windows.html
     \title Application Windows and Dialogs
+    \ingroup qt-gui-concepts
     \ingroup frameworks-technologies
 
     \nextpage The Application Main Window
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 00af376..48ecd2c 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -50,7 +50,7 @@ HTML.postheader         = " 
    \n" \
 			  "              
  • All classes
    • \n" \
 			  "              
  • All functions
    • \n" \
 			  "              
  • All namespaces
    • \n" \
-			  "              
  • Platform specifics
    • \n" \
+			  "              
  • QML elements
    • \n" \
 			  "             \n" \
 			  "          
    \n" \
 			  "          
    \n" \
@@ -58,24 +58,17 @@ HTML.postheader         = " 
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
 			  "          
    \n" \
-			  "            API Topics
    \n" \
+			  "            Qt Topics
    \n" \
 			  "          
    \n" \
 			  " \n " \
 			  " " \
 			  "              \n" \
 			  "          
    \n" \
 			  "          
    \n" \
@@ -83,7 +76,7 @@ HTML.postheader         = " 
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
 			  "          
    \n" \
-			  "            API Examples
    \n" \
+			  "            Qt Examples\n" \
 			  "          
    \n" \
 			  " \n " \
-			  " " \
-			  "          
    \n" \
 			  "          
    \n" \
@@ -58,17 +54,20 @@ HTML.postheader         = " 
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
 			  "          
    \n" \
-			  "            Qt Topics
    \n" \
+			  "            API Topics\n" \
 			  "          
    \n" \
-			  " \n " \
-			  " " \
-			  "            
    \n" \
 			  "          
    \n" \
@@ -76,18 +75,14 @@ HTML.postheader         = " 
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
 			  "          
    \n" \
-			  "            Qt Examples
    \n" \
+			  "            API Examples\n" \
 			  "          
    \n" \
-			  "  \n " \
-			  " " \
-			  "        
    \n" \
 			  "          
    \n" \
-- 
cgit v0.12


From db64d17f233f92ce7a425271ee60586bd846705d Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:34:38 +0200
Subject: whitespace fixes

---
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index ff79c09..db8548d 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -522,8 +522,8 @@ public:
         active->connectToHost("127.0.0.1", server.serverPort());
 #ifndef Q_OS_SYMBIAN
         // need more time as working with embedded
-		// device and testing from emualtor
-		// things tend to get slower
+        // device and testing from emualtor
+        // things tend to get slower
         if (!active->waitForConnected(1000))
             return false;
 
@@ -929,7 +929,7 @@ void tst_QNetworkReply::invalidProtocol()
 
 void tst_QNetworkReply::getFromData_data()
 {
-	QTest::addColumn("request");
+    QTest::addColumn("request");
     QTest::addColumn("expected");
     QTest::addColumn("mimeType");
 
@@ -1025,7 +1025,7 @@ void tst_QNetworkReply::getFromData()
 
 void tst_QNetworkReply::getFromFile()
 {
-	// create the file:
+    // create the file:
     QTemporaryFile file(QDir::currentPath() + "/temp-XXXXXX");
     file.setAutoRemove(true);
     QVERIFY(file.open());
@@ -1077,7 +1077,7 @@ void tst_QNetworkReply::getFromFileSpecial_data()
 
 void tst_QNetworkReply::getFromFileSpecial()
 {
-	QFETCH(QString, fileName);
+    QFETCH(QString, fileName);
     QFETCH(QString, url);
 
     // open the resource so we can find out its size
@@ -1107,7 +1107,7 @@ void tst_QNetworkReply::getFromFtp_data()
 
 void tst_QNetworkReply::getFromFtp()
 {
-	QFETCH(QString, referenceName);
+    QFETCH(QString, referenceName);
     QFETCH(QString, url);
 
     QFile reference(referenceName);
@@ -1136,7 +1136,7 @@ void tst_QNetworkReply::getFromHttp_data()
 
 void tst_QNetworkReply::getFromHttp()
 {
-	QFETCH(QString, referenceName);
+    QFETCH(QString, referenceName);
     QFETCH(QString, url);
 
     QFile reference(referenceName);
@@ -3456,8 +3456,8 @@ void tst_QNetworkReply::downloadProgress_data()
     QTest::newRow("big") << 4096;
 #else
     // it can run even with 4096
-	// but it takes lot time
-	//especially on emulator
+    // but it takes lot time
+    //especially on emulator
     QTest::newRow("big") << 1024;
 #endif
 }
@@ -3646,7 +3646,7 @@ void tst_QNetworkReply::receiveCookiesFromHttp_data()
 
 void tst_QNetworkReply::receiveCookiesFromHttp()
 {
-	QFETCH(QString, cookieString);
+    QFETCH(QString, cookieString);
 
     QByteArray data = cookieString.toLatin1() + '\n';
     QUrl url("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/set-cookie.cgi");
-- 
cgit v0.12


From e41217d6d2e592e79a9a8a83c9e49491d66ad18e Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:36:10 +0200
Subject: tst_qnetworkreply: add a test for getting from SMB

Reviewed-By: Markus Goetz
---
 tests/auto/qnetworkreply/smb-file.txt          | 1 +
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 tests/auto/qnetworkreply/smb-file.txt

diff --git a/tests/auto/qnetworkreply/smb-file.txt b/tests/auto/qnetworkreply/smb-file.txt
new file mode 100644
index 0000000..73c3ac2
--- /dev/null
+++ b/tests/auto/qnetworkreply/smb-file.txt
@@ -0,0 +1 @@
+This is 34 bytes. Do not change...
\ No newline at end of file
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index db8548d..9d942bf 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1073,6 +1073,9 @@ void tst_QNetworkReply::getFromFileSpecial_data()
     QTest::newRow("resource") << ":/resource" <<  "qrc:/resource";
     QTest::newRow("search-path") << "srcdir:/rfc3252.txt" << "srcdir:/rfc3252.txt";
     QTest::newRow("bigfile-path") << "srcdir:/bigfile" << "srcdir:/bigfile";
+#ifdef Q_OS_WIN
+    QTest::newRow("smb-path") << "srcdir:/smb-file.txt" << "file://" + QtNetworkSettings::winServerName() + "/testshare/test.pri";
+#endif
 }
 
 void tst_QNetworkReply::getFromFileSpecial()
-- 
cgit v0.12


From a2f797b52c4274a62a7cf1f0939aca1429afe211 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:48:21 +0200
Subject: Improve QUrl handling of local file paths

Add QUrl::isLocalFile for a faster and more consistent checking of
whether the URL is local or not.

Improve the documentation to indicate that QUrl always treats SMB-like
file paths as local, even if the system cannot open them
(non-Windows).

Add a test to ensure that "FILE:/a.txt" is considered local too (RFC
3986 requires schemes to be interpreted in case-insensitive fashion).

Remove broken code that supported empty schemes as local file paths.

Reviewed-by: Markus Goetz
---
 src/corelib/io/qurl.cpp      | 73 +++++++++++++++++++++++++++++++-------------
 src/corelib/io/qurl.h        |  1 +
 tests/auto/qurl/tst_qurl.cpp | 11 ++++++-
 3 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 4e580dd..7b5bfed 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5970,19 +5970,22 @@ bool QUrl::isDetached() const
 
 
 /*!
-    Returns a QUrl representation of \a localFile, interpreted as a
-    local file.
+    Returns a QUrl representation of \a localFile, interpreted as a local
+    file. This function accepts paths separated by slashes as well as the
+    native separator for this platform.
 
-    \sa toLocalFile()
+    This function also accepts paths with a doubled leading slash (or
+    backslash) to indicate a remote file, as in
+    "//servername/path/to/file.txt". Note that only certain platforms can
+    actually open this file using QFile::open().
+
+    \sa toLocalFile(), isLocalFile(), QDir::toNativeSeparators
 */
 QUrl QUrl::fromLocalFile(const QString &localFile)
 {
     QUrl url;
     url.setScheme(QLatin1String("file"));
-    QString deslashified = localFile;
-    deslashified.replace(QLatin1Char('\\'), QLatin1Char('/'));
-
-
+    QString deslashified = QDir::toNativeSeparators(localFile);
 
     // magic for drives on windows
     if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {
@@ -6001,35 +6004,61 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
 }
 
 /*!
-    Returns the path of this URL formatted as a local file path.
+    Returns the path of this URL formatted as a local file path. The path
+    returned will use forward slashes, even if it was originally created
+    from one with backslashes.
 
-    \sa fromLocalFile()
+    If this URL contains a non-empty hostname, it will be encoded in the
+    returned value in the form found on SMB networks (for example,
+    "//servername/path/to/file.txt").
+
+    \sa fromLocalFile(), isLocalFile()
 */
 QString QUrl::toLocalFile() const
 {
-    if (!d) return QString();
-    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
+    // the call to isLocalFile() also ensures that we're parsed
+    if (!isLocalFile())
+        return QString();
 
     QString tmp;
     QString ourPath = path();
-    if (d->scheme.isEmpty() || QString::compare(d->scheme, QLatin1String("file"), Qt::CaseInsensitive) == 0) {
 
-        // magic for shared drive on windows
-        if (!d->host.isEmpty()) {
-            tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
-                                                  ? QLatin1Char('/') + ourPath :  ourPath);
-        } else {
-            tmp = ourPath;
-            // magic for drives on windows
-            if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
-                tmp.remove(0, 1);
-        }
+    // magic for shared drive on windows
+    if (!d->host.isEmpty()) {
+        tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
+                                               ? QLatin1Char('/') + ourPath :  ourPath);
+    } else {
+        tmp = ourPath;
+        // magic for drives on windows
+        if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
+            tmp.remove(0, 1);
     }
 
     return tmp;
 }
 
 /*!
+    \since 4.7
+    Returns true if this URL is pointing to a local file path. A URL is a
+    local file path if the scheme is "file".
+
+    Note that this function considers URLs with hostnames to be local file
+    paths, even if the eventual file path cannot be opened with
+    QFile::open().
+
+    \sa fromLocalFile(), toLocalFile()
+*/
+bool QUrl::isLocalFile() const
+{
+    if (!d) return false;
+    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
+
+    if (d->scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)
+        return false;   // not file
+    return true;
+}
+
+/*!
     Returns true if this URL is a parent of \a childUrl. \a childUrl is a child
     of this URL if the two URLs share the same scheme and authority,
     and this URL's path is a parent of the path of \a childUrl.
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 6f8331a..162aa7c 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -183,6 +183,7 @@ public:
 
     static QUrl fromLocalFile(const QString &localfile);
     QString toLocalFile() const;
+    bool isLocalFile() const;
 
     QString toString(FormattingOptions options = None) const;
 
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index fa42adc..67bf0c1 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -314,6 +314,7 @@ void tst_QUrl::constructing()
 
 
     QUrl buildUNC;
+    buildUNC.setScheme(QString::fromLatin1("file"));
     buildUNC.setHost(QString::fromLatin1("somehost"));
     buildUNC.setPath(QString::fromLatin1("somepath"));
     QCOMPARE(buildUNC.toLocalFile(), QString::fromLatin1("//somehost/somepath"));
@@ -1757,7 +1758,15 @@ void tst_QUrl::toLocalFile_data()
     QTest::newRow("data7")	<< QString::fromLatin1("file://somehost/") << QString::fromLatin1("//somehost/");
     QTest::newRow("data8")	<< QString::fromLatin1("file://somehost") << QString::fromLatin1("//somehost");
     QTest::newRow("data9")	<< QString::fromLatin1("file:////somehost/somedir/somefile") << QString::fromLatin1("//somehost/somedir/somefile");
-
+    QTest::newRow("data10")	<< QString::fromLatin1("FILE:/a.txt") << QString::fromLatin1("/a.txt");
+
+    // and some that result in empty (i.e., not local)
+    QTest::newRow("xdata0") << QString::fromLatin1("/a.txt") << QString();
+    QTest::newRow("xdata1") << QString::fromLatin1("//a.txt") << QString();
+    QTest::newRow("xdata2") << QString::fromLatin1("///a.txt") << QString();
+    QTest::newRow("xdata3") << QString::fromLatin1("foo:/a.txt") << QString();
+    QTest::newRow("xdata4") << QString::fromLatin1("foo://a.txt") << QString();
+    QTest::newRow("xdata5") << QString::fromLatin1("foo:///a.txt") << QString();
 }
 
 void tst_QUrl::toLocalFile()
-- 
cgit v0.12


From ebddf7a8739d7f4aaa7d9cb8a41a14eebb65e4f4 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:51:41 +0200
Subject: Use QUrl::isLocalFile and fix the scheme checking in local URLs.

RFC 3986 requires that schemes be compared case-insensitively, so
"QRC:/" is allowed for Qt resources.

Also document the use of file engines and search paths.

Reviewed-by: Markus Goetz
---
 src/network/access/qnetworkaccessfilebackend.cpp | 11 ++++++++---
 src/network/access/qnetworkaccessmanager.cpp     | 11 +++++------
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp   |  6 ++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 4560153..710c258 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -65,10 +65,15 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("qrc") || !url.toLocalFile().isEmpty())
+    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0 || url.isLocalFile()) {
         return new QNetworkAccessFileBackend;
-    else if (!url.isEmpty() && url.authority().isEmpty()) {
-        // check if QFile could, in theory, open this URL
+    } else if (!url.scheme().isEmpty() && url.authority().isEmpty()) {
+        // check if QFile could, in theory, open this URL via the file engines
+        // it has to be in the format:
+        //    prefix:path/to/file
+        // or prefix:/path/to/file
+        //
+        // this construct here must match the one below in open()
         QFileInfo fi(url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery));
         if (fi.exists() || (op == QNetworkAccessManager::PutOperation && fi.dir().exists()))
             return new QNetworkAccessFileBackend;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 1c7661d..10fdc6f 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -907,21 +907,20 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 {
     Q_D(QNetworkAccessManager);
 
+    bool isLocalFile = req.url().isLocalFile();
+
     // 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://
     if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation)
-         && (req.url().scheme() == QLatin1String("file")
-             || req.url().scheme().isEmpty())) {
+         && isLocalFile) {
         return new QFileNetworkReply(this, req, op);
     }
 
 #ifndef QT_NO_BEARERMANAGEMENT
     // Return a disabled network reply if network access is disabled.
     // Except if the scheme is empty or file://.
-    if (!d->networkAccessible && !(req.url().scheme() == QLatin1String("file") ||
-                                      req.url().scheme().isEmpty())) {
+    if (!d->networkAccessible && !isLocalFile) {
         return new QDisabledNetworkReply(this, req, op);
     }
 
@@ -963,7 +962,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
     QUrl url = request.url();
     QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
 #ifndef QT_NO_BEARERMANAGEMENT
-    if (req.url().scheme() != QLatin1String("file") && !req.url().scheme().isEmpty()) {
+    if (!isLocalFile) {
         connect(this, SIGNAL(networkSessionConnected()),
                 reply, SLOT(_q_networkSessionConnected()));
     }
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 9d942bf..c4d458f 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1166,6 +1166,12 @@ void tst_QNetworkReply::getErrors_data()
     QTest::addColumn("httpStatusCode");
     QTest::addColumn("dataIsEmpty");
 
+    // empties
+    QTest::newRow("empty-url") << QString() << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
+    QTest::newRow("empty-scheme-host") << SRCDIR "/rfc3252.txt" << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
+    QTest::newRow("empty-scheme") << "//" + QtNetworkSettings::winServerName() + "/testshare/test.pri"
+            << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
+
     // file: errors
     QTest::newRow("file-host") << "file://this-host-doesnt-exist.troll.no/foo.txt"
 #if !defined Q_OS_WIN
-- 
cgit v0.12


From a9fb306a1cf1308a3f8b9bb12ed01aed1f6f6f8d Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 16:55:02 +0200
Subject: [QNAM FTP] Check for the "ftp" scheme case-insensitively

---
 src/network/access/qnetworkaccessftpbackend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index 1a59011..da336d0 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -77,7 +77,7 @@ QNetworkAccessFtpBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme() == QLatin1String("ftp"))
+    if (url.scheme().compare(QLatin1String("ftp"), Qt::CaseInsensitive) == 0)
         return new QNetworkAccessFtpBackend;
     return 0;
 }
-- 
cgit v0.12


From 0a8379d9f01118d7ff0121e6ecbbc0307e1e7f63 Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Thu, 6 May 2010 04:54:19 +1000
Subject: Make component.createObject require a parent argument

For graphical objects (the common case) a common mistake is to not
parent a dynamically created item. Since you almost always want to add a
parent, and it's hard for a beginner to diagnose this problem, a parent
is now a required argument and dealt with by the createObject function.

Task-number: QTBUG-10110
---
 demos/declarative/samegame/SamegameCore/samegame.js  |  3 +--
 demos/declarative/snake/content/snake.js             |  6 ++----
 doc/src/declarative/dynamicobjects.qdoc              |  4 +++-
 doc/src/declarative/globalobject.qdoc                |  5 ++++-
 doc/src/snippets/declarative/componentCreation.js    |  8 ++------
 doc/src/snippets/declarative/dynamicObjects.qml      |  3 +--
 examples/declarative/dynamic/qml/itemCreation.js     |  3 +--
 .../tutorials/samegame/samegame2/samegame.js         |  3 +--
 .../tutorials/samegame/samegame3/samegame.js         |  3 +--
 .../tutorials/samegame/samegame4/content/samegame.js |  3 +--
 src/declarative/qml/qdeclarativecomponent.cpp        | 20 +++++++++++++++++++-
 src/declarative/qml/qdeclarativecomponent.h          |  2 +-
 .../qdeclarativeecmascript/data/dynamicCreation.qml  |  4 ++--
 13 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index cc0a70d..f9c6184 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -176,14 +176,13 @@ function createBlock(column,row){
     // not be ready immediately. There is a statusChanged signal on the
     // component you could use if you want to wait to load remote files.
     if(component.status == Component.Ready){
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(gameCanvas);
         if(dynamicObject == null){
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.parent = gameCanvas;
         dynamicObject.x = column*gameCanvas.blockSize;
         dynamicObject.targetX = column*gameCanvas.blockSize;
         dynamicObject.targetY = row*gameCanvas.blockSize;
diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js
index 102bd87..f5c231e 100644
--- a/demos/declarative/snake/content/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -59,8 +59,7 @@ function startNewGame()
                     console.log("Still loading linkComponent");
                 continue;//TODO: Better error handling?
             }
-            var link = linkComponent.createObject();
-            link.parent = playfield;
+            var link = linkComponent.createObject(playfield);
             link.z = numRows * numColumns + 1 - i;
             link.type = i == 0 ? 2 : 0;
             link.spawned = false;
@@ -300,8 +299,7 @@ function createCookie(value) {
             console.log("Still loading cookieComponent");
         return;//TODO: Better error handling?
     }
-    cookie = cookieComponent.createObject();
-    cookie.parent = head.parent;
+    cookie = cookieComponent.createObject(head.parent);
     cookie.value = value;
     cookie.row = row;
     cookie.column = column;
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index dc0277d..2688ee5 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -69,7 +69,9 @@ This function takes the URL of the QML file as its only argument and returns
 a component object which can be used to create and load that QML file.
 
 Once you have a component you can use its \l {Component::createObject()}{createObject()} method to create an instance of
-the component. 
+the component. This function takes exactly one argument, which is the parent for the new item. Since graphical items will
+not appear on the scene without a parent, it is recommended that you set the parent this way. However, if you wish to set
+the parent later you can safely pass null to this function.
 
 Here is an example. Here is a \c Sprite.qml, which defines a simple QML component:
 
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 7c27ae4..bc9830a 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -258,7 +258,10 @@ The methods and properties of the Component element are defined in its own
 page, but when using it dynamically only two methods are usually used.
 \c Component.createObject() returns the created object or \c null if there is an error.
 If there is an error, \l {Component::errorsString()}{Component.errorsString()} describes
-the error that occurred.
+the error that occurred. Note that createObject() takes exactly one argument, which is set
+to the parent of the created object. Graphical objects without a parent will not appear
+on the scene, but if you do not wish to parent the item at this point you can safely pass
+in null.
 
 If you want to just create an arbitrary string of QML, instead of
 loading a QML file, consider the \l{Qt.createQmlObject(string qml, object parent, string filepath)}{Qt.createQmlObject()} function.
diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index be928f0..f6fb379 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -4,11 +4,10 @@ var sprite;
 
 function finishCreation() {
     if (component.status == Component.Ready) {
-        sprite = component.createObject();
+        sprite = component.createObject(appWindow);
         if (sprite == null) {
             // Error Handling
         } else {
-            sprite.parent = appWindow;
             sprite.x = 100;
             sprite.y = 100;
             // ...
@@ -32,13 +31,12 @@ else
 
 //![2]
 component = Qt.createComponent("Sprite.qml");
-sprite = component.createObject();
+sprite = component.createObject(appWindow);
 
 if (sprite == null) {
     // Error Handling
     console.log("Error loading component:", component.errorsString());
 } else {
-    sprite.parent = appWindow;
     sprite.x = 100;
     sprite.y = 100;
     // ...
@@ -47,5 +45,3 @@ if (sprite == null) {
 
 }
 
-createSpriteObjects();
-
diff --git a/doc/src/snippets/declarative/dynamicObjects.qml b/doc/src/snippets/declarative/dynamicObjects.qml
index dd55d78..6a8c927 100644
--- a/doc/src/snippets/declarative/dynamicObjects.qml
+++ b/doc/src/snippets/declarative/dynamicObjects.qml
@@ -21,8 +21,7 @@ Rectangle {
     }
 
     function createRectangle() {
-        var object = rectComponent.createObject();
-        object.parent = rootItem;
+        var object = rectComponent.createObject(rootItem);
     } 
 
     Component.onCompleted: createRectangle()
diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
index 3c1b975..08f5320 100644
--- a/examples/declarative/dynamic/qml/itemCreation.js
+++ b/examples/declarative/dynamic/qml/itemCreation.js
@@ -42,8 +42,7 @@ function loadComponent() {
 
 function createItem() {
     if (itemComponent.status == Component.Ready && draggedItem == null) {
-        draggedItem = itemComponent.createObject();
-        draggedItem.parent = window;
+        draggedItem = itemComponent.createObject(window);
         draggedItem.image = itemButton.image;
         draggedItem.x = xOffset;
         draggedItem.y = yOffset;
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/declarative/tutorials/samegame/samegame2/samegame.js
index bcfb5b6..0dbe6a6 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.js
@@ -41,13 +41,12 @@ function createBlock(column, row) {
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
     if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(background);
         if (dynamicObject == null) {
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
-        dynamicObject.parent = background;
         dynamicObject.x = column * blockSize;
         dynamicObject.y = row * blockSize;
         dynamicObject.width = blockSize;
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js
index 4256aee..e5ba6e0 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js
@@ -38,14 +38,13 @@ function createBlock(column, row) {
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
     if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(gameCanvas);
         if (dynamicObject == null) {
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.parent = gameCanvas;
         dynamicObject.x = column * gameCanvas.blockSize;
         dynamicObject.y = row * gameCanvas.blockSize;
         dynamicObject.width = gameCanvas.blockSize;
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index 961cd66..159c9a7 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -49,14 +49,13 @@ function createBlock(column, row) {
     // Loading and we should wait for the component's statusChanged() signal to
     // know when the file is downloaded and ready before calling createObject().
     if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject();
+        var dynamicObject = component.createObject(gameCanvas);
         if (dynamicObject == null) {
             console.log("error creating block");
             console.log(component.errorsString());
             return false;
         }
         dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.parent = gameCanvas;
         dynamicObject.x = column * gameCanvas.blockSize;
         dynamicObject.targetX = column * gameCanvas.blockSize;
         dynamicObject.targetY = row * gameCanvas.blockSize;
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 3ca0707..e7b9c9e 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
@@ -557,8 +558,11 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
 /*!
     \internal
     A version of create which returns a scriptObject, for use in script
+
+    Sets graphics object parent because forgetting to do this is a frequent
+    and serious problem.
 */
-QScriptValue QDeclarativeComponent::createObject()
+QScriptValue QDeclarativeComponent::createObject(QObject* parent)
 {
     Q_D(QDeclarativeComponent);
     QDeclarativeContext* ctxt = creationContext();
@@ -567,6 +571,20 @@ QScriptValue QDeclarativeComponent::createObject()
     QObject* ret = create(ctxt);
     if (!ret)
         return QScriptValue(QScriptValue::NullValue);
+
+    QGraphicsObject* gobj = qobject_cast(ret);
+    bool needParent = (gobj != 0);
+    if(parent){
+        ret->setParent(parent);
+        QGraphicsObject* gparent = qobject_cast(parent);
+        if(gparent){
+            gobj->setParentItem(gparent);
+            needParent = false;
+        }
+    }
+    if(needParent)
+        qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
+
     QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine);
     QDeclarativeData::get(ret, true)->setImplicitDestructible();
     return priv->objectClass->newQObject(ret, QMetaType::QObjectStar);
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index b078174..688e233 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -109,7 +109,7 @@ Q_SIGNALS:
 
 protected:
     QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject* parent);
-    Q_INVOKABLE QScriptValue createObject();
+    Q_INVOKABLE QScriptValue createObject(QObject* parent);
 
 private:
     QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent);
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
index 3047e9b..7b132e1 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml
@@ -11,7 +11,7 @@ MyQmlObject{
     function createTwo()
     {
         var component = Qt.createComponent('dynamicCreation.helper.qml');
-        obj.objectProperty = component.createObject();
+        obj.objectProperty = component.createObject(obj);
     }
 
     function createThree()
@@ -22,6 +22,6 @@ MyQmlObject{
     function dontCrash()
     {
         var component = Qt.createComponent('file-doesnt-exist.qml');
-        obj.objectProperty = component.createObject();
+        obj.objectProperty = component.createObject(obj);
     }
 }
-- 
cgit v0.12


From 053fcebb7ef1b3899b656d511437a8139ee012b7 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 08:45:13 +1000
Subject: Initialize variable and crash less.

---
 tools/qml/qmlruntime.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 1229df2..fe0f67c 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -469,6 +469,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
       , m_scriptOptions(0)
       , tester(0)
       , useQmlFileBrowser(true)
+      , translator(0)
 {
     QDeclarativeViewer::registerTypes();
     setWindowTitle(tr("Qt Qml Runtime"));
-- 
cgit v0.12


From 2df493e9f0660be7d9b5ba691883e13fa12cde72 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Thu, 6 May 2010 09:18:36 +1000
Subject: Fix compile in namespace.

---
 tools/qml/loggerwidget.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h
index b68ecc5..fd20c41 100644
--- a/tools/qml/loggerwidget.h
+++ b/tools/qml/loggerwidget.h
@@ -86,8 +86,8 @@ private:
     Visibility m_visibility;
 };
 
-Q_DECLARE_METATYPE(LoggerWidget::Visibility);
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(LoggerWidget::Visibility)
+
 #endif // LOGGERWIDGET_H
-- 
cgit v0.12


From 8e023477777982d3aeb53d26ed61f7e8c1eb753c Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Thu, 6 May 2010 09:34:51 +1000
Subject: Another initialization fix. Unleak.

---
 tools/qml/main.cpp       | 2 +-
 tools/qml/qmlruntime.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 78f0c87..fb687ac 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -54,7 +54,7 @@
 
 QT_USE_NAMESPACE
 
-QtMsgHandler systemMsgOutput;
+QtMsgHandler systemMsgOutput = 0;
 
 #if defined (Q_OS_SYMBIAN)
 #include 
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index fe0f67c..d49b0f1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -543,6 +543,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
 
 QDeclarativeViewer::~QDeclarativeViewer()
 {
+    delete loggerWindow;
     canvas->engine()->setNetworkAccessManagerFactory(0);
     delete namFactory;
 }
-- 
cgit v0.12


From 2df39e548264617b8e10fae32bdafbfe2edcd895 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 09:39:31 +1000
Subject: Fix some compiler warnings.

---
 src/declarative/qml/qdeclarativeengine.cpp | 46 +++++++++++++++---------------
 src/declarative/qml/qdeclarativeinfo.cpp   |  3 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 6ddd01e..cc6c5fe 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -962,7 +962,7 @@ QScriptValue QDeclarativeEnginePrivate::createComponent(QScriptContext *ctxt, QS
     Q_ASSERT(context);
 
     if(ctxt->argumentCount() != 1) {
-        return ctxt->throwError("Qt.createComponent(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.createComponent(): Invalid arguments"));
     }else{
         QString arg = ctxt->argument(0).toString();
         if (arg.isEmpty())
@@ -982,7 +982,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
     QDeclarativeEngine* activeEngine = activeEnginePriv->q_func();
 
     if(ctxt->argumentCount() < 2 || ctxt->argumentCount() > 3)
-        return ctxt->throwError("Qt.createQmlObject(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Invalid arguments"));
 
     QDeclarativeContextData* context = activeEnginePriv->getContext(ctxt);
     Q_ASSERT(context);
@@ -1002,7 +1002,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
 
     QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1));
     if(!parentArg)
-        return ctxt->throwError("Qt.createQmlObject(): Missing parent object");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Missing parent object"));
 
     QDeclarativeComponent component(activeEngine);
     component.setData(qml.toUtf8(), url);
@@ -1027,7 +1027,7 @@ QScriptValue QDeclarativeEnginePrivate::createQmlObject(QScriptContext *ctxt, QS
     }
 
     if (!component.isReady())
-        return ctxt->throwError("Qt.createQmlObject(): Component is not ready");
+        return ctxt->throwError(QLatin1String("Qt.createQmlObject(): Component is not ready"));
 
     QObject *obj = component.beginCreate(context->asQDeclarativeContext());
     if(obj)
@@ -1076,7 +1076,7 @@ QScriptValue QDeclarativeEnginePrivate::isQtObject(QScriptContext *ctxt, QScript
 QScriptValue QDeclarativeEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 3)
-        return ctxt->throwError("Qt.vector(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.vector(): Invalid arguments"));
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
     qsreal z = ctxt->argument(2).toNumber();
@@ -1087,7 +1087,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptE
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatDate(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatDate(): Invalid arguments"));
 
     QDate date = ctxt->argument(0).toDateTime().date();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1098,7 +1098,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptE
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else {
-            return ctxt->throwError("Qt.formatDate(): Invalid date format");
+            return ctxt->throwError(QLatin1String("Qt.formatDate(): Invalid date format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1108,7 +1108,7 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatTime(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid arguments"));
 
     QTime date = ctxt->argument(0).toDateTime().time();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1119,7 +1119,7 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else {
-            return ctxt->throwError("Qt.formatTime(): Invalid time format");
+            return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid time format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1129,7 +1129,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScr
 {
     int argCount = ctxt->argumentCount();
     if(argCount == 0 || argCount > 2)
-        return ctxt->throwError("Qt.formatDateTime(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.formatDateTime(): Invalid arguments"));
 
     QDateTime date = ctxt->argument(0).toDateTime();
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
@@ -1140,7 +1140,7 @@ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScr
         } else if (ctxt->argument(1).isNumber()) {
             enumFormat = Qt::DateFormat(ctxt->argument(1).toUInt32());
         } else { 
-            return ctxt->throwError("Qt.formatDateTime(): Invalid datetime format");
+            return ctxt->throwError(QLatin1String("Qt.formatDateTime(): Invalid datetime format"));
         }
     }
     return engine->newVariant(qVariantFromValue(date.toString(enumFormat)));
@@ -1150,7 +1150,7 @@ QScriptValue QDeclarativeEnginePrivate::rgba(QScriptContext *ctxt, QScriptEngine
 {
     int argCount = ctxt->argumentCount();
     if(argCount < 3 || argCount > 4)
-        return ctxt->throwError("Qt.rgba(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.rgba(): Invalid arguments"));
     qsreal r = ctxt->argument(0).toNumber();
     qsreal g = ctxt->argument(1).toNumber();
     qsreal b = ctxt->argument(2).toNumber();
@@ -1172,7 +1172,7 @@ QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine
 {
     int argCount = ctxt->argumentCount();
     if(argCount < 3 || argCount > 4)
-        return ctxt->throwError("Qt.hsla(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.hsla(): Invalid arguments"));
     qsreal h = ctxt->argument(0).toNumber();
     qsreal s = ctxt->argument(1).toNumber();
     qsreal l = ctxt->argument(2).toNumber();
@@ -1193,7 +1193,7 @@ QScriptValue QDeclarativeEnginePrivate::hsla(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 4)
-        return ctxt->throwError("Qt.rect(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.rect(): Invalid arguments"));
 
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
@@ -1209,7 +1209,7 @@ QScriptValue QDeclarativeEnginePrivate::rect(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::point(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.point(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.point(): Invalid arguments"));
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
     return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QPointF(x, y)));
@@ -1218,7 +1218,7 @@ QScriptValue QDeclarativeEnginePrivate::point(QScriptContext *ctxt, QScriptEngin
 QScriptValue QDeclarativeEnginePrivate::size(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.size(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.size(): Invalid arguments"));
     qsreal w = ctxt->argument(0).toNumber();
     qsreal h = ctxt->argument(1).toNumber();
     return QDeclarativeEnginePrivate::get(engine)->scriptValueFromVariant(qVariantFromValue(QSizeF(w, h)));
@@ -1227,7 +1227,7 @@ QScriptValue QDeclarativeEnginePrivate::size(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 1 && ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.lighter(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.lighter(): Invalid arguments"));
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
     if (v.userType() == QVariant::Color)
@@ -1249,7 +1249,7 @@ QScriptValue QDeclarativeEnginePrivate::lighter(QScriptContext *ctxt, QScriptEng
 QScriptValue QDeclarativeEnginePrivate::darker(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 1 && ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.darker(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.darker(): Invalid arguments"));
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
     if (v.userType() == QVariant::Color)
@@ -1282,7 +1282,7 @@ QScriptValue QDeclarativeEnginePrivate::desktopOpenUrl(QScriptContext *ctxt, QSc
 QScriptValue QDeclarativeEnginePrivate::fontFamilies(QScriptContext *ctxt, QScriptEngine *e)
 {
     if(ctxt->argumentCount() != 0)
-        return ctxt->throwError("Qt.fontFamilies(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.fontFamilies(): Invalid arguments"));
 
     QDeclarativeEnginePrivate *p = QDeclarativeEnginePrivate::get(e);
     QFontDatabase database;
@@ -1292,7 +1292,7 @@ QScriptValue QDeclarativeEnginePrivate::fontFamilies(QScriptContext *ctxt, QScri
 QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1)
-        return ctxt->throwError("Qt.md5(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.md5(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
     QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5);
@@ -1303,7 +1303,7 @@ QScriptValue QDeclarativeEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1) 
-        return ctxt->throwError("Qt.btoa(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.btoa(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
 
@@ -1313,7 +1313,7 @@ QScriptValue QDeclarativeEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine
 QScriptValue QDeclarativeEnginePrivate::atob(QScriptContext *ctxt, QScriptEngine *)
 {
     if (ctxt->argumentCount() != 1) 
-        return ctxt->throwError("Qt.atob(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.atob(): Invalid arguments"));
 
     QByteArray data = ctxt->argument(0).toString().toUtf8();
 
@@ -1414,7 +1414,7 @@ QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptE
 QScriptValue QDeclarativeEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() != 2)
-        return ctxt->throwError("Qt.tint(): Invalid arguments");
+        return ctxt->throwError(QLatin1String("Qt.tint(): Invalid arguments"));
     //get color
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index ffed14e..c980a2a 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -78,8 +78,9 @@ QT_BEGIN_NAMESPACE
     \endcode
 */
 
-struct QDeclarativeInfoPrivate
+class QDeclarativeInfoPrivate
 {
+public:
     QDeclarativeInfoPrivate() : ref (1), object(0) {}
 
     int ref;
-- 
cgit v0.12


From ac0b3eec9fbf25fb72d5368fa7ba31b58bb7ed30 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 09:46:49 +1000
Subject: Doc: more clarification of cacheBuffer

---
 src/declarative/graphicsitems/qdeclarativegridview.cpp | 3 +++
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index ef6d3df..869826c 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1415,6 +1415,9 @@ void QDeclarativeGridView::setWrapEnabled(bool wrap)
     set to 40, then up to 2 delegates above and 2 delegates below the visible
     area may be retained.
 
+    Note that cacheBuffer is not a pixel buffer - it only maintains additional
+    instantiated delegates.
+
     Setting this value can make scrolling the list smoother at the expense
     of additional memory usage.  It is not a substitute for creating efficient
     delegates; the fewer elements in a delegate, the faster a view may be
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 8485071..0811278 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1848,6 +1848,9 @@ void QDeclarativeListView::setWrapEnabled(bool wrap)
     set to 40, then up to 2 delegates above and 2 delegates below the visible
     area may be retained.
 
+    Note that cacheBuffer is not a pixel buffer - it only maintains additional
+    instantiated delegates.
+
     Setting this value can make scrolling the list smoother at the expense
     of additional memory usage.  It is not a substitute for creating efficient
     delegates; the fewer elements in a delegate, the faster a view may be
-- 
cgit v0.12


From c13db7e74887b648960161b5f4fa04ed8dfd3e64 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 10:16:25 +1000
Subject: doc fixes

---
 doc/src/declarative/animation.qdoc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 88aca1b..6e98949 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -73,9 +73,9 @@ Rectangle {
         y: 0
         SequentialAnimation on y {
             loops: Animation.Infinite
-            NumberAnimation { to: 200-img.height; easing.type: "OutBounce"; duration: 2000 }
+            NumberAnimation { to: 200-img.height; easing.type: Easing.OutBounce; duration: 2000 }
             PauseAnimation { duration: 1000 }
-            NumberAnimation { to: 0; easing.type: "OutQuad"; duration: 1000 }
+            NumberAnimation { to: 0; easing.type: Easing.OutQuad; duration: 1000 }
         }
     }
 }
@@ -136,7 +136,7 @@ transitions: [
     Transition {
         NumberAnimation {
             properties: "x,y"
-            easing.type: "OutBounce"
+            easing.type: Easing.OutBounce
             duration: 200
         }
     }
@@ -157,7 +157,7 @@ Transition {
     SequentialAnimation {
         NumberAnimation {
             duration: 1000
-            easing.type: "OutBounce"
+            easing.type: Easing.OutBounce
             // animate myItem's x and y if they have changed in the state
             target: myItem
             properties: "x,y"
@@ -199,7 +199,7 @@ Transition {
         ParallelAnimation {
             NumberAnimation {
                 duration: 1000
-                easing.type: "OutBounce"
+                easing.type: Easing.OutBounce
                 targets: box1
                 properties: "x,y"
             }
@@ -227,7 +227,7 @@ Rectangle {
     id: redRect
     color: "red"
     width: 100; height: 100
-    Behavior on x { NumberAnimation { duration: 300; easing.type: "InOutQuad" } }
+    Behavior on x { NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } }
 }
 \endqml
 
-- 
cgit v0.12


From d6da01355fb436a04932131373579938dc4b7d8d Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 10:49:57 +1000
Subject: Compile

---
 tests/auto/declarative/declarative.pro | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 9b3b3d0..b8e33cf 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -29,7 +29,6 @@ SUBDIRS += \
            qdeclarativeitem \        # Cover
            qdeclarativelistview \    # Cover
            qdeclarativeloader \      # Cover
-           qdeclarativelayouts \     # Cover
            qdeclarativemousearea \   # Cover
            qdeclarativeparticles \   # Cover
            qdeclarativepathview \    # Cover
-- 
cgit v0.12


From c628213c5b64b50e914d173d207f4fe64629d5e2 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 10:50:04 +1000
Subject: Add QML_XHR_DUMP option

---
 src/declarative/qml/qdeclarativexmlhttprequest.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index b7e1832..94205fe 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -46,6 +46,7 @@
 #include "private/qdeclarativerefcount_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativeexpression_p.h"
+#include "qdeclarativeglobal_p.h"
 
 #include 
 #include 
@@ -94,6 +95,8 @@
 
 QT_BEGIN_NAMESPACE
 
+DEFINE_BOOL_CONFIG_OPTION(xhrDump, QML_XHR_DUMP);
+
 class DocumentImpl;
 class NodeImpl 
 {
@@ -1131,6 +1134,14 @@ void QDeclarativeXMLHttpRequest::requestFromUrl(const QUrl &url)
         }
     }
 
+    if (xhrDump()) {
+        qWarning().nospace() << "XMLHttpRequest: " << qPrintable(m_method) << " " << qPrintable(url.toString());
+        if (!m_data.isEmpty()) {
+            qWarning().nospace() << "                " 
+                                 << qPrintable(QString::fromUtf8(m_data));
+        }
+    }
+
     if (m_method == QLatin1String("GET"))
         m_network = networkAccessManager()->get(request);
     else if (m_method == QLatin1String("HEAD"))
@@ -1264,6 +1275,16 @@ void QDeclarativeXMLHttpRequest::finished()
         if (cbv.isError()) printError(cbv);
     }
     m_responseEntityBody.append(m_network->readAll());
+
+    if (xhrDump()) {
+        qWarning().nospace() << "XMLHttpRequest: RESPONSE " << qPrintable(m_url.toString());
+        if (!m_responseEntityBody.isEmpty()) {
+            qWarning().nospace() << "                " 
+                                 << qPrintable(QString::fromUtf8(m_responseEntityBody));
+        }
+    }
+
+
     m_data.clear();
     destroyNetwork();
     if (m_state < Loading) {
-- 
cgit v0.12


From 1eb430a1f1ddb3d88ec44294606b365e119b2e01 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 10:55:13 +1000
Subject: Fix autotest

---
 tests/auto/declarative/examples/tst_examples.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 058fda1..4f10a98 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -87,6 +87,7 @@ tst_examples::tst_examples()
     excludedDirs << "examples/declarative/gestures";
 
     excludedDirs << "examples/declarative/imageprovider";
+    excludedDirs << "examples/declarative/layouts/graphicsLayouts";
     excludedDirs << "demos/declarative/minehunt";
 
     excludedDirs << "doc/src/snippets/declarative/graphicswidgets";
-- 
cgit v0.12


From 4b0c60c6246fb7aacea3d74787a9e5a0cc507edd Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 11:00:51 +1000
Subject: Add missing test file.

---
 .../qdeclarativevisualdatamodel/data/objectlist.qml      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml

diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml b/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
new file mode 100644
index 0000000..f5198c9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+
+ListView {
+    width: 100
+    height: 100
+    anchors.fill: parent
+    model: myModel
+    delegate: Component {
+        Rectangle {
+            height: 25
+            width: 100
+            color: model.modelData.color
+            Text { objectName: "name"; text: name }
+        }
+    }
+}
-- 
cgit v0.12


From c16cc8c4d03cb062c5164295cad75509ec31feaf Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 11:16:45 +1000
Subject: Use enum for drag.axis in doc and examples.

---
 demos/declarative/flickr/common/Slider.qml              | 2 +-
 doc/src/snippets/declarative/drag.qml                   | 2 +-
 examples/declarative/dial/dial-example.qml              | 2 +-
 examples/declarative/mousearea/mouse.qml                | 2 +-
 examples/declarative/slideswitch/content/Switch.qml     | 2 +-
 examples/declarative/velocity/Day.qml                   | 2 +-
 src/declarative/graphicsitems/qdeclarativemousearea.cpp | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demos/declarative/flickr/common/Slider.qml b/demos/declarative/flickr/common/Slider.qml
index 4da370e..76f6303 100644
--- a/demos/declarative/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/common/Slider.qml
@@ -29,7 +29,7 @@ Item {
 
         MouseArea {
             anchors.fill: parent; drag.target: parent
-            drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: slider.xMax+2
+            drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: slider.xMax+2
             onPositionChanged: { value = (maximum - minimum) * (handle.x-2) / slider.xMax + minimum; }
         }
     }
diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml
index 9465efb..79469e3 100644
--- a/doc/src/snippets/declarative/drag.qml
+++ b/doc/src/snippets/declarative/drag.qml
@@ -9,7 +9,7 @@ Rectangle {
         MouseArea {
             anchors.fill: parent
             drag.target: pic
-            drag.axis: "XAxis"
+            drag.axis: Drag.XAxis
             drag.minimumX: 0
             drag.maximumX: blurtest.width-pic.width
         }
diff --git a/examples/declarative/dial/dial-example.qml b/examples/declarative/dial/dial-example.qml
index fd899a5..2e102b0 100644
--- a/examples/declarative/dial/dial-example.qml
+++ b/examples/declarative/dial/dial-example.qml
@@ -37,7 +37,7 @@ Rectangle {
 
             MouseArea {
                 anchors.fill: parent
-                drag.target: parent; drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: container.width - 32
+                drag.target: parent; drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: container.width - 32
             }
         }
     }
diff --git a/examples/declarative/mousearea/mouse.qml b/examples/declarative/mousearea/mouse.qml
index 67302a8..06134b7 100644
--- a/examples/declarative/mousearea/mouse.qml
+++ b/examples/declarative/mousearea/mouse.qml
@@ -33,7 +33,7 @@ Rectangle {
         MouseArea {
             anchors.fill: parent
             drag.target: parent
-            drag.axis: "XAxis"
+            drag.axis: Drag.XAxis
             drag.minimumX: 0
             drag.maximumX: 150
 
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
index 1aa7696..526a171 100644
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ b/examples/declarative/slideswitch/content/Switch.qml
@@ -45,7 +45,7 @@ Item {
 
         MouseArea {
             anchors.fill: parent
-            drag.target: knob; drag.axis: "XAxis"; drag.minimumX: 1; drag.maximumX: 78
+            drag.target: knob; drag.axis: Drag.XAxis; drag.minimumX: 1; drag.maximumX: 78
             onClicked: toggle()
             onReleased: dorelease()
         }
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index 433295b..350c1c4 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -61,7 +61,7 @@ Component {
                             id: mouse
                             anchors.fill: parent
                             drag.target: stickyPage
-                            drag.axis: "XandYAxis"
+                            drag.axis: Drag.XandYAxis
                             drag.minimumY: 0
                             drag.maximumY: page.height - 80
                             drag.minimumX: 100
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index d178107..c5a995e 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -746,7 +746,7 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag()
 /*!
     \qmlproperty Item MouseArea::drag.target
     \qmlproperty bool MouseArea::drag.active
-    \qmlproperty Axis MouseArea::drag.axis
+    \qmlproperty enumeration MouseArea::drag.axis
     \qmlproperty real MouseArea::drag.minimumX
     \qmlproperty real MouseArea::drag.maximumX
     \qmlproperty real MouseArea::drag.minimumY
@@ -757,7 +757,7 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag()
     \list
     \i \c target specifies the item to drag.
     \i \c active specifies if the target item is being currently dragged.
-    \i \c axis specifies whether dragging can be done horizontally (XAxis), vertically (YAxis), or both (XandYAxis)
+    \i \c axis specifies whether dragging can be done horizontally (Drag.XAxis), vertically (Drag.YAxis), or both (Drag.XandYAxis)
     \i the minimum and maximum properties limit how far the target can be dragged along the corresponding axes.
     \endlist
 
-- 
cgit v0.12


From 3e4116ff5337d41466904b2e381dfa74267264a8 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 12:42:36 +1000
Subject: Cleanup

---
 examples/declarative/animations/color-animation.qml      |  5 ++---
 examples/declarative/animations/property-animation.qml   |  1 -
 examples/declarative/connections/connections-example.qml |  1 -
 examples/declarative/dynamic/qml/PerspectiveItem.qml     |  3 +--
 examples/declarative/listview/dynamic.qml                | 16 +++++++---------
 examples/declarative/parallax/qml/ParallaxView.qml       | 15 +++++++--------
 examples/declarative/parallax/qml/Smiley.qml             |  3 +--
 7 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animations/color-animation.qml
index 3616a31..61737e9 100644
--- a/examples/declarative/animations/color-animation.qml
+++ b/examples/declarative/animations/color-animation.qml
@@ -31,15 +31,14 @@ Item {
     // the sun, moon, and stars
     Item {
         width: parent.width; height: 2 * parent.height
-        transformOrigin: Item.Center
         NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite }
         Image {
             source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter
-            transformOrigin: Item.Center; rotation: -3 * parent.rotation
+            rotation: -3 * parent.rotation
         }
         Image {
             source: "images/moon.png"; y: parent.height - 74; anchors.horizontalCenter: parent.horizontalCenter
-            transformOrigin: Item.Center; rotation: -parent.rotation
+            rotation: -parent.rotation
         }
         Particles {
             x: 0; y: parent.height/2; width: parent.width; height: parent.height/2
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
index 6360511..87ac8ec 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animations/property-animation.qml
@@ -26,7 +26,6 @@ Item {
     Image {
         anchors.horizontalCenter: parent.horizontalCenter
         source: "images/shadow.png"; y: smiley.minHeight + 58
-        transformOrigin: Item.Center
 
         // The scale property depends on the y position of the smiley face.
         scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
diff --git a/examples/declarative/connections/connections-example.qml b/examples/declarative/connections/connections-example.qml
index 1dd10ab..e65a280 100644
--- a/examples/declarative/connections/connections-example.qml
+++ b/examples/declarative/connections/connections-example.qml
@@ -13,7 +13,6 @@ Rectangle {
         id: image
         source: "content/bg1.jpg"
         anchors.centerIn: parent
-        transformOrigin: Item.Center
         rotation: window.angle
 
         Behavior on rotation {
diff --git a/examples/declarative/dynamic/qml/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml
index 3cbe64a..6d763c3 100644
--- a/examples/declarative/dynamic/qml/PerspectiveItem.qml
+++ b/examples/declarative/dynamic/qml/PerspectiveItem.qml
@@ -4,13 +4,12 @@ Image {
     id: tree
     property bool created: false
     property double scaleFactor: Math.max((y+height-250)*0.01, 0.3)
-    property double scaledBottom: y + (height+height*scaleFactor)/2 
+    property double scaledBottom: y + (height+height*scaleFactor)/2
     property bool onLand: scaledBottom > window.height/2
     property string image //Needed for compatibility with GenericItem
     opacity: onLand ? 1 : 0.25
     onCreatedChanged: if (created && !onLand) { tree.destroy() } else { z = scaledBottom }
     scale: scaleFactor
-    transformOrigin: "Center"
     source: image; smooth: true
     onYChanged: z = scaledBottom
 }
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 236a9c5..952f6a7 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -56,7 +56,7 @@ Rectangle {
 
         Item {
             width: container.width; height: 55
-            
+
             Column {
                 id: moveButtons
                 x: 5; width: childrenRect.width; anchors.verticalCenter: parent.verticalCenter
@@ -84,7 +84,7 @@ Rectangle {
                     spacing: 5
                     Repeater {
                         model: attributes
-                        Component { 
+                        Component {
                             Text { text: description; color: "White" }
                         }
                     }
@@ -95,13 +95,12 @@ Rectangle {
                 id: itemButtons
 
                 anchors { right: removeButton.left; rightMargin: 35; verticalCenter: parent.verticalCenter }
-                width: childrenRect.width 
+                width: childrenRect.width
                 spacing: 10
 
                 Image {
                     source: "content/pics/list-add.png"
                     scale: clickUp.isPressed ? 0.9 : 1
-                    transformOrigin: Item.Center
 
                     ClickAutoRepeating {
                         id: clickUp
@@ -115,9 +114,8 @@ Rectangle {
                 Image {
                     source: "content/pics/list-remove.png"
                     scale: clickDown.isPressed ? 0.9 : 1
-                    transformOrigin: Item.Center
 
-                    ClickAutoRepeating { 
+                    ClickAutoRepeating {
                         id: clickDown
                         anchors.fill: parent
                         onClicked: fruitModel.setProperty(index, "cost", Math.max(0,cost-0.25))
@@ -158,7 +156,7 @@ Rectangle {
         }
         transitions: Transition {
             NumberAnimation { properties: "opacity"; duration: 400 }
-        } 
+        }
     }
 
     Row {
@@ -198,10 +196,10 @@ Rectangle {
             }
         }
 
-        Image { 
+        Image {
             source: "content/pics/archive-remove.png"
 
-            MouseArea { 
+            MouseArea {
                 anchors.fill: parent
                 onClicked: fruitModel.clear()
             }
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
index 4b38d45..e869a21 100644
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/parallax/qml/ParallaxView.qml
@@ -18,9 +18,9 @@ Item {
         id: list
 
         currentIndex: root.currentIndex
-        onCurrentIndexChanged: root.currentIndex = currentIndex 
+        onCurrentIndexChanged: root.currentIndex = currentIndex
 
-        orientation: "Horizontal"
+        orientation: Qt.Horizontal
         boundsBehavior: Flickable.DragOverBounds
         anchors.fill: parent
         model: VisualItemModel { id: visualModel }
@@ -45,10 +45,10 @@ Item {
         anchors.horizontalCenter: parent.horizontalCenter
         width: Math.min(count * 50, parent.width - 20)
         interactive: width == parent.width - 20
-        orientation: "Horizontal"
+        orientation: Qt.Horizontal
 
-        delegate: Item { 
-            width: 50; height: 50 
+        delegate: Item {
+            width: 50; height: 50
             id: delegateRoot
 
             Image {
@@ -56,7 +56,6 @@ Item {
                 source: modelData.icon
                 smooth: true
                 scale: 0.8
-                transformOrigin: "Center"
             }
 
             MouseArea {
@@ -64,10 +63,10 @@ Item {
                 onClicked: { root.currentIndex = index }
             }
 
-            states: State { 
+            states: State {
                 name: "Selected"
                 when: delegateRoot.ListView.isCurrentItem == true
-                PropertyChanges { 
+                PropertyChanges {
                     target: image
                     scale: 1
                     y: -5
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
index cfa4fed..662addc 100644
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ b/examples/declarative/parallax/qml/Smiley.qml
@@ -8,7 +8,6 @@ Item {
     Image {
         anchors.horizontalCenter: parent.horizontalCenter
         source: "../pics/shadow.png"; y: smiley.minHeight + 58
-        transformOrigin: Item.Center
 
         // The scale property depends on the y position of the smiley face.
         scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
@@ -32,7 +31,7 @@ Item {
                 from: smiley.minHeight; to: smiley.maxHeight
                 easing.type: Easing.OutExpo; duration: 300
             }
-            
+
             // Then move back to minHeight in 1 second, using the OutBounce easing function
             NumberAnimation {
                 from: smiley.maxHeight; to: smiley.minHeight
-- 
cgit v0.12


From e909d9a200c7a75dc23542f4603ce86fdc135bab Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 13:11:48 +1000
Subject: Cleanup

---
 demos/declarative/snake/snake.qml                         | 6 +++---
 demos/declarative/webbrowser/content/FlickableWebView.qml | 6 +++---
 doc/src/declarative/elements.qdoc                         | 1 +
 examples/declarative/fonts/fonts.qml                      | 6 +++---
 examples/declarative/listview/sections.qml                | 2 +-
 examples/declarative/webview/alerts.qml                   | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 47bced4..bc4a974 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -60,7 +60,7 @@ Rectangle {
         Image {
             id: title
             source: "content/pics/snake.jpg"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
             anchors.fill: parent
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
@@ -69,7 +69,7 @@ Rectangle {
             Text {
                 color: "white"
                 font.pointSize: 24
-                horizontalAlignment: "AlignHCenter"
+                horizontalAlignment: Text.AlignHCenter
                 text: "Last Score:\t" + lastScore + "\nHighscore:\t" + highScores.topScore;
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.bottom: parent.bottom
@@ -78,7 +78,7 @@ Rectangle {
         }
 
         source: "content/pics/background.png"
-        fillMode: "PreserveAspectCrop"
+        fillMode: Image.PreserveAspectCrop
 
         anchors.left: parent.left
         anchors.right: parent.right
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 46f45e0..50ea97d 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -105,14 +105,14 @@ Flickable {
                     property: "scale"
                     from: 1
                     to: 0 // set before calling
-                    easing.type: "Linear"
+                    easing.type: Easing.Linear
                     duration: 200
                 }
                 NumberAnimation {
                     id: flickVX
                     target: flickable
                     property: "contentX"
-                    easing.type: "Linear"
+                    easing.type: Easing.Linear
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
@@ -121,7 +121,7 @@ Flickable {
                     id: flickVY
                     target: flickable
                     property: "contentY"
-                    easing.type: "Linear"
+                    easing.type: Easing.Linear
                     duration: 200
                     from: 0 // set before calling
                     to: 0 // set before calling
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 79fe909..1dbc51b 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -142,6 +142,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \o \l Loader
 \o \l Repeater
 \o \l SystemPalette
+\o \l FontLoader
 \o \l LayoutItem
 \endlist
 
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index ae31b03..f3eac48 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -51,9 +51,9 @@ Rectangle {
         }
         Text {
             text: {
-                if (webFont.status == 1) myText
-                else if (webFont.status == 2) "Loading..."
-                else if (webFont.status == 3) "Error loading font"
+                if (webFont.status == FontLoader.Ready) myText
+                else if (webFont.status == FontLoader.Loading) "Loading..."
+                else if (webFont.status == FontLoader.Error) "Error loading font"
             }
             color: "lightsteelblue"
             width: parent.width
diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml
index 0a81f63..21f9f03 100644
--- a/examples/declarative/listview/sections.qml
+++ b/examples/declarative/listview/sections.qml
@@ -61,7 +61,7 @@ Rectangle {
             height: 20
             Text {
                 x: 2; height: parent.height
-                verticalAlignment: 'AlignVCenter'
+                verticalAlignment: Text.AlignVCenter
                 text: section
                 font.bold: true
             }
diff --git a/examples/declarative/webview/alerts.qml b/examples/declarative/webview/alerts.qml
index 6a5a0d2..7684c3e 100644
--- a/examples/declarative/webview/alerts.qml
+++ b/examples/declarative/webview/alerts.qml
@@ -52,7 +52,7 @@ WebView {
             font.pixelSize: 20
             width: webView.width*0.75
             wrapMode: Text.WordWrap
-            horizontalAlignment: "AlignHCenter"
+            horizontalAlignment: Text.AlignHCenter
         }
     }
 }
-- 
cgit v0.12


From 2dfa4fbcdc901b8cdd8df0087ecf5e3fa2523603 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 14:14:36 +1000
Subject: More cleanup

---
 demos/declarative/flickr/mobile/GridDelegate.qml       |  2 +-
 demos/declarative/flickr/mobile/ImageDetails.qml       | 12 ++++++++----
 demos/declarative/twitter/TwitterCore/FatDelegate.qml  |  2 +-
 demos/declarative/twitter/TwitterCore/HomeTitleBar.qml |  2 +-
 examples/declarative/listview/dynamic.qml              |  2 +-
 examples/declarative/listview/itemlist.qml             |  4 ++--
 examples/declarative/listview/listview-example.qml     |  4 ++--
 examples/declarative/scrollbar/ScrollBar.qml           | 16 ++++++++--------
 examples/declarative/scrollbar/display.qml             |  4 ++--
 9 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index eccdc34..df608bc 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -38,7 +38,7 @@
 
              states: [
                  State {
-                     name: "Show"; when: thumb.status == 1
+                     name: "Show"; when: thumb.status == Image.Ready
                      PropertyChanges { target: scaleMe; scale: 1 }
                  },
                  State {
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index 310c9df..caf1571 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -54,7 +54,11 @@ Flipable {
 
         Rectangle { anchors.fill: parent; color: "black"; opacity: 0.4 }
 
-        Common.Progress { anchors.centerIn: parent; width: 200; height: 18; progress: bigImage.progress; visible: bigImage.status!=1 }
+        Common.Progress {
+            anchors.centerIn: parent; width: 200; height: 18
+            progress: bigImage.progress; visible: bigImage.status != Image.Ready
+        }
+
         Flickable {
             id: flickable; anchors.fill: parent; clip: true
             contentWidth: imageContainer.width; contentHeight: imageContainer.height
@@ -69,7 +73,7 @@ Flipable {
                     anchors.centerIn: parent; smooth: !flickable.moving
                     onStatusChanged : {
                         // Default scale shows the entire image.
-                        if (status == 1 && width != 0) {
+                        if (status == Image.Ready && width != 0) {
                             slider.minimum = Math.min(flickable.width / width, flickable.height / height);
                             prevScale = Math.min(slider.minimum, 1);
                             slider.value = prevScale;
@@ -81,12 +85,12 @@ Flipable {
 
         Text {
             text: "Image Unavailable"
-            visible: bigImage.status == 'Error'
+            visible: bigImage.status == Image.Error
             anchors.centerIn: parent; color: "white"; font.bold: true
         }
 
         Common.Slider {
-            id: slider; visible: { bigImage.status == 1 && maximum > minimum }
+            id: slider; visible: { bigImage.status == Image.Ready && maximum > minimum }
             anchors {
                 bottom: parent.bottom; bottomMargin: 65
                 left: parent.left; leftMargin: 25
diff --git a/demos/declarative/twitter/TwitterCore/FatDelegate.qml b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
index 62ee11a..72e5ecc 100644
--- a/demos/declarative/twitter/TwitterCore/FatDelegate.qml
+++ b/demos/declarative/twitter/TwitterCore/FatDelegate.qml
@@ -27,7 +27,7 @@ Component {
                 id: whiteRect; x: 6; width: 50; height: 50; color: "white"; smooth: true
                 anchors.verticalCenter: parent.verticalCenter
 
-                Loading { x: 1; y: 1; width: 48; height: 48; visible: realImage.status != 1 }
+                Loading { x: 1; y: 1; width: 48; height: 48; visible: realImage.status != Image.Ready }
                 Image { id: realImage; source: userImage; x: 1; y: 1; width:48; height:48 }
             }
             Text { id:txt; y:4; x: 56
diff --git a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
index 11aa74f..26ad1a9 100644
--- a/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
+++ b/demos/declarative/twitter/TwitterCore/HomeTitleBar.qml
@@ -37,7 +37,7 @@ Item {
             UserModel { user: rssModel.authName; id: userModel }
             Component { id: imgDelegate;
                 Item {
-                    Loading { width:48; height:48; visible: realImage.status != 1 }
+                    Loading { width:48; height:48; visible: realImage.status != Image.Ready }
                     Image { source: image; width:48; height:48; id: realImage }
                 }
             }
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 952f6a7..9b05ad5 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -145,7 +145,7 @@ Rectangle {
 
         width: 8; height: view.height; anchors.right: view.right
         opacity: 0
-        orientation: "Vertical"
+        orientation: Qt.Vertical
         position: view.visibleArea.yPosition
         pageSize: view.visibleArea.heightRatio
 
diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml
index e387f28..b73b3a3 100644
--- a/examples/declarative/listview/itemlist.qml
+++ b/examples/declarative/listview/itemlist.qml
@@ -33,7 +33,7 @@ Rectangle {
         anchors { fill: parent; bottomMargin: 30 }
         model: itemModel
         preferredHighlightBegin: 0; preferredHighlightEnd: 0
-        highlightRangeMode: "StrictlyEnforceRange"
+        highlightRangeMode: ListView.StrictlyEnforceRange
         orientation: ListView.Horizontal
         snapMode: ListView.SnapOneItem; flickDeceleration: 2000
     }
@@ -55,7 +55,7 @@ Rectangle {
                     radius: 3
                     color: view.currentIndex == index ? "blue" : "white"
 
-                    MouseArea { 
+                    MouseArea {
                         width: 20; height: 20
                         anchors.centerIn: parent
                         onClicked: view.currentIndex = index
diff --git a/examples/declarative/listview/listview-example.qml b/examples/declarative/listview/listview-example.qml
index 6feedf6..2e8cdda 100644
--- a/examples/declarative/listview/listview-example.qml
+++ b/examples/declarative/listview/listview-example.qml
@@ -75,7 +75,7 @@ Rectangle {
         highlight: petHighlight
         currentIndex: list1.currentIndex
         preferredHighlightBegin: 80; preferredHighlightEnd: 220
-        highlightRangeMode: "ApplyRange"
+        highlightRangeMode: ListView.ApplyRange
     }
 
     ListView {
@@ -87,7 +87,7 @@ Rectangle {
         highlight: Rectangle { color: "lightsteelblue" }
         currentIndex: list1.currentIndex
         preferredHighlightBegin: 125; preferredHighlightEnd: 125
-        highlightRangeMode: "StrictlyEnforceRange"
+        highlightRangeMode: ListView.StrictlyEnforceRange
         flickDeceleration: 1000
     }
 }
diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml
index 5433156..c628a20 100644
--- a/examples/declarative/scrollbar/ScrollBar.qml
+++ b/examples/declarative/scrollbar/ScrollBar.qml
@@ -7,26 +7,26 @@ Item {
     // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
     // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
     // of the height of the view.
-    // orientation can be either 'Vertical' or 'Horizontal'
+    // orientation can be either Qt.Vertical or Qt.Horizontal
     property real position
     property real pageSize
-    property variant orientation : "Vertical"
+    property variant orientation : Qt.Vertical
 
     // A light, semi-transparent background
     Rectangle {
         id: background
         anchors.fill: parent
-        radius: orientation == 'Vertical' ? (width/2 - 1) : (height/2 - 1)
+        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
         color: "white"
         opacity: 0.3
     }
     // Size the bar to the required size, depending upon the orientation.
     Rectangle {
-        x: orientation == 'Vertical' ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
-        y: orientation == 'Vertical' ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
-        width: orientation == 'Vertical' ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
-        height: orientation == 'Vertical' ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
-        radius: orientation == 'Vertical' ? (width/2 - 1) : (height/2 - 1)
+        x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
+        y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
+        width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
+        height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
+        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
         color: "black"
         opacity: 0.7
     }
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index cb1da16..b8a5e36 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -37,7 +37,7 @@ Rectangle {
         width: 12; height: view.height-12
         anchors.right: view.right
         opacity: 0
-        orientation: "Vertical"
+        orientation: Qt.Vertical
         position: view.visibleArea.yPosition
         pageSize: view.visibleArea.heightRatio
     }
@@ -47,7 +47,7 @@ Rectangle {
         width: view.width-12; height: 12
         anchors.bottom: view.bottom
         opacity: 0
-        orientation: "Horizontal"
+        orientation: Qt.Horizontal
         position: view.visibleArea.xPosition
         pageSize: view.visibleArea.widthRatio
     }
-- 
cgit v0.12


From f95a53ec1f88f819424aa3e894f91c1b875fd749 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Thu, 6 May 2010 14:29:27 +1000
Subject: Make sure to call base class implementation.

---
 src/declarative/graphicsitems/qdeclarativepainteditem.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index 6430fae..ce9b69f 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -210,6 +210,7 @@ void QDeclarativePaintedItem::geometryChanged(const QRectF &newGeometry,
     if (newGeometry.width() != oldGeometry.width() ||
         newGeometry.height() != oldGeometry.height())
         clearCache();
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
 }
 
 QVariant QDeclarativePaintedItem::itemChange(GraphicsItemChange change,
-- 
cgit v0.12


From 3323eb86586240d8ddcde985d052478809a6bffb Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 15:01:36 +1000
Subject: TextInput echoMode doc.

---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index a1fa8c6..9ae4e1a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -706,14 +706,15 @@ bool QDeclarativeTextInput::hasAcceptableInput() const
 }
 
 /*!
-    \qmlproperty TextInput.EchoMode TextInput::echoMode
+    \qmlproperty enumeration TextInput::echoMode
 
     Specifies how the text should be displayed in the TextInput.
-    The default is Normal, which displays the text as it is. Other values
-    are Password, which displays asterixes instead of characters, NoEcho,
-    which displays nothing, and PasswordEchoOnEdit, which displays all but the
-    current character as asterixes.
-
+    \list
+    \o TextInput.Normal - Displays the text as it is. (Default)
+    \o TextInput.Password - Displays asterixes instead of characters.
+    \o TextInput.NoEcho - Displays nothing.
+    \o TextInput.PasswordEchoOnEdit - Displays all but the current character as asterixes.
+    \endlist
 */
 QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode() const
 {
@@ -1084,7 +1085,7 @@ void QDeclarativeTextInput::setPasswordCharacter(const QString &str)
    \qmlproperty string TextInput::displayText
 
    This is the text displayed in the TextInput.
-   
+
    If \l echoMode is set to TextInput::Normal, this holds the
    same value as the TextInput::text property. Otherwise,
    this property holds the text visible to the user, while
-- 
cgit v0.12


From d0a56df355cebc60176c3f449c1aee7bafd5562b Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 15:52:38 +1000
Subject: qdoc fixes

---
 src/declarative/graphicsitems/qdeclarativegridview.cpp       |  4 ++--
 src/declarative/graphicsitems/qdeclarativeitem.cpp           |  2 +-
 src/declarative/graphicsitems/qdeclarativelistview.cpp       |  4 ++--
 src/declarative/graphicsitems/qdeclarativepathview.cpp       |  4 ++--
 src/declarative/graphicsitems/qdeclarativetextedit.cpp       |  2 +-
 .../graphicsitems/qdeclarativevisualitemmodel.cpp            |  2 +-
 src/declarative/util/qdeclarativeanimation.cpp               | 12 ++++++------
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 869826c..0094213 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1054,7 +1054,7 @@ void QDeclarativeGridView::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty component GridView::delegate
+    \qmlproperty Component GridView::delegate
 
     The delegate provides a template defining each item instantiated by the view.
     The index is exposed as an accessible \c index property.  Properties of the
@@ -1172,7 +1172,7 @@ int QDeclarativeGridView::count() const
 }
 
 /*!
-  \qmlproperty component GridView::highlight
+  \qmlproperty Component GridView::highlight
   This property holds the component to use as the highlight.
 
   An instance of the highlight component will be created for each view.
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 0395766..9433ba0 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -720,7 +720,7 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
 */
 
 /*!
-    \qmlproperty List Keys::forwardTo
+    \qmlproperty list Keys::forwardTo
 
     This property provides a way to forward key presses, key releases, and keyboard input
     coming from input methods to other items. This can be useful when you want
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 0811278..cff345e 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1488,7 +1488,7 @@ void QDeclarativeListView::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty component ListView::delegate
+    \qmlproperty Component ListView::delegate
 
     The delegate provides a template defining each item instantiated by the view.
     The index is exposed as an accessible \c index property.  Properties of the
@@ -1608,7 +1608,7 @@ int QDeclarativeListView::count() const
 }
 
 /*!
-    \qmlproperty component ListView::highlight
+    \qmlproperty Component ListView::highlight
     This property holds the component to use as the highlight.
 
     An instance of the highlight component will be created for each list.
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 5c3a3c0..040fc98 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -561,7 +561,7 @@ void QDeclarativePathViewPrivate::setOffset(qreal o)
 }
 
 /*!
-    \qmlproperty component PathView::highlight
+    \qmlproperty Component PathView::highlight
     This property holds the component to use as the highlight.
 
     An instance of the highlight component will be created for each view.
@@ -790,7 +790,7 @@ void QDeclarativePathView::setInteractive(bool interactive)
 }
 
 /*!
-    \qmlproperty component PathView::delegate
+    \qmlproperty Component PathView::delegate
 
     The delegate provides a template defining each item instantiated by the view.
     The index is exposed as an accessible \c index property.  Properties of the
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index d0ee2ee..d095dbe 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -728,7 +728,7 @@ void QDeclarativeTextEdit::setPersistentSelection(bool on)
 }
 
 /*
-   \qmlproperty number TextEdit::textMargin
+   \qmlproperty real TextEdit::textMargin
 
    The margin, in pixels, around the text in the TextEdit.
 */
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index f01d4c2..306443b 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -759,7 +759,7 @@ void QDeclarativeVisualDataModel::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty component VisualDataModel::delegate
+    \qmlproperty Component VisualDataModel::delegate
 
     The delegate provides a template defining each item instantiated by a view.
     The index is exposed as an accessible \c index property.  Properties of the
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 206621b..0f7c946 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -755,7 +755,7 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script)
 }
 
 /*!
-    \qmlproperty QString ScriptAction::scriptName
+    \qmlproperty string ScriptAction::scriptName
     This property holds the the name of the StateChangeScript to run.
 
     This property is only valid when ScriptAction is used as part of a transition.
@@ -791,7 +791,7 @@ void QDeclarativeScriptActionPrivate::execute()
         if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
             expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
         expr.evaluate();
-        if (expr.hasError()) 
+        if (expr.hasError())
             qmlInfo(q) << expr.error();
     }
 }
@@ -844,7 +844,7 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
 
     The PropertyAction is immediate -
     the target property is not animated to the selected value in any way.
-    
+
     \sa QtDeclarative
 */
 /*!
@@ -2347,7 +2347,7 @@ QDeclarativeParentAnimation::~QDeclarativeParentAnimation()
 }
 
 /*!
-    \qmlproperty item ParentAnimation::target
+    \qmlproperty Item ParentAnimation::target
     The item to reparent.
 
     When used in a transition, if no target is specified all
@@ -2370,7 +2370,7 @@ void QDeclarativeParentAnimation::setTarget(QDeclarativeItem *target)
 }
 
 /*!
-    \qmlproperty item ParentAnimation::newParent
+    \qmlproperty Item ParentAnimation::newParent
     The new parent to animate to.
 
     If not set, then the parent defined in the end state of the transition.
@@ -2392,7 +2392,7 @@ void QDeclarativeParentAnimation::setNewParent(QDeclarativeItem *newParent)
 }
 
 /*!
-    \qmlproperty item ParentAnimation::via
+    \qmlproperty Item ParentAnimation::via
     The item to reparent via. This provides a way to do an unclipped animation
     when both the old parent and new parent are clipped
 
-- 
cgit v0.12


From bf965a3b74a10636a63f72d72ad41e169a9851e3 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 6 May 2010 16:16:08 +1000
Subject: Avoid warnings as delegates with bindings to parent are created and
 destroyed.

Task-number: QTBUG-10359
---
 src/declarative/graphicsitems/qdeclarativegridview.cpp  |  4 +++-
 src/declarative/graphicsitems/qdeclarativelistview.cpp  |  4 +++-
 .../graphicsitems/qdeclarativevisualitemmodel.cpp       |  8 ++++++++
 src/declarative/qml/qdeclarativecontext.cpp             | 17 +++++++++++------
 src/declarative/qml/qdeclarativecontext_p.h             |  1 +
 src/declarative/qml/qdeclarativeengine.cpp              |  4 +++-
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 869826c..75b9d3c 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -378,9 +378,11 @@ FxGridItem *QDeclarativeGridViewPrivate::createItem(int modelIndex)
         if (model->completePending()) {
             // complete
             listItem->item->setZValue(1);
+            listItem->item->setParentItem(q->viewport());
             model->completeItem();
+        } else {
+            listItem->item->setParentItem(q->viewport());
         }
-        listItem->item->setParentItem(q->viewport());
         unrequestedItems.remove(listItem->item);
     }
     requestedIndex = -1;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 0811278..064a33f 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -573,9 +573,11 @@ FxListItem *QDeclarativeListViewPrivate::createItem(int modelIndex)
         if (model->completePending()) {
             // complete
             listItem->item->setZValue(1);
+            listItem->item->setParentItem(q->viewport());
             model->completeItem();
+        } else {
+            listItem->item->setParentItem(q->viewport());
         }
-        listItem->item->setParentItem(q->viewport());
         QDeclarativeItemPrivate *itemPrivate = static_cast(QGraphicsItemPrivate::get(item));
         itemPrivate->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
         if (sectionCriteria && sectionCriteria->delegate()) {
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index f01d4c2..c6a6b81 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -44,6 +44,7 @@
 #include "qdeclarativeitem.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -963,6 +964,13 @@ QDeclarativeVisualDataModel::ReleaseFlags QDeclarativeVisualDataModel::release(Q
     }
 
     if (d->m_cache.releaseItem(obj)) {
+        // Remove any bindings to avoid warnings due to parent change.
+        QObjectPrivate *p = QObjectPrivate::get(obj);
+        Q_ASSERT(p->declarativeData);
+        QDeclarativeData *d = static_cast(p->declarativeData);
+        if (d->ownContext && d->context)
+            d->context->clearExpressions();
+
         if (inPackage) {
             emit destroyingPackage(qobject_cast(obj));
         } else {
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index ae4223e..b61b8cb 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -528,13 +528,8 @@ void QDeclarativeContextData::invalidate()
     parent = 0;
 }
 
-void QDeclarativeContextData::destroy()
+void QDeclarativeContextData::clearExpressions()
 {
-    if (linkedContext) 
-        linkedContext->destroy();
-
-    if (engine) invalidate();
-
     QDeclarativeAbstractExpression *expression = expressions;
     while (expression) {
         QDeclarativeAbstractExpression *nextExpression = expression->m_nextExpression;
@@ -546,6 +541,16 @@ void QDeclarativeContextData::destroy()
         expression = nextExpression;
     }
     expressions = 0;
+}
+
+void QDeclarativeContextData::destroy()
+{
+    if (linkedContext) 
+        linkedContext->destroy();
+
+    if (engine) invalidate();
+
+    clearExpressions();
 
     while (contextObjects) {
         QDeclarativeData *co = contextObjects;
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index c7fb099..6b6cd0a 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -113,6 +113,7 @@ class QDeclarativeContextData
 public:
     QDeclarativeContextData();
     QDeclarativeContextData(QDeclarativeContext *);
+    void clearExpressions();
     void destroy();
     void invalidate();
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index cc6c5fe..9f5cafe 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -329,8 +329,10 @@ void QDeclarativePrivate::qdeclarativeelement_destructor(QObject *o)
     QObjectPrivate *p = QObjectPrivate::get(o);
     Q_ASSERT(p->declarativeData);
     QDeclarativeData *d = static_cast(p->declarativeData);
-    if (d->ownContext)
+    if (d->ownContext && d->context) {
         d->context->destroy();
+        d->context = 0;
+    }
 }
 
 void QDeclarativeData::destroyed(QAbstractDeclarativeData *d, QObject *o)
-- 
cgit v0.12


From d1ab59da5de38ce0df0e6b9961fc5bf6580e5607 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 6 May 2010 17:04:55 +1000
Subject: qdoc fixes.

---
 doc/src/declarative/elements.qdoc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 1dbc51b..574a187 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -120,11 +120,22 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
 \list
 \o \l Item
 \o \l Rectangle
+    \list
+    \o \l Gradient
+        \list
+        \o \l GradientStop
+        \endlist
+    \endlist
 \o \l Image
 \o \l BorderImage
 \o \l AnimatedImage
 \o \l Text
 \o \l TextInput
+    \list
+    \o \l IntValidator
+    \o \l DoubleValidator
+    \o \l RegExpValidator
+    \endlist
 \o \l TextEdit
 \endlist
 
-- 
cgit v0.12


From a0ff96a8fd1cbf1206afd12e0062949fa035f64f Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 6 May 2010 17:42:53 +1000
Subject: Call QDeclarativeItem::geometryChanged() base implementation

---
 src/declarative/graphicsitems/qdeclarativepainteditem.cpp   |  2 ++
 .../qdeclarativetextedit/data/geometrySignals.qml           | 12 ++++++++++++
 .../qdeclarativetextedit/tst_qdeclarativetextedit.cpp       | 13 ++++++++++++-
 .../qdeclarativetextinput/data/geometrySignals.qml          | 12 ++++++++++++
 .../qdeclarativetextinput/tst_qdeclarativetextinput.cpp     | 11 +++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml
 create mode 100644 tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml

diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index 6430fae..c4f0b86 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -210,6 +210,8 @@ void QDeclarativePaintedItem::geometryChanged(const QRectF &newGeometry,
     if (newGeometry.width() != oldGeometry.width() ||
         newGeometry.height() != oldGeometry.height())
         clearCache();
+
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
 }
 
 QVariant QDeclarativePaintedItem::itemChange(GraphicsItemChange change,
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml b/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml
new file mode 100644
index 0000000..b39ba5b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml
@@ -0,0 +1,12 @@
+import Qt 4.7
+
+Item {
+    width: 400; height: 500;
+    property int bindingWidth: text.width
+    property int bindingHeight: text.height
+
+    TextInput {
+        id: text
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 3307b7c..8cc0e3f 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -84,7 +84,7 @@ private slots:
     void navigation();
     void readOnly();
     void sendRequestSoftwareInputPanelEvent();
-
+    void geometrySignals();
 private:
     void simulateKey(QDeclarativeView *, int key);
     QDeclarativeView *createView(const QString &filename);
@@ -808,6 +808,17 @@ void tst_qdeclarativetextedit::sendRequestSoftwareInputPanelEvent()
     QApplication::processEvents();
     QCOMPARE(ic.softwareInputPanelEventReceived, true);
 }
+
+void tst_qdeclarativetextedit::geometrySignals()
+{
+    QDeclarativeComponent component(&engine, SRCDIR "/data/geometrySignals.qml");
+    QObject *o = component.create();
+    QVERIFY(o);
+    QCOMPARE(o->property("bindingWidth").toInt(), 400);
+    QCOMPARE(o->property("bindingHeight").toInt(), 500);
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativetextedit)
 
 #include "tst_qdeclarativetextedit.moc"
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml b/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml
new file mode 100644
index 0000000..a9b50fe
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml
@@ -0,0 +1,12 @@
+import Qt 4.7
+
+Item {
+    width: 400; height: 500;
+    property int bindingWidth: text.width
+    property int bindingHeight: text.height
+
+    TextEdit {
+        id: text
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 83ebe6c..0065ccf 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -76,6 +76,7 @@ private slots:
     void focusOutClearSelection();
 
     void echoMode();
+    void geometrySignals();
 private:
     void simulateKey(QDeclarativeView *, int key);
     QDeclarativeView *createView(const QString &filename);
@@ -805,6 +806,16 @@ void tst_qdeclarativetextinput::focusOutClearSelection()
     QTRY_COMPARE(input.selectedText(), QLatin1String(""));
 }
 
+void tst_qdeclarativetextinput::geometrySignals()
+{
+    QDeclarativeComponent component(&engine, SRCDIR "/data/geometrySignals.qml");
+    QObject *o = component.create();
+    QVERIFY(o);
+    QCOMPARE(o->property("bindingWidth").toInt(), 400);
+    QCOMPARE(o->property("bindingHeight").toInt(), 500);
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativetextinput)
 
 #include "tst_qdeclarativetextinput.moc"
-- 
cgit v0.12


From 4620b0fc7a48c643400a42eb9e9cc0a82ad0be9a Mon Sep 17 00:00:00 2001
From: Robin Helgelin 
Date: Wed, 21 Apr 2010 12:14:02 +0200
Subject: Keep support for maximum pending connections in derived QTcpServer

By adding a new function to the class QTcpServer it's now possible to
extend QTcpserver functionality with for instance SSL capabilities and
still keep the support for maximum pending connections.

Task-number: QTBUG-1875
Reviewed-by: Peter Hartmann
Reviewed-by: Markus Goetz
Merge-Request: 568
---
 src/network/socket/qtcpserver.cpp | 15 +++++++++++++++
 src/network/socket/qtcpserver.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index 932126d..a259eee 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -572,6 +572,21 @@ void QTcpServer::incomingConnection(int socketDescriptor)
 
     QTcpSocket *socket = new QTcpSocket(this);
     socket->setSocketDescriptor(socketDescriptor);
+    addPendingConnection(socket);
+}
+
+/*!
+    This function is called by QTcpServer::incomingConnection()
+    to add a socket to the list of pending incoming connections.
+
+    \note Don't forget to call this member from reimplemented
+    incomingConnection() if you do not want to break the
+    Pending Connections mechanism.
+
+    \sa incomingConnection()
+*/
+void QTcpServer::addPendingConnection(QTcpSocket* socket)
+{
     d_func()->pendingConnections.append(socket);
 }
 
diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h
index 7aebffe..b206678 100644
--- a/src/network/socket/qtcpserver.h
+++ b/src/network/socket/qtcpserver.h
@@ -93,6 +93,7 @@ public:
 
 protected:
     virtual void incomingConnection(int handle);
+    void addPendingConnection(QTcpSocket* socket);
 
 Q_SIGNALS:
     void newConnection();
-- 
cgit v0.12


From efb26a325dcea5e60d7801fef00e650bd028c16d Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Thu, 6 May 2010 09:57:19 +0200
Subject: QTcpServer: Fix documentation for previous commit

---
 src/network/socket/qtcpserver.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp
index a259eee..55f926d 100644
--- a/src/network/socket/qtcpserver.cpp
+++ b/src/network/socket/qtcpserver.cpp
@@ -562,7 +562,7 @@ QTcpSocket *QTcpServer::nextPendingConnection()
     to the other thread and create the QTcpSocket object there and
     use its setSocketDescriptor() method.
 
-    \sa newConnection(), nextPendingConnection()
+    \sa newConnection(), nextPendingConnection(), addPendingConnection()
 */
 void QTcpServer::incomingConnection(int socketDescriptor)
 {
@@ -584,6 +584,7 @@ void QTcpServer::incomingConnection(int socketDescriptor)
     Pending Connections mechanism.
 
     \sa incomingConnection()
+    \since 4.7
 */
 void QTcpServer::addPendingConnection(QTcpSocket* socket)
 {
-- 
cgit v0.12


From ae786d63683db1aea1a4ad7eea2c4e20d5c1752d Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara 
Date: Tue, 4 May 2010 16:03:27 +0200
Subject: isOnActiveSpace is available from 10.6.

The fix for qtcreatorbug-827 included a call to isOnActiveSpace, which
is only available from 10.6 so this patch adds a runtime check for it.
Since it is a runtime check there is no need for multiple builds.
Notice that the fix for qtcreatorbug-827 will work only on 10.6+

Task-number: QTCREATORBUG-827
Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qwidget_mac.mm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 81dd746..f12c956 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -3835,13 +3835,20 @@ void QWidgetPrivate::raise_sys()
         // required we will introduce special handling for some of them.
         if (!q->testAttribute(Qt::WA_DontShowOnScreen) && q->isVisible()) {
             OSWindowRef window = qt_mac_window_for(q);
-            if(![window isOnActiveSpace]) {
-                QWidget *parentWidget = q->parentWidget();
-                if(parentWidget) {
-                    OSWindowRef parentWindow = qt_mac_window_for(parentWidget);
-                    if(parentWindow && [parentWindow isOnActiveSpace]) {
-                        recreateMacWindow();
-                        window = qt_mac_window_for(q);
+            // isOnActiveSpace is available only from 10.6 onwards, so we need to check if it is
+            // available before calling it.
+            if([window respondsToSelector:@selector(isOnActiveSpace)]) {
+                if(![window performSelector:@selector(isOnActiveSpace)]) {
+                    QWidget *parentWidget = q->parentWidget();
+                    if(parentWidget) {
+                        OSWindowRef parentWindow = qt_mac_window_for(parentWidget);
+                        if(parentWindow && [parentWindow isOnActiveSpace]) {
+                            // The window was created in a different space. Therefore if we want
+                            // to show it in the current space we need to recreate it in the new
+                            // space.
+                            recreateMacWindow();
+                            window = qt_mac_window_for(q);
+                        }
                     }
                 }
             }
-- 
cgit v0.12


From 250f7a34d3b1e6b946f2bfc7ce69c135e426b204 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen 
Date: Thu, 6 May 2010 13:47:32 +0300
Subject: Fix thread synchronization issues in Symbian QFileSystemWatcher

In Symbian the QSymbianFileSystemWatcherEngine thread now stays running
as long as the instance is alive to avoid repeatedly stopping and
restarting the thread as watched paths are removed and added.

Also fixed issue of misreporting adding failure in cases where both
adds and removes were done in quick succession.

Task-number: QTBUG-10091
Reviewed-by: Shane Kearns
---
 src/corelib/io/qfilesystemwatcher_symbian.cpp | 63 +++++++++------------------
 src/corelib/io/qfilesystemwatcher_symbian_p.h |  6 +--
 2 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 69daae7..6136742 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian.cpp
+++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp
@@ -106,7 +106,7 @@ void QNotifyChangeEvent::DoCancel()
 }
 
 QSymbianFileSystemWatcherEngine::QSymbianFileSystemWatcherEngine() :
-        errorCode(KErrNone), watcherStarted(false)
+        watcherStarted(false)
 {
     moveToThread(this);
 }
@@ -122,11 +122,7 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
     QMutexLocker locker(&mutex);
     QStringList p = paths;
 
-    if (!startWatcher()) {
-        qWarning("Could not start QSymbianFileSystemWatcherEngine thread");
-
-        return p;
-    }
+    startWatcher();
 
     QMutableListIterator it(p);
     while (it.hasNext()) {
@@ -150,18 +146,17 @@ QStringList QSymbianFileSystemWatcherEngine::addPaths(const QStringList &paths,
             filePath += QChar(L'/');
         }
 
-        currentEvent = NULL;
+        currentAddEvent = NULL;
         QMetaObject::invokeMethod(this,
                                   "addNativeListener",
                                   Qt::QueuedConnection,
                                   Q_ARG(QString, filePath));
 
         syncCondition.wait(&mutex);
+        if (currentAddEvent) {
+            currentAddEvent->isDir = isDir;
 
-        if (currentEvent) {
-            currentEvent->isDir = isDir;
-
-            activeObjectToPath.insert(currentEvent, path);
+            activeObjectToPath.insert(currentAddEvent, path);
             it.remove();
 
             if (isDir)
@@ -185,10 +180,10 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
     while (it.hasNext()) {
         QString path = it.next();
 
-        currentEvent = activeObjectToPath.key(path);
-        if (!currentEvent)
+        currentRemoveEvent = activeObjectToPath.key(path);
+        if (!currentRemoveEvent)
             continue;
-        activeObjectToPath.remove(currentEvent);
+        activeObjectToPath.remove(currentRemoveEvent);
 
         QMetaObject::invokeMethod(this,
                                   "removeNativeListener",
@@ -202,9 +197,6 @@ QStringList QSymbianFileSystemWatcherEngine::removePaths(const QStringList &path
         directories->removeAll(path);
     }
 
-    if (activeObjectToPath.size() == 0)
-        stop();
-
     return p;
 }
 
@@ -228,44 +220,31 @@ void QSymbianFileSystemWatcherEngine::stop()
 }
 
 // This method must be called inside mutex
-bool QSymbianFileSystemWatcherEngine::startWatcher()
+void QSymbianFileSystemWatcherEngine::startWatcher()
 {
-    bool retval = true;
-
     if (!watcherStarted) {
         setStackSize(0x5000);
         start();
         syncCondition.wait(&mutex);
-
-        if (errorCode != KErrNone) {
-            retval = false;
-        } else {
-            watcherStarted = true;
-        }
+        watcherStarted = true;
     }
-    return retval;
 }
 
 
 void QSymbianFileSystemWatcherEngine::run()
 {
-    // Initialize file session
-
     mutex.lock();
     syncCondition.wakeOne();
     mutex.unlock();
 
-    if (errorCode == KErrNone) {
-        exec();
+    exec();
 
-        foreach(QNotifyChangeEvent *e, activeObjectToPath.keys()) {
-            e->Cancel();
-            delete e;
-        }
-
-        activeObjectToPath.clear();
-        watcherStarted = false;
+    foreach(QNotifyChangeEvent *e, activeObjectToPath.keys()) {
+        e->Cancel();
+        delete e;
     }
+
+    activeObjectToPath.clear();
 }
 
 void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directoryPath)
@@ -273,16 +252,16 @@ void QSymbianFileSystemWatcherEngine::addNativeListener(const QString &directory
     QMutexLocker locker(&mutex);
     QString nativeDir(QDir::toNativeSeparators(directoryPath));
     TPtrC ptr(qt_QString2TPtrC(nativeDir));
-    currentEvent = new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
+    currentAddEvent = new QNotifyChangeEvent(qt_s60GetRFs(), ptr, this, directoryPath.endsWith(QChar(L'/'), Qt::CaseSensitive));
     syncCondition.wakeOne();
 }
 
 void QSymbianFileSystemWatcherEngine::removeNativeListener()
 {
     QMutexLocker locker(&mutex);
-    currentEvent->Cancel();
-    delete currentEvent;
-    currentEvent = NULL;
+    currentRemoveEvent->Cancel();
+    delete currentRemoveEvent;
+    currentRemoveEvent = NULL;
     syncCondition.wakeOne();
 }
 
diff --git a/src/corelib/io/qfilesystemwatcher_symbian_p.h b/src/corelib/io/qfilesystemwatcher_symbian_p.h
index 7e3f045..e687a4a 100644
--- a/src/corelib/io/qfilesystemwatcher_symbian_p.h
+++ b/src/corelib/io/qfilesystemwatcher_symbian_p.h
@@ -113,14 +113,14 @@ private:
     friend class QNotifyChangeEvent;
     void emitPathChanged(QNotifyChangeEvent *e);
 
-    bool startWatcher();
+    void startWatcher();
 
     QHash activeObjectToPath;
     QMutex mutex;
     QWaitCondition syncCondition;
-    int errorCode;
     bool watcherStarted;
-    QNotifyChangeEvent *currentEvent;
+    QNotifyChangeEvent *currentAddEvent;
+    QNotifyChangeEvent *currentRemoveEvent;
 };
 
 #endif // QT_NO_FILESYSTEMWATCHER
-- 
cgit v0.12


From fdee454d73c2a1c255e8315d35df663ab726e4db Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen 
Date: Thu, 6 May 2010 14:08:07 +0200
Subject: cosmetics: change enum value

the existing values are fixed-point representations of the msvc
versions, so adhere to it.
---
 qmake/generators/win32/msvc_objectmodel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 3f60a13..97f8570 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -59,7 +59,7 @@ enum DotNET {
     NET2003 = 0x71,
     NET2005 = 0x80,
     NET2008 = 0x90,
-    NET2010 = 0x91
+    NET2010 = 0xa0
 };
 
 /*
-- 
cgit v0.12


From 1c79ac10db1cf2b413ea3872641faec134664b8e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen 
Date: Thu, 6 May 2010 14:08:46 +0200
Subject: remove extraneous return statement

---
 qmake/generators/win32/msvc_vcxproj.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp
index da93fe3..05c1511 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -89,7 +89,6 @@ bool VcxprojGenerator::writeMakefile(QTextStream &t)
         return true;
     }
     return project->isActiveConfig("build_pass");
-    return true;
 }
 
 
-- 
cgit v0.12


From 106d8714fa9e09ef7e71c71c02a226c9a91d09f2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen 
Date: Thu, 6 May 2010 14:09:34 +0200
Subject: fix qmake project file following msvc2010 addition

this is relevant only for maintainers, but still.
---
 qmake/qmake.pri | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 0163839..6e0f8a2 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -13,7 +13,8 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
            generators/xmloutput.cpp generators/win32/borland_bmake.cpp \
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
            generators/win32/msvc_vcproj.cpp \
-           generators/win32/msvc_objectmodel.cpp \
+           generators/win32/msvc_vcxproj.cpp \
+           generators/win32/msvc_objectmodel.cpp generators/win32/msbuild_objectmodel.cpp \
            generators/symbian/symbiancommon.cpp \
            generators/symbian/symmake.cpp \
            generators/symbian/symmake_abld.cpp \
@@ -24,11 +25,12 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
 
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
-           generators/win32/winmakefile.h generators/projectgenerator.h \
+           generators/win32/winmakefile.h generators/win32/mingw_make.h generators/projectgenerator.h \
            generators/makefiledeps.h generators/metamakefile.h generators/mac/pbuilder_pbx.h \
            generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
            generators/win32/msvc_vcproj.h \
-           generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+           generators/win32/msvc_vcxproj.h \
+           generators/win32/msvc_objectmodel.h generators/win32/msbuild_objectmodel.h \
            generators/symbian/symbiancommon.h \
            generators/symbian/symmake.h \
            generators/symbian/symmake_abld.h \
-- 
cgit v0.12


From 86260a117c9ce64d3dee71ab241559c0529f2ef5 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer 
Date: Thu, 6 May 2010 14:11:32 +0200
Subject: Fix syntax error in configure script

./configure: line 5883: [: missing `]'
./configure: line 5883: no: command not found

It's either
	if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then
or
	if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then
but not
	if [ "$CFG_OPENGL" = "es1" ||  "$CFG_OPENGL" = "es2" ]; then

Merge-request: 616
Reviewed-by: Oswald Buddenhagen 
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 47eec92..3ed017d 100755
--- a/configure
+++ b/configure
@@ -5880,7 +5880,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
             fi
             CFG_EGL=no
             # If QtOpenGL would be built against OpenGL ES, disable it as we can't to that if EGL is missing
-            if [ "$CFG_OPENGL" = "es1" ||  "$CFG_OPENGL" = "es2" ]; then
+            if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then
                 CFG_OPENGL=no
             fi
         fi
-- 
cgit v0.12


From 573be7e7ba19a2e826d17f5f78e272ee250831d0 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Thu, 6 May 2010 14:48:05 +0200
Subject: doc: Second attempt to begin reorganizing the top doc page.

This change actually changes the left panels. Much more to come.
---
 doc/src/frameworks-technologies/graphicsview.qdoc |  2 +-
 doc/src/overviews.qdoc                            | 13 +++++++++--
 doc/src/painting-and-printing/coordsys.qdoc       |  1 +
 doc/src/painting-and-printing/paintsystem.qdoc    |  2 +-
 tools/qdoc3/htmlgenerator.cpp                     |  3 +++
 tools/qdoc3/test/qt-html-templates.qdocconf       | 27 +++++++++--------------
 6 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 95b3182..740fcac 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -47,7 +47,7 @@
 /*!
     \page graphicsview.html
     \title The Graphics View Framework
-    \ingroup qt-gui-concepts
+    \ingroup qt-graphics
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index bc994af..b2ba3a1 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -63,9 +63,18 @@
 
 /*!
     \group qt-gui-concepts
-    \title Qt GUI Components
+    \title Qt GUI Construction
 
-    \brief The Qt components for constructing graphical user intefaces.
+    \brief The Qt components for constructing Graphical User Intefaces.
+
+    \generatelist {related}
+ */
+
+/*!
+    \group qt-graphics
+    \title Qt Graphics
+
+    \brief The Qt components for doing graphics.
 
     \generatelist {related}
  */
diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc
index 5807f57..b0ba093 100644
--- a/doc/src/painting-and-printing/coordsys.qdoc
+++ b/doc/src/painting-and-printing/coordsys.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page coordsys.html
     \title The Coordinate System
+    \ingroup qt-graphics
     \brief Information about the coordinate system used by the paint
     system.
 
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index 56b638c..b711b2f 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -61,7 +61,7 @@
 /*!
     \page paintsystem.html
     \title The Paint System
-    \ingroup qt-gui-concepts
+    \ingroup qt-graphics
     \ingroup frameworks-technologies
 
     Qt's paint system enables painting on screen and print devices
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 373fa3d..dfba368 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1243,6 +1243,8 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
                      << Atom(Atom::LineBreak);
 
+#if 0
+    // No longer used because the modeule name is a breadcrumb.
     QString fixedModule = inner->moduleName();
     if (fixedModule == "Qt3SupportLight")
         fixedModule = "Qt3Support";
@@ -1263,6 +1265,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
             subtitleText << "]";
         }
     }
+#endif    
 
     generateHeader(title, inner, marker);
     sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 1450149..8b007db 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -42,11 +42,12 @@ HTML.postheader         = " 
    \n" \
 			  "            API Lookup\n" \
 			  "          
    \n" \
 			  "           \n" \
 			  "          
    \n" \
 			  "          
    \n" \
@@ -54,20 +55,14 @@ HTML.postheader         = " 
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
 			  "          
    \n" \
-			  "            API Topics
    \n" \
+			  "            Qt Topics\n" \
 			  "          
    \n" \
 			  "              \n" \
 			  "          
    \n" \
 			  "          
    \n" \
-- 
cgit v0.12


From 6629adee4741c3a72a83316671331ac996d046a5 Mon Sep 17 00:00:00 2001
From: Simon Hausmann 
Date: Thu, 6 May 2010 14:46:38 +0200
Subject: Doc - mention vcsubdirs as a possible value for TEMPLATE

It is usually the result of using subdirs in the .pro file and then
using -tp vc to turn it into vcsubdirs.

Reviewed-by: Oswald Buddenhagen 
---
 doc/src/development/qmake-manual.qdoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 688122b..c63e96c 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -347,6 +347,7 @@
     \row    \o vcapp         \o Creates a Visual Studio Project file to build
                              an application.
     \row    \o vclib         \o Creates a Visual Studio Project file to build a library.
+    \row    \o vcsubdirs     \o Creates a Visual Studio Solution file to build projects in sub-directories.
     \endtable
 
     See the \l{qmake Tutorial} for advice on writing project files for
-- 
cgit v0.12


From fff6751d0ae61837f08874bce5ad04c4b9536894 Mon Sep 17 00:00:00 2001
From: Shane Kearns 
Date: Thu, 6 May 2010 14:02:59 +0100
Subject: Check for existance of sis file parameter to runonphone

Previously, it would skip over a non existant sis file - which could
cause invalid test results if a previous version of the sis was already
installed.
Now, it checks if the file exists and exits with an error message if
asked to install a sis file that doesn't exist.

Task-number: QTBUG-9290
Reviewed-by: Miikka Heikkinen
---
 tools/runonphone/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp
index 37e4548..885d029 100644
--- a/tools/runonphone/main.cpp
+++ b/tools/runonphone/main.cpp
@@ -102,6 +102,10 @@ int main(int argc, char *argv[])
             else if (arg == "--sis" || arg == "-s") {
                 CHECK_PARAMETER_EXISTS
                 sisFile = it.next();
+                if (!QFileInfo(sisFile).exists()) {
+                    errstream << "Sis file (" << sisFile << ") doesn't exist" << endl;
+                    return 1;
+                }
             }
             else if (arg == "--download" || arg == "-d") {
                 CHECK_PARAMETER_EXISTS
-- 
cgit v0.12


From 92c4ccd5083e7efb3357bd190c07a95db604b9eb Mon Sep 17 00:00:00 2001
From: Peter Hartmann 
Date: Thu, 6 May 2010 15:30:05 +0200
Subject: my changelog

---
 dist/changes-4.7.0 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index d156bd7..4035bfe 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -51,6 +51,10 @@ Third party components
 QtCore
 ------
 
+ - QXmlStreamReader
+    * [QTBUG-9196] fixed crash when parsing
+
+
 QtGui
 -----
 
@@ -67,6 +71,21 @@ QtGui
     * Fixed a bug that led to missing text pixels in QTabBar when using
       small font sizes. (QTBUG-7137)
 
+
+QtNetwork
+---------
+
+ - [QTBUG-8206] QNetworkAccessManager: add method to send custom requests
+ - [QTBUG-9618] [MR 2372] send secure cookies only over secure connections
+
+QtXmlPatterns
+-------------
+
+ - [QTBUG-8920] fixed crash with anonymous types in XsdSchemaChecker
+ - [QTBUG-8394] include/import/redefine schemas only once
+ - QXmlSchema: fix crash with referencing elements
+
+
 ****************************************************************************
 *                          Database Drivers                                *
 ****************************************************************************
-- 
cgit v0.12


From 7770690dc220c4e75ed1411d2adf2e819092f7f2 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Thu, 6 May 2010 15:52:07 +0200
Subject: Doc: updating html and search feature Doc: implementing the search
 feature in the online docs

Reviewed-by: Morten Engvoldsen
---
 doc/src/template/scripts/functions.js | 279 +++++++++-------------------------
 doc/src/template/style/style.css      |  31 ++--
 tools/qdoc3/htmlgenerator.cpp         |  28 +---
 3 files changed, 90 insertions(+), 248 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 800660e..4b3107f 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -3,7 +3,6 @@ $('.t_button').mouseover(function() {
     $('.t_button').css('cursor','pointer');
 		/*document.getElementById(this.id).style.cursor='pointer';*/
 });
-
 /* END non link areas  */
 $('#smallA').click(function() {
 		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller');
@@ -38,120 +37,62 @@ $('#bigA').click(function() {
 var lookupCount = 0;
 var articleCount = 0;
 var exampleCount = 0;
-var qturl = ""; // change to  0
+var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
+
 function processNokiaData(response){
+	// debug $('.content').prepend('
  • handling search results
    • '); // debuging
 	var propertyTags = response.getElementsByTagName('page');
-	var ulStartElement = "
      ";
-	var ulEndElement = "
    ";
-	 
-	for (var i=0; i< propertyTags.length; i++) {
+	
+ 	for (var i=0; i< propertyTags.length; i++) {
+		var linkStart   = "
  • " + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue
-					+ '
    • ' ;
-
-// $('#list002 li').remove();
-// $('#tbl002').prepend('
  • foo1
    • ');
-// $('#tbl002').prepend('
  • bar2
    • ');
-					
-					$('ul001').prepend(full_address_lookup);
+		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
+			lookupCount=0;
+			//$('.live001').css('display','block');
+			
+			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
+				full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+				full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
 					
+				$('#ul001').prepend(full_li_element);
 		   		}
 			}
-		 
-			if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
-				articleCount = 0;
-				 document.getElementById('live002').style.display = "block";
-				for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
-					full_address_topic = full_address_topic + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
-					full_address_topic =  full_address_topic + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue
-					+ '';
+	 
+		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
+			articleCount = 0;
+	 		//$('.live002').css('display','block');
+				 
+			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
+			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
 					
-					$('ul002').prepend(full_address_lookup);
-			   		}
-			}
-			if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
-				exampleCount = 0;
-				 document.getElementById('live003').style.display = "block";
-
-				 for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
-					full_address_examples = full_address_examples + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
-					full_address_examples =  full_address_examples + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue
-					+ '';
+				$('#ul002').prepend(full_li_element);
+	   		}
+		}
+		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
+			exampleCount = 0;
+	 		//$('.live003').css('display','block');
+
+			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
+			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
+				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
 					
-					$('ul003').prepend(full_address_lookup);
-			   		}
-				}
-		
+				$('#ul003').prepend(full_li_element);
+	   		}
+		} 
 	}	
-
-
 	 
-	if(lookupCount == 0){loadLookupList();}
-    if(articleCount == 0){loadArticleList();}
-	if(exampleCount == 0){loadExampleList();}
+	if(lookupCount == 0){$('#ul001').prepend('
  • no result
    • ');$('#ul001 li').css('display','block');}
+    if(articleCount == 0){$('#ul002').prepend('
  • no result
    • ');$('#ul002 li').css('display','block');}
+	if(exampleCount == 0){$('#ul003').prepend('
  • no result
    • ');$('#ul003 li').css('display','block');}
 	// reset count variables;
 	 lookupCount=0;
 	 articleCount = 0;
      exampleCount = 0;
 	
 }
-function removeResults() {
-
-// get hold of the non-default li elements and delete them
- $('.live li').remove();
-
-
-	/*  var resultsTableLookup = document.getElementById('div001');
-	var recordslookup = resultsTableLookup.rows.length;
-	
-	for (var i=(recordslookup-1); i> 0; i--){
-		// resultsTableLookup.deleteRow(i); 
-					    
-	}
-
-	var resultsTableTopic = document.getElementById('div002');
-	var recordstopic = resultsTableTopic.rows.length;
-	for (var i=(recordstopic-1); i> 0; i--){
-		// alert("delete: " + i);
-		// resultsTableTopic.deleteRow(i);
-	}
 
-	
-	var resultsTableexample = document.getElementById('div003');
-	var recordsexample = resultsTableexample.rows.length;
-	for (var i=(recordsexample-1); i> 0; i--)
-		// resultsTableexample.deleteRow(i);
-
-	removeList();	 */
-}
-       
-function removeList(){
- 	// var resultsTableLookuplist = document.getElementById('ul001');
-	// var recordlookuplist = resultsTableLookuplist.rows.length;
-	// for (var i=(recordlookuplist-1); i> 0; i--)
-		// resultsTableLookuplist.deleteRow(i);
-
-	// var resultsTableArticlelist = document.getElementById('ul002');
-	// var recordArticlelist = resultsTableArticlelist.rows.length;
-	// for (var i=(recordArticlelist-1); i> 0; i--)
-		// resultsTableArticlelist.deleteRow(i);
-
-	// var resultsTableExamplelist = document.getElementById('ul003');
-	// var recordExamplelist = resultsTableExamplelist.rows.length;
-	// for (var i=(recordExamplelist-1); i> 0; i--)
-		// resultsTableExamplelist.deleteRow(i);
- }
- 
 //build regular expression object to find empty string or any number of blank
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
@@ -161,114 +102,44 @@ function CheckEmptyAndLoadList()
 	{
 	//empty inputbox
 		// load default li elements into the ul if empty
-		loadAllList(); 
-		//alert("loadAllList");
-        document.getElementById('live001').style.display = "none";
-        document.getElementById('live002').style.display = "none";
-        document.getElementById('live003').style.display = "none";	
-        document.getElementById('list001').style.display = "block";
-        document.getElementById('list002').style.display = "block";
-        document.getElementById('list003').style.display = "block";
+	//	loadAllList(); // replaced
+	 $('.defaultLink').css('display','block');
+	// $('.liveResult').css('display','none');
 	}else{
-		removeList();
-		//alert("removeList");
-		document.getElementById('live001').style.display = "block";
-		document.getElementById('live002').style.display = "block";
-		document.getElementById('live003').style.display = "block";
-		 
-	}
-}
-function loadAllList(){
-
-	/*var fullAddressListLookup   = "";
-	// var rowlistlookup = document.getElementById('ul001').insertRow(-1);
-	// var celllistlookup = rowlistlookup.insertCell(-1);
-	// celllistlookup.style.padding="0 0 0 0";
-	//celllistlookup.style.width="10px";
-	//celllistlookup.style.background = "yellow";
-	//celllistlookup.innerHTML = fullAddressListLookup ;
-
-
- 
-  
-	var fullAddressListArticle  = "";
-	// var rowlistarticle = document.getElementById('ul002').insertRow(-1);
-	// var celllistarticle = rowlistarticle.insertCell(-1);
-	// celllistarticle.style.padding="0 0 0 0";
-	//celllistarticle.innerHTML = fullAddressListArticle ;
-
- 
-	var fullAddressListExample   = "";
-	// var rowlistexample = document.getElementById('ul003').insertRow(-1);
-	// var celllistexample = rowlistexample.insertCell(-1);
-	// celllistexample.style.padding="0 0 0 0";
-	//celllistexample.innerHTML = fullAddressListExample ;*/
-	
-}
-
-function loadLookupList(){
-	
-	/*var fullAddressListLookup   = "";
-	// var rowlistlookup = document.getElementById('ul001').insertRow(-1);
-	// var celllistlookup = rowlistlookup.insertCell(-1);
-	// celllistlookup.style.padding="0 0 0 0";
-	//celllistlookup.style.width="10px";
-	//celllistlookup.style.background = "yellow";
-	celllistlookup.innerHTML = fullAddressListLookup ;
-	document.getElementById('live001').style.display = "none";
-	document.getElementById('list001').style.display = "block";
-	//alert("loadLookupList")
-*/
-}
-function loadArticleList(){ 
-  /*
-	var fullAddressListArticle  = "";
-	// var rowlistarticle = document.getElementById('ul002').insertRow(-1);
-	// var celllistarticle = rowlistarticle.insertCell(-1);
-	// celllistarticle.style.padding="0 0 0 0";
-	celllistarticle.innerHTML = fullAddressListArticle ;
-	document.getElementById('live002').style.display = "none";
-	document.getElementById('list002').style.display = "block";*/
+	 $('.defaultLink').css('display','none');
 	}
-
-function loadExampleList(){
- /*
-	var fullAddressListExample   = "";
-	// var rowlistexample = document.getElementById('ul003').insertRow(-1);
-	// var celllistexample = rowlistexample.insertCell(-1);
-	// celllistexample.style.padding="0 0 0 0";
-	celllistexample.innerHTML = fullAddressListExample ;
-	document.getElementById('live003').style.display = "none";
-	document.getElementById('list003').style.display = "block";*/
-	
 }
 
 
+// Loads on doc ready
+	$(document).ready(function () {
+        $('#pageType').keyup(function () {
+          var searchString = $('#pageType').val() ;
+          if ((searchString == null) || (searchString.length < 3)) {
+				 $('.liveResult').remove(); // replaces removeResults();
+      	   		CheckEmptyAndLoadList();
+				$('.report').remove();
+				// debug$('.content').prepend('
  • too short or blank
    • '); // debug
+				return;
+		   }
+            if (this.timer) clearTimeout(this.timer);
+            this.timer = setTimeout(function () {
+				// debug$('.content').prepend('
  • new search started 
    • ');// debug
+				// debug$('.content').prepend('
    Search string ' +searchString +'
    '); // debug
+
+               $.ajax({
+                contentType: "application/x-www-form-urlencoded",
+                url: 'http://' + location.host + '/nokiasearch/GetDataServlet',
+                data: 'searchString='+searchString,
+                dataType:'xml',
+				type: 'post',	 
+                success: function (response, textStatus) {
+
+				$('.liveResult').remove(); // replaces removeResults();
+                processNokiaData(response);
+
+ }     
+              });
+            }, 500);
+        });
+      }); 
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 220afb9..6bcb0db 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1020,6 +1020,11 @@
         overflow:hidden;
 
 }
+
+.indexboxcont .section {
+  float: left;
+}
+
     .indexboxcont .section p
     {
         padding-top: 20px;
@@ -1028,7 +1033,7 @@
     .indexboxcont .sectionlist
     {
         display: inline-block;
-        width: 33%;
+		width: 32.5%;
         padding: 0;
     }
     .indexboxcont .sectionlist ul
@@ -1057,6 +1062,12 @@
         color: #00732f;
         text-decoration: none;
     }
+	
+	.indexbox .indexIcon {
+	width: 11%;
+	}
+
+	
     .indexbox .indexIcon span
     {
         display: block;
@@ -1085,25 +1096,11 @@
         clear: both;
         visibility: hidden;
     }
-	/*
-
-
+	
 
-    .lastcol
-    {
-        display: inline-block;
-        vertical-align: top;
-        padding: 0;
-        max-width: 25%;
-    }
+    /* end of screen media */
 
-    .tricol .lastcol
-    {
-        margin-left: -6px;
-    }
-	*/
 	
-    /* end indexbox */
 }
 /* end of screen media */
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index dfba368..93b0218 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1795,32 +1795,7 @@ void HtmlGenerator::generateHeader(const QString& title,
     //out() << "  Qt Reference Documentation";
     out() << "  \n";
     out() << "  \n";
-	out() << "	\n";
+    out() << "  \n";
     out() << "\n";
 
     if (offlineDocs)
@@ -1868,7 +1843,6 @@ void HtmlGenerator::generateFooter(const Node *node)
 
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
           << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
-	      out() << "  \n";
           out() << "\n";
           out() <<   "\n";
 }
-- 
cgit v0.12


From 6af3db7e24527731124ad1233f926bc8d1c890b3 Mon Sep 17 00:00:00 2001
From: Markus Goetz 
Date: Thu, 6 May 2010 16:48:28 +0200
Subject: My changelog entries for core and network

---
 dist/changes-4.7.0 | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 4035bfe..df782c0 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -53,7 +53,8 @@ QtCore
 
  - QXmlStreamReader
     * [QTBUG-9196] fixed crash when parsing
-
+ - QTimer
+    * singleShot with 0 timeout will now avoid allocating objects
 
 QtGui
 -----
@@ -74,9 +75,25 @@ QtGui
 
 QtNetwork
 ---------
-
- - [QTBUG-8206] QNetworkAccessManager: add method to send custom requests
- - [QTBUG-9618] [MR 2372] send secure cookies only over secure connections
+ - QHostInfo: Added a small 60 second DNS cache
+ - QNetworkAccessManager
+  * Performance improvements for file:// and http://
+  * Crash fixes
+  * Improvements on HTTP pipelining
+  * Fix problem with canReadLine()
+  * Fix problem with HTTP 100 reply
+  * Some new attributes for QNetworkRequest
+  * [QTBUG-8206] add method to send custom requests
+  * [QTBUG-9618] [MR 2372] send secure cookies only over secure connections
+  * [QTBUG-7713] Fix bug related to re-sending request
+  * [QTBUG-7673] Fix issue with some webservers
+ - Sockets
+  * Better support for derived QTcpServer
+  * [QTBUG-7054] Fix error handling with waitFor*() for socket engine
+  * [QTBUG-7316, QTBUG-7317] Also handle unknown errors from socket engine
+ - SSL
+  * [QTBUG-2515] Do not make OpenSSL prompt for a password
+  * [QTBUG-6504, QTBUG-8924, QTBUG-5645] Fix memleak
 
 QtXmlPatterns
 -------------
-- 
cgit v0.12


From 8cd1773d49fc86e57e37a2b146dad1ef96105b04 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Thu, 6 May 2010 13:09:27 +0200
Subject: Fix compilation in C++0x mode (narrowing of constants)

---
 src/gui/painting/qprintengine_pdf.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index 0a747e7..2955e39 100644
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/painting/qprintengine_pdf.cpp
@@ -1225,7 +1225,7 @@ void QPdfEnginePrivate::printString(const QString &string) {
     const ushort *utf16 = string.utf16();
     
     for (int i=0; i < string.size(); ++i) {
-        char part[2] = {(*(utf16 + i)) >> 8, (*(utf16 + i)) & 0xff};
+        char part[2] = {char((*(utf16 + i)) >> 8), char((*(utf16 + i)) & 0xff)};
         for(int j=0; j < 2; ++j) {
             if (part[j] == '(' || part[j] == ')' || part[j] == '\\')
                 array.append('\\');
-- 
cgit v0.12


From 932f0b32eb22fbd7d3dcbbd69740457f65ab5d1a Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Thu, 6 May 2010 15:01:52 +0200
Subject: Add missing newline to static XML snippet

---
 src/dbus/qdbusinternalfilters.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp
index 8fc219a..78abf94 100644
--- a/src/dbus/qdbusinternalfilters.cpp
+++ b/src/dbus/qdbusinternalfilters.cpp
@@ -87,7 +87,7 @@ static const char propertiesInterfaceXml[] =
     "    \n"
     "      \n"
     "      \n"
-    "      "
+    "      \n"
     "    \n"
     "  \n";
 
-- 
cgit v0.12


From c06c9ecf3f37ca8ff8a4be14c9f4e1c2e483250a Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Thu, 6 May 2010 15:02:34 +0200
Subject: QDBusXmlGenerator: get the true name from QMetaType for the return
 type

---
 src/dbus/qdbusxmlgenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp
index 9c25d82..463ac73 100644
--- a/src/dbus/qdbusxmlgenerator.cpp
+++ b/src/dbus/qdbusxmlgenerator.cpp
@@ -160,7 +160,7 @@ static QString generateInterfaceXml(const QMetaObject *mo, int flags, int method
                 // do we need to describe this argument?
                 if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid)
                     xml += QString::fromLatin1("      \n")
-                           .arg(typeNameToXml(mm.typeName()));
+                        .arg(typeNameToXml(QVariant::typeToName(QVariant::Type(typeId))));
             } else
                 continue;
         }
-- 
cgit v0.12


From dbc2cfffd2e71ce4244e8e700b4928a8ab5d5a04 Mon Sep 17 00:00:00 2001
From: Mirko Damiani 
Date: Thu, 6 May 2010 16:50:22 +0200
Subject: Don't initialize Wintab if QT_NO_TABLETEVENT is defined.

Functions qt_tablet_init() and qt_tablet_init_wce() are now wrapped with
QT_NO_TABLETEVENT macro.

Merge-request: 2383
Reviewed-by: Benjamin Poulain 
---
 src/gui/kernel/qwidget_win.cpp   | 2 ++
 src/gui/kernel/qwidget_wince.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 7d647b7..4912291 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -512,8 +512,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         DestroyWindow(destroyw);
     }
 
+#ifndef QT_NO_TABLETEVENT
     if (q != qt_tablet_widget && QWidgetPrivate::mapper)
         qt_tablet_init();
+#endif // QT_NO_TABLETEVENT
 
     if (q->testAttribute(Qt::WA_DropSiteRegistered))
         registerDropSite(true);
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp
index 509847b..e352f5c 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/kernel/qwidget_wince.cpp
@@ -358,8 +358,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
         DestroyWindow(destroyw);
     }
 
+#ifndef QT_NO_TABLETEVENT
     if (q != qt_tablet_widget && QWidgetPrivate::mapper)
         qt_tablet_init_wce();
+#endif // QT_NO_TABLETEVENT
 
     if (q->testAttribute(Qt::WA_DropSiteRegistered))
         registerDropSite(true);
-- 
cgit v0.12


From 3a9c669816c2b0784b5c9e1790bc3bbd036cf013 Mon Sep 17 00:00:00 2001
From: Dominik Holland 
Date: Thu, 6 May 2010 14:39:01 +0200
Subject: Make QCompleter cope with restricted screen real estate (mobile
 devices)

Always prefer the bottom area for the list popup - if that doesn't work out
use the maximum available space (top or bottom) and resize the popup if
it still does not fit.

RevBy:    Dominik Holland
RevBy:    ogoffart
---
 src/gui/util/qcompleter.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index 8e7ec80..05fe744 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -873,7 +873,7 @@ void QCompleterPrivate::showPopup(const QRect& rect)
     const QRect screen = QApplication::desktop()->availableGeometry(widget);
     Qt::LayoutDirection dir = widget->layoutDirection();
     QPoint pos;
-    int rw, rh, w;
+    int rh, w;
     int h = (popup->sizeHintForRow(0) * qMin(maxVisibleItems, popup->model()->rowCount()) + 3) + 3;
     QScrollBar *hsb = popup->horizontalScrollBar();
     if (hsb && hsb->isVisible())
@@ -881,21 +881,30 @@ void QCompleterPrivate::showPopup(const QRect& rect)
 
     if (rect.isValid()) {
         rh = rect.height();
-        w = rw = rect.width();
+        w = rect.width();
         pos = widget->mapToGlobal(dir == Qt::RightToLeft ? rect.bottomRight() : rect.bottomLeft());
     } else {
         rh = widget->height();
-        rw = widget->width();
         pos = widget->mapToGlobal(QPoint(0, widget->height() - 2));
         w = widget->width();
     }
 
-    if ((pos.x() + rw) > (screen.x() + screen.width()))
+    if (w > screen.width())
+        w = screen.width();
+    if ((pos.x() + w) > (screen.x() + screen.width()))
         pos.setX(screen.x() + screen.width() - w);
     if (pos.x() < screen.x())
         pos.setX(screen.x());
-    if (((pos.y() + rh) > (screen.y() + screen.height())) && ((pos.y() - h - rh) >= 0))
-        pos.setY(pos.y() - qMax(h, popup->minimumHeight()) - rh + 2);
+
+    int top = pos.y() - rh - screen.top() + 2;
+    int bottom = screen.bottom() - pos.y();
+    h = qMax(h, popup->minimumHeight());
+    if (h > bottom) {
+        h = qMin(qMax(top, bottom), h);
+
+        if (top > bottom)
+            pos.setY(pos.y() - h - rh + 2);
+    }
 
     popup->setGeometry(pos.x(), pos.y(), w, h);
 
-- 
cgit v0.12


From 9439d7475e7ba558a5b455a8f2b7f90adf26db79 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Fri, 7 May 2010 09:14:54 +1000
Subject: Avoid repeated create/destroy at top list boundary with sub-pixel
 movement.

---
 src/declarative/graphicsitems/qdeclarativelistview.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 328f319..416e0a8 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -650,7 +650,7 @@ void QDeclarativeListViewPrivate::refill(qreal from, qreal to, bool doBuffer)
     FxListItem *item = 0;
     int pos = itemEnd + 1;
     while (modelIndex < model->count() && pos <= fillTo) {
-        //qDebug() << "refill: append item" << modelIndex << "pos" << pos;
+//        qDebug() << "refill: append item" << modelIndex << "pos" << pos;
         if (!(item = createItem(modelIndex)))
             break;
         item->setPosition(pos);
@@ -661,8 +661,8 @@ void QDeclarativeListViewPrivate::refill(qreal from, qreal to, bool doBuffer)
         if (doBuffer) // never buffer more than one item per frame
             break;
     }
-    while (visibleIndex > 0 && visibleIndex <= model->count() && visiblePos > fillFrom) {
-        //qDebug() << "refill: prepend item" << visibleIndex-1 << "current top pos" << visiblePos;
+    while (visibleIndex > 0 && visibleIndex <= model->count() && visiblePos-1 >= fillFrom) {
+//        qDebug() << "refill: prepend item" << visibleIndex-1 << "current top pos" << visiblePos;
         if (!(item = createItem(visibleIndex-1)))
             break;
         --visibleIndex;
@@ -678,7 +678,7 @@ void QDeclarativeListViewPrivate::refill(qreal from, qreal to, bool doBuffer)
         while (visibleItems.count() > 1 && (item = visibleItems.first()) && item->endPosition() < bufferFrom) {
             if (item->attached->delayRemove())
                 break;
-            //qDebug() << "refill: remove first" << visibleIndex << "top end pos" << item->endPosition();
+//            qDebug() << "refill: remove first" << visibleIndex << "top end pos" << item->endPosition();
             if (item->index != -1)
                 visibleIndex++;
             visibleItems.removeFirst();
@@ -688,7 +688,7 @@ void QDeclarativeListViewPrivate::refill(qreal from, qreal to, bool doBuffer)
         while (visibleItems.count() > 1 && (item = visibleItems.last()) && item->position() > bufferTo) {
             if (item->attached->delayRemove())
                 break;
-            //qDebug() << "refill: remove last" << visibleIndex+visibleItems.count()-1;
+//            qDebug() << "refill: remove last" << visibleIndex+visibleItems.count()-1 << item->position();
             visibleItems.removeLast();
             releaseItem(item);
             changed = true;
-- 
cgit v0.12


From 65d04843759d14f15f559c78df94626568bc0cb8 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Fri, 7 May 2010 10:16:28 +1000
Subject: Compile with opengl enabled.

---
 src/multimedia/mediaservices/mediaservices.pro | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/multimedia/mediaservices/mediaservices.pro b/src/multimedia/mediaservices/mediaservices.pro
index d5b0e4c..8a065f4 100644
--- a/src/multimedia/mediaservices/mediaservices.pro
+++ b/src/multimedia/mediaservices/mediaservices.pro
@@ -2,6 +2,8 @@ TARGET = QtMediaServices
 QPRO_PWD = $$PWD
 QT = core gui multimedia
 
+contains(QT_CONFIG, opengl): QT += opengl
+
 DEFINES += QT_BUILD_MEDIASERVICES_LIB QT_NO_USING_NAMESPACE
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtMultimedia
-- 
cgit v0.12


From 7c945e152c9abd0478bed5a4d251012944d93b44 Mon Sep 17 00:00:00 2001
From: Joona Petrell 
Date: Wed, 5 May 2010 14:57:53 +1000
Subject: Resize qmlruntime window to new dimensions when orientation changes

Task-number:
Reviewed-by: Warwick Allison
---
 src/declarative/util/qdeclarativeview.cpp          |  16 ++-
 tests/auto/declarative/declarative.pro             |   1 +
 .../qdeclarativeview/tst_qdeclarativeview.cpp      |   4 +-
 .../qdeclarativeviewer/data/orientation.qml        |  10 ++
 .../qdeclarativeviewer/qdeclarativeviewer.pro      |  11 +++
 .../qdeclarativeviewer/tst_qdeclarativeviewer.cpp  | 108 +++++++++++++++++++++
 tools/qml/qmlruntime.cpp                           |  19 +++-
 tools/qml/qmlruntime.h                             |   5 +-
 8 files changed, 156 insertions(+), 18 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeviewer/data/orientation.qml
 create mode 100644 tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
 create mode 100644 tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp

diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 62d913c..833e284 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -484,10 +484,7 @@ QSize QDeclarativeViewPrivate::rootObjectSize()
     QSize rootObjectSize(0,0);
     int widthCandidate = -1;
     int heightCandidate = -1;
-    if (declarativeItemRoot) {
-        widthCandidate = declarativeItemRoot->width();
-        heightCandidate = declarativeItemRoot->height();
-    } else if (root) {
+    if (root) {
         QSizeF size = root->boundingRect().size();
         widthCandidate = size.width();
         heightCandidate = size.height();
@@ -614,16 +611,15 @@ bool QDeclarativeView::eventFilter(QObject *watched, QEvent *e)
 
 /*!
     \internal
-    Preferred size follows the root object in
-    resize mode SizeViewToRootObject and
-    the view in resize mode SizeRootObjectToView.
+    Preferred size follows the root object geometry.
 */
 QSize QDeclarativeView::sizeHint() const
 {
-    if (d->resizeMode == SizeRootObjectToView) {
+    QSize rootObjectSize = d->rootObjectSize();
+    if (rootObjectSize.isEmpty()) {
         return size();
-    } else { // d->resizeMode == SizeViewToRootObject
-        return d->rootObjectSize();
+    } else {
+        return rootObjectSize;
     }
 }
 
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index b8e33cf..05c4c26 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -64,6 +64,7 @@ SUBDIRS += \
            qdeclarativestyledtext \          # Cover
            qdeclarativesqldatabase \         # Cover
            qdeclarativevisualdatamodel \     # Cover
+           qdeclarativeviewer \                      # Cover
            qmlvisual                    # Cover
 
 contains(QT_CONFIG, webkit) {
diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
index 1ed51c1..dd2f46e 100644
--- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
+++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
@@ -147,7 +147,7 @@ void tst_QDeclarativeView::resizemodedeclarativeitem()
     declarativeItem->setHeight(80);
     QCOMPARE(canvas->width(), 80);
     QCOMPARE(canvas->height(), 100);
-    QCOMPARE(canvas->size(), canvas->sizeHint());
+    QCOMPARE(QSize(declarativeItem->width(), declarativeItem->height()), canvas->sizeHint());
     QCOMPARE(sceneResizedSpy2.count(), 2);
 
     // size update from view
@@ -230,7 +230,7 @@ void tst_QDeclarativeView::resizemodegraphicswidget()
     canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView);
     graphicsWidget->resize(QSizeF(60,80));
     QCOMPARE(canvas->size(), QSize(80,100));
-    QCOMPARE(canvas->size(), canvas->sizeHint());
+    QCOMPARE(QSize(graphicsWidget->size().width(), graphicsWidget->size().height()), canvas->sizeHint());
     QCOMPARE(sceneResizedSpy2.count(), 2);
 
     // size update from view
diff --git a/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml
new file mode 100644
index 0000000..687fac6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml
@@ -0,0 +1,10 @@
+import Qt 4.7
+Rectangle {
+    color: "black"
+    width: (runtime.orientation == Orientation.Landscape) ? 300 : 200
+    height: (runtime.orientation == Orientation.Landscape) ? 200 : 300
+    Text {
+        text: runtime.orientation == Orientation.Landscape ? "Landscape" : "Portrait"
+        color: "white"
+    }
+} 
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
new file mode 100644
index 0000000..dc10f5b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
@@ -0,0 +1,11 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+include(../../../../tools/qml/qml.pri)
+
+SOURCES += tst_qdeclarativeviewer.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
+CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
new file mode 100644
index 0000000..9429dc9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** 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 
+#include 
+#include 
+#include 
+#include "qmlruntime.h"
+
+class tst_QDeclarativeViewer : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_QDeclarativeViewer();
+
+private slots:
+    void orientation();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_QDeclarativeViewer::tst_QDeclarativeViewer()
+{
+}
+
+void tst_QDeclarativeViewer::orientation()
+{
+    QWidget window;
+    QDeclarativeViewer *viewer = new QDeclarativeViewer(&window);
+    QVERIFY(viewer);
+    viewer->open(SRCDIR "/data/orientation.qml");
+    QVERIFY(viewer->view());
+    QVERIFY(viewer->menuBar());
+    QDeclarativeItem* rootItem = qobject_cast(viewer->view()->rootObject());
+    QVERIFY(rootItem);
+    window.show();
+
+    QCOMPARE(rootItem->width(), 200.0);
+    QCOMPARE(rootItem->height(), 300.0);
+    QCOMPARE(viewer->view()->size(), QSize(200, 300));
+    QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(200, 300));
+    QCOMPARE(viewer->size(), QSize(200, 300+viewer->menuBar()->height()));
+    QCOMPARE(viewer->size(), viewer->sizeHint());
+
+    viewer->toggleOrientation();
+    qApp->processEvents();
+
+    QCOMPARE(rootItem->width(), 300.0);
+    QCOMPARE(rootItem->height(), 200.0);
+    QCOMPARE(viewer->view()->size(), QSize(300, 200));
+    QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(300, 200));
+    QCOMPARE(viewer->size(), QSize(300, 200+viewer->menuBar()->height()));
+    QCOMPARE(viewer->size(), viewer->sizeHint());
+
+    viewer->toggleOrientation();
+    qApp->processEvents();
+
+    QCOMPARE(rootItem->width(), 200.0);
+    QCOMPARE(rootItem->height(), 300.0);
+    QCOMPARE(viewer->view()->size(), QSize(200, 300));
+    QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(200, 300));
+    QCOMPARE(viewer->size(), QSize(200, 300+viewer->menuBar()->height()));
+    QCOMPARE(viewer->size(), viewer->sizeHint());
+}
+
+QTEST_MAIN(tst_QDeclarativeViewer)
+
+#include "tst_qdeclarativeviewer.moc"
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index d49b0f1..06fa004 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -535,6 +535,8 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
     connect(&autoStartTimer, SIGNAL(triggered()), this, SLOT(autoStartRecording()));
     connect(&autoStopTimer, SIGNAL(triggered()), this, SLOT(autoStopRecording()));
     connect(&recordTimer, SIGNAL(triggered()), this, SLOT(recordFrame()));
+    connect(DeviceOrientation::instance(), SIGNAL(orientationChanged()),
+            this, SLOT(orientationChanged()), Qt::QueuedConnection);
     autoStartTimer.setRunning(false);
     autoStopTimer.setRunning(false);
     recordTimer.setRunning(false);
@@ -968,10 +970,8 @@ void QDeclarativeViewer::statusChanged()
     if (canvas->status() == QDeclarativeView::Ready) {
         initialSize = canvas->sizeHint();
         if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) {
-            QSize newWindowSize = initialSize;
-            newWindowSize.setHeight(newWindowSize.height()+menuBarHeight());
             updateSizeHints();
-            resize(newWindowSize);
+            resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight()));
         }
     }
 }
@@ -1425,6 +1425,19 @@ void QDeclarativeViewer::recordFrame()
     }
 }
 
+void QDeclarativeViewer::orientationChanged()
+{
+    if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) {
+        if (canvas->rootObject()) {
+            QSizeF rootObjectSize = canvas->rootObject()->boundingRect().size();
+            QSize newSize(rootObjectSize.width(), rootObjectSize.height()+menuBarHeight());
+            if (size() != newSize) {
+                resize(newSize);
+            }
+        }
+    }
+}
+
 void QDeclarativeViewer::setDeviceKeys(bool on)
 {
     devicemode = on;
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 655feea..9551090 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -125,6 +125,7 @@ public slots:
     void showProxySettings ();
     void proxySettingsChanged ();
     void setScaleView();
+    void toggleOrientation();
     void statusChanged();
     void setSlowMode(bool);
     void launch(const QString &);
@@ -132,7 +133,6 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual bool event(QEvent *);
-
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
 private slots:
@@ -144,9 +144,9 @@ private slots:
     void setScaleSkin();
     void setPortrait();
     void setLandscape();
-    void toggleOrientation();
     void startNetwork();
     void toggleFullScreen();
+    void orientationChanged();
 
     void showWarnings(bool show);
     void warningsWidgetOpened();
@@ -199,7 +199,6 @@ private:
 
     QNetworkReply *wgtreply;
     QString wgtdir;
-
     NetworkAccessManagerFactory *namFactory;
 
     bool useQmlFileBrowser;
-- 
cgit v0.12


From d7ef9666e2a3c8d06c5f32b7f47f602b177a74f6 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Thu, 6 May 2010 15:48:34 +1000
Subject: Avoid emitting release when the mouse is ungrabbed

Added an onCanceled signal to mouse area, which is triggered when the
mouse area rejects the event (propagates to the nearest
mouse area beneath) or some other element steals the mouse grab
(flickable, for example).

Task-number: QTBUG-10162
Reviewed-by: Michael Brasser
---
 .../graphicsitems/qdeclarativemousearea.cpp        | 19 ++++++++--
 .../graphicsitems/qdeclarativemousearea_p.h        |  1 +
 .../tst_qdeclarativemousearea.cpp                  | 44 ++++++++++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index c5a995e..74f2338 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -288,6 +288,17 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 */
 
 /*!
+    \qmlsignal MouseArea::onCanceled()
+
+    This handler is called when the mouse events are canceled, either because the event was not accepted or
+    another element stole the mouse event handling. This signal is for advanced users, it's useful in case there
+    is more than one mouse areas handling input, or when there is a mouse area inside a flickable. In the latter
+    case, if you do some logic on pressed and then start dragging, the flickable will steal the mouse handling
+    from the mouse area. In these cases, to reset the logic when there is no mouse handling anymore, you should
+    use onCanceled, in addition to onReleased.
+*/
+
+/*!
     \internal
     \class QDeclarativeMouseArea
     \brief The QDeclarativeMouseArea class provides a simple mouse handling abstraction for use within Qml.
@@ -562,10 +573,12 @@ bool QDeclarativeMouseArea::sceneEvent(QEvent *event)
             // state
             d->pressed = false;
             setKeepMouseGrab(false);
-            QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, false);
-            emit released(&me);
+            emit canceled();
             emit pressedChanged();
-            setHovered(false);
+            if (d->hovered) {
+                d->hovered = false;
+                emit hoveredChanged();
+            }
         }
     }
     return rv;
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
index e3f523b..df77ac6 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -163,6 +163,7 @@ Q_SIGNALS:
     void doubleClicked(QDeclarativeMouseEvent *mouse);
     void entered();
     void exited();
+    void canceled();
 
 protected:
     void setHovered(bool);
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index eb4aa12..96e6b8c 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -56,6 +56,8 @@ private slots:
     void updateMouseAreaPosOnClick();
     void updateMouseAreaPosOnResize();
     void noOnClickedWithPressAndHold();
+    void onMousePressRejected();
+
 private:
     QDeclarativeView *createView();
 };
@@ -330,6 +332,48 @@ void tst_QDeclarativeMouseArea::noOnClickedWithPressAndHold()
     QVERIFY(canvas->rootObject()->property("held").toBool());
 }
 
+void tst_QDeclarativeMouseArea::onMousePressRejected()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/rejectEvent.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QVERIFY(!canvas->rootObject()->property("mr1_pressed").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr1_released").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr2_pressed").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr2_released").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr2_canceled").toBool());
+
+    QGraphicsScene *scene = canvas->scene();
+    QGraphicsSceneMouseEvent pressEvent(QEvent::GraphicsSceneMousePress);
+    pressEvent.setScenePos(QPointF(100, 100));
+    pressEvent.setButton(Qt::LeftButton);
+    pressEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &pressEvent);
+
+    QVERIFY(canvas->rootObject()->property("mr1_pressed").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr1_released").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool());
+    QVERIFY(canvas->rootObject()->property("mr2_pressed").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr2_released").toBool());
+    QVERIFY(canvas->rootObject()->property("mr2_canceled").toBool());
+
+    QTest::qWait(200);
+
+    QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease);
+    releaseEvent.setScenePos(QPointF(100, 100));
+    releaseEvent.setButton(Qt::LeftButton);
+    releaseEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &releaseEvent);
+
+    QVERIFY(canvas->rootObject()->property("mr1_released").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool());
+    QVERIFY(!canvas->rootObject()->property("mr2_released").toBool());
+}
+
 QTEST_MAIN(tst_QDeclarativeMouseArea)
 
 #include "tst_qdeclarativemousearea.moc"
-- 
cgit v0.12


From 705a6ee8f08b1c0b360f1438301ce049e96ed450 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Thu, 6 May 2010 16:06:43 +1000
Subject: Fix autotest bug in MouseArea

Reviewed-by: Martin Jones
---
 .../declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 96e6b8c..ff3bf45 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -322,7 +322,7 @@ void tst_QDeclarativeMouseArea::noOnClickedWithPressAndHold()
 
     QTest::qWait(1000);
 
-    QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMousePress);
+    QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease);
     releaseEvent.setScenePos(QPointF(100, 100));
     releaseEvent.setButton(Qt::LeftButton);
     releaseEvent.setButtons(Qt::LeftButton);
-- 
cgit v0.12


From abd2c025d088064c31fd1b0e9c5ea29996e51bbe Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Fri, 7 May 2010 10:57:56 +1000
Subject: Update mouse area qmlvisual test to follow change QTBUG-10162

Reviewed-by: Michael Brasser
---
 .../qmlvisual/qdeclarativemousearea/mousearea-flickable.qml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml
index a0b787f..e223f5e 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml
@@ -25,7 +25,7 @@ Rectangle {
             MouseArea {
                 anchors.fill: parent
                 onPressed: blue.color = "lightsteelblue"
-                onReleased: blue.color = "steelblue"
+                onCanceled: blue.color = "steelblue"
             }
         }
         Rectangle {
@@ -36,7 +36,7 @@ Rectangle {
             MouseArea {
                 anchors.fill: parent
                 onEntered:  { red.color = "darkred"; tooltip.opacity = 1 }
-                onExited: { red.color = "red"; tooltip.opacity = 0 }
+                onCanceled: { red.color = "red"; tooltip.opacity = 0 }
             }
             Rectangle {
                 id: tooltip
-- 
cgit v0.12


From 62a65081a37ed9a51b0d39d1e740345d77f7bec0 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Fri, 7 May 2010 12:10:33 +1000
Subject: Clean up example code, add white background behind text

---
 examples/declarative/dynamic/dynamic.qml           | 193 +++++++++++----------
 examples/declarative/dynamic/qml/Button.qml        |  36 ++--
 examples/declarative/dynamic/qml/GenericItem.qml   |  13 --
 examples/declarative/dynamic/qml/PaletteItem.qml   |  16 +-
 .../declarative/dynamic/qml/PerspectiveItem.qml    |  29 ++--
 examples/declarative/dynamic/qml/Sun.qml           |  32 +++-
 examples/declarative/dynamic/qml/itemCreation.js   |  58 +++----
 7 files changed, 206 insertions(+), 171 deletions(-)
 delete mode 100644 examples/declarative/dynamic/qml/GenericItem.qml

diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
index 0e6e197..52c7c1e 100644
--- a/examples/declarative/dynamic/dynamic.qml
+++ b/examples/declarative/dynamic/dynamic.qml
@@ -4,44 +4,49 @@ import "qml"
 
 Item {
     id: window
+
+    property int activeSuns: 0
+
     //This is a desktop-sized example
     width: 1024; height: 512
-    property int activeSuns: 0
     
-    //This is the message that pops up when there's an error
-    Rectangle{
+    //This is the message box that pops up when there's an error
+    Rectangle {
         id: dialog
+
         opacity: 0
         anchors.centerIn: parent
-        width: dialogText.width + 6
-        height: dialogText.height + 6
+        width: dialogText.width + 6; height: dialogText.height + 6
         border.color: 'black'
         color: 'lightsteelblue'
         z: 65535 //Arbitrary number chosen to be above all the items, including the scaled perspective ones.
+
         function show(str){
             dialogText.text = str;
             dialogAnim.start();
         }
-        Text{
+
+        Text {
             id: dialogText
-            x:3
-            y:3
+            x: 3; y: 3
             font.pixelSize: 14
         }
-        SequentialAnimation{
+
+        SequentialAnimation {
             id: dialogAnim
-            NumberAnimation{target: dialog; property:"opacity"; to: 1; duration: 1000}
-            PauseAnimation{duration: 5000}
-            NumberAnimation{target: dialog; property:"opacity"; to: 0; duration: 1000}
+            NumberAnimation { target: dialog; property:"opacity"; to: 1; duration: 1000 }
+            PauseAnimation { duration: 5000 }
+            NumberAnimation { target: dialog; property:"opacity"; to: 0; duration: 1000 }
         }
     }
 
     // sky
-    Rectangle { id: sky
+    Rectangle {
+        id: sky
         anchors { left: parent.left; top: parent.top; right: toolbox.right; bottom: parent.verticalCenter }
         gradient: Gradient {
-            GradientStop { id: stopA; position: 0.0; color: "#0E1533" }
-            GradientStop { id: stopB; position: 1.0; color: "#437284" }
+            GradientStop { id: gradientStopA; position: 0.0; color: "#0E1533" }
+            GradientStop { id: gradientStopB; position: 1.0; color: "#437284" }
         }
     }
 
@@ -49,109 +54,123 @@ Item {
     Particles {
         id: stars
         x: 0; y: 0; width: parent.width; height: parent.height / 2
-        source: "images/star.png"; angleDeviation: 360; velocity: 0
-        velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800
+        source: "images/star.png"
+        angleDeviation: 360
+        velocity: 0; velocityDeviation: 0
+        count: parent.width / 10
+        fadeInDuration: 2800
         opacity: 1
     }
 
-    // ground, which has a z such that the sun can set behind it
+    // ground
     Rectangle {
         id: ground
-        z: 2
-        anchors { left: parent.left; top: parent.verticalCenter; right: toolbox.right; bottom: parent.bottom }
+        z: 2    // just above the sun so that the sun can set behind it
+        anchors { left: parent.left; top: parent.verticalCenter; right: toolbox.left; bottom: parent.bottom }
         gradient: Gradient {
             GradientStop { position: 0.0; color: "ForestGreen" }
             GradientStop { position: 1.0; color: "DarkGreen" }
         }
     }
 
-    //Day state, for when you place a sun
-    states: State {
-        name: "Day"; when: window.activeSuns > 0
-        PropertyChanges { target: stopA; color: "DeepSkyBlue"}
-        PropertyChanges { target: stopB; color: "SkyBlue"}
-        PropertyChanges { target: stars; opacity: 0 }
-    }
-
-    transitions: Transition {
-        PropertyAnimation { duration: 3000 }
-        ColorAnimation { duration: 3000 }
-    }
-
     SystemPalette { id: activePalette }
 
-    // toolbox
+    // right-hand panel
     Rectangle {
         id: toolbox
-        z: 3 //Above ground
-        color: activePalette.window;
+
         width: 480
-        anchors { right: parent.right; top:parent.top; bottom: parent.bottom }
-        Rectangle { //Not a child of any positioner
-            border.color: "black";
-            width: toolRow.width + 4
-            height: toolRow.height + 4
-            x: toolboxPositioner.x + toolRow.x - 2
-            y: toolboxPositioner.y + toolRow.y - 2
-        }
+        color: activePalette.window
+        anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
+
         Column {
-            id: toolboxPositioner
             anchors.centerIn: parent
             spacing: 8
+
             Text { text: "Drag an item into the scene." }
-            Row {
-                id: toolRow
-                spacing: 8;
-                PaletteItem {
-                    anchors.verticalCenter: parent.verticalCenter
-                    file: "Sun.qml";
-                    image: "../images/sun.png"
-                }
-                PaletteItem {
-                    file: "GenericItem.qml"
-                    image: "../images/moon.png"
-                }
-                PaletteItem {
-                    anchors.verticalCenter: parent.verticalCenter
-                    file: "PerspectiveItem.qml"
-                    image: "../images/tree_s.png"
-                }
-                PaletteItem {
-                    anchors.verticalCenter: parent.verticalCenter
-                    file: "PerspectiveItem.qml"
-                    image: "../images/rabbit_brown.png"
-                }
-                PaletteItem {
-                    anchors.verticalCenter: parent.verticalCenter
-                    file: "PerspectiveItem.qml"
-                    image: "../images/rabbit_bw.png"
+
+            Rectangle {
+                width: childrenRect.width + 10; height: childrenRect.height + 10
+                border.color: "black"
+
+                Row {
+                    anchors.centerIn: parent
+                    spacing: 8
+
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "Sun.qml"
+                        image: "../images/sun.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "GenericSceneItem.qml"
+                        image: "../images/moon.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "PerspectiveItem.qml"
+                        image: "../images/tree_s.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "PerspectiveItem.qml"
+                        image: "../images/rabbit_brown.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "PerspectiveItem.qml"
+                        image: "../images/rabbit_bw.png"
+                    }
                 }
             }
+
             Text { text: "Active Suns: " + activeSuns }
-            Rectangle { width: 440; height: 1; color: "black" }
-            Text { text: "Arbitrary QML: " }
-            TextEdit {
-                id: qmlText
-                width: 460
-                height: 220
-                readOnly: false
-                focusOnPress: true
-                font.pixelSize: 14
-
-                text: "import Qt 4.7\nImage {\n  id: smile;\n  x: 500*Math.random();\n  y: 200*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}"
+
+            Rectangle { width: parent.width; height: 1; color: "black" }
+
+            Text { text: "Arbitrary QML:" }
+
+            Rectangle {
+                width: 460; height: 240
+
+                TextEdit {
+                    id: qmlText
+                    anchors.fill: parent; anchors.margins: 5
+                    readOnly: false
+                    focusOnPress: true
+                    font.pixelSize: 14
+
+                    text: "import Qt 4.7\nImage {\n    id: smile\n    x: 500 * Math.random()\n    y: 200 * Math.random() \n    source: 'images/face-smile.png'\n\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n\n    Component.onCompleted: smile.destroy(1500);\n}"
+                }
             }
+
             Button {
                 text: "Create"
-                function makeCustom() {
-                    try{ 
+                onClicked: {
+                    try { 
                         Qt.createQmlObject(qmlText.text, window, 'CustomObject');
-                    }catch(err){
-                        dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message );
+                    } catch(err) {
+                        dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message);
                     }
                 }
-                onClicked: makeCustom();
             }
         }
     }
 
+    //Day state, for when a sun is added to the scene
+    states: State {
+        name: "Day"
+        when: window.activeSuns > 0
+
+        PropertyChanges { target: gradientStopA; color: "DeepSkyBlue" }
+        PropertyChanges { target: gradientStopB; color: "SkyBlue" }
+        PropertyChanges { target: stars; opacity: 0 }
+    }
+
+    transitions: Transition {
+        PropertyAnimation { duration: 3000 }
+        ColorAnimation { duration: 3000 }
+    }
+
 }
diff --git a/examples/declarative/dynamic/qml/Button.qml b/examples/declarative/dynamic/qml/Button.qml
index 53588bb..963a850 100644
--- a/examples/declarative/dynamic/qml/Button.qml
+++ b/examples/declarative/dynamic/qml/Button.qml
@@ -6,19 +6,35 @@ Rectangle {
     property variant text
     signal clicked
 
-    SystemPalette { id: activePalette }
-    height: text.height + 10
-    width: text.width + 20
+    height: text.height + 10; width: text.width + 20
     border.width: 1
-    radius: 4; smooth: true
+    radius: 4
+    smooth: true
+
     gradient: Gradient {
-        GradientStop { position: 0.0; 
-            color: if(!mr.pressed){activePalette.light;}else{activePalette.button;}
+        GradientStop {
+            position: 0.0
+            color: !mouseArea.pressed ? activePalette.light : activePalette.button
         }
-        GradientStop { position: 1.0;
-            color: if(!mr.pressed){activePalette.button;}else{activePalette.dark;}
+        GradientStop {
+            position: 1.0
+            color: !mouseArea.pressed ? activePalette.button : activePalette.dark
         }
     }
-    MouseArea { id:mr; anchors.fill: parent; onClicked: container.clicked() }
-    Text { id: text; anchors.centerIn:parent; font.pointSize: 10; text: parent.text; color: activePalette.buttonText }
+
+    SystemPalette { id: activePalette }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked()
+    }
+
+    Text {
+        id: text
+        anchors.centerIn:parent
+        font.pointSize: 10
+        text: parent.text
+        color: activePalette.buttonText
+    }
 }
diff --git a/examples/declarative/dynamic/qml/GenericItem.qml b/examples/declarative/dynamic/qml/GenericItem.qml
deleted file mode 100644
index faac06d..0000000
--- a/examples/declarative/dynamic/qml/GenericItem.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import Qt 4.7
-
-Item{
-    property bool created: false
-    property string image
-    width: imageItem.width
-    height: imageItem.height
-    z: 2
-    Image{
-        id: imageItem
-        source: image; 
-    }
-}
diff --git a/examples/declarative/dynamic/qml/PaletteItem.qml b/examples/declarative/dynamic/qml/PaletteItem.qml
index e8f2ed4..dcb5cc3 100644
--- a/examples/declarative/dynamic/qml/PaletteItem.qml
+++ b/examples/declarative/dynamic/qml/PaletteItem.qml
@@ -1,13 +1,19 @@
 import Qt 4.7
 import "itemCreation.js" as Code
 
-GenericItem {
-    id: itemButton
-    property string file
+Image {
+    id: paletteItem
+
+    property string componentFile
+    property string image
+
+    source: image
+
     MouseArea { 
-        anchors.fill: parent; 
+        anchors.fill: parent
+
         onPressed: Code.startDrag(mouse);
-        onPositionChanged: Code.moveDrag(mouse);
+        onPositionChanged: Code.continueDrag(mouse);
         onReleased: Code.endDrag(mouse);
     }
 }
diff --git a/examples/declarative/dynamic/qml/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml
index 3cbe64a..c04d3dc 100644
--- a/examples/declarative/dynamic/qml/PerspectiveItem.qml
+++ b/examples/declarative/dynamic/qml/PerspectiveItem.qml
@@ -1,16 +1,25 @@
 import Qt 4.7
 
 Image {
-    id: tree
+    id: rootItem
+
     property bool created: false
-    property double scaleFactor: Math.max((y+height-250)*0.01, 0.3)
-    property double scaledBottom: y + (height+height*scaleFactor)/2 
-    property bool onLand: scaledBottom > window.height/2
-    property string image //Needed for compatibility with GenericItem
+    property string image 
+
+    property double scaledBottom: y + (height + height*scale) / 2 
+    property bool onLand: scaledBottom > window.height / 2
+
+    source: image
     opacity: onLand ? 1 : 0.25
-    onCreatedChanged: if (created && !onLand) { tree.destroy() } else { z = scaledBottom }
-    scale: scaleFactor
-    transformOrigin: "Center"
-    source: image; smooth: true
-    onYChanged: z = scaledBottom
+    scale: Math.max((y + height - 250) * 0.01, 0.3)
+    smooth: true
+
+    onCreatedChanged: {
+        if (created && !onLand)
+            rootItem.destroy();
+        else
+            z = scaledBottom;
+    }
+
+    onYChanged: z = scaledBottom;
 }
diff --git a/examples/declarative/dynamic/qml/Sun.qml b/examples/declarative/dynamic/qml/Sun.qml
index 3627964..43dcb9a 100644
--- a/examples/declarative/dynamic/qml/Sun.qml
+++ b/examples/declarative/dynamic/qml/Sun.qml
@@ -2,23 +2,37 @@ import Qt 4.7
 
 Image {
     id: sun
+
     property bool created: false
     property string image: "../images/sun.png"
-    onCreatedChanged: if(created){window.activeSuns++;}else{window.activeSuns--;}
 
-    source: image; 
-    z: 1
+    source: image
 
-    //x and y get set when instantiated
-    //head offscreen
+    // once item is created, start moving offscreen
     NumberAnimation on y {
-        to: window.height / 2;
+        to: window.height / 2
         running: created
-        onRunningChanged: if (running) duration = (window.height - sun.y) * 10; else state = "OffScreen";
+        onRunningChanged: {
+            if (running)
+                duration = (window.height - sun.y) * 10;
+            else
+                state = "OffScreen"
+        }
     }
 
     states: State {
-        name: "OffScreen";
-        StateChangeScript { script: { sun.created = false; sun.destroy() } }
+        name: "OffScreen"
+        StateChangeScript {
+            script: { sun.created = false; sun.destroy() }
+        }
+    }
+
+    onCreatedChanged: {
+        if (created) {
+            sun.z = 1;    // above the sky but below the ground layer 
+            window.activeSuns++;
+        } else {
+            window.activeSuns--;
+        }
     }
 }
diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
index 3c1b975..92d345d 100644
--- a/examples/declarative/dynamic/qml/itemCreation.js
+++ b/examples/declarative/dynamic/qml/itemCreation.js
@@ -1,54 +1,39 @@
 var itemComponent = null;
 var draggedItem = null;
 var startingMouse;
-var startingZ;
-//Until QT-2385 is resolved we need to convert to scene coordinates manually
-var xOffset;
-var yOffset;
-function setSceneOffset()
-{
-    xOffset = 0;
-    yOffset = 0;
-    var p = itemButton;
-    while(p != window){
-        xOffset += p.x;
-        yOffset += p.y;
-        p = p.parent;
-    }
-}
+var posnInWindow;
 
 function startDrag(mouse)
 {
-    setSceneOffset();
+    posnInWindow = paletteItem.mapToItem(null, 0, 0);
     startingMouse = { x: mouse.x, y: mouse.y }
     loadComponent();
 }
 
-//Creation is split into two functions due to an asyncronous wait while
+//Creation is split into two functions due to an asynchronous wait while
 //possible external files are loaded.
 
 function loadComponent() {
-    if (itemComponent != null) //Already loaded the component
+    if (itemComponent != null) { // component has been previously loaded
         createItem();
+        return;
+    }
 
-    itemComponent = Qt.createComponent(itemButton.file);
-    //console.log(itemButton.file)
-    if(itemComponent.status == Component.Loading){
-        component.statusChanged.connect(finishCreation);
-    }else{//Depending on the content, it can be ready or error immediately
+    itemComponent = Qt.createComponent(paletteItem.componentFile);
+    if (itemComponent.status == Component.Loading)  //Depending on the content, it can be ready or error immediately
+        component.statusChanged.connect(createItem);
+    else    
         createItem();
-    }
 }
 
 function createItem() {
     if (itemComponent.status == Component.Ready && draggedItem == null) {
         draggedItem = itemComponent.createObject();
         draggedItem.parent = window;
-        draggedItem.image = itemButton.image;
-        draggedItem.x = xOffset;
-        draggedItem.y = yOffset;
-        startingZ = draggedItem.z;
-        draggedItem.z = 4;//On top
+        draggedItem.image = paletteItem.image;
+        draggedItem.x = posnInWindow.x;
+        draggedItem.y = posnInWindow.y;
+        draggedItem.z = 3;  // make sure created item is above the ground layer
     } else if (itemComponent.status == Component.Error) {
         draggedItem = null;
         console.log("error creating component");
@@ -56,25 +41,24 @@ function createItem() {
     }
 }
 
-function moveDrag(mouse)
+function continueDrag(mouse)
 {
-    if(draggedItem == null)
+    if (draggedItem == null)
         return;
 
-    draggedItem.x = mouse.x + xOffset - startingMouse.x;
-    draggedItem.y = mouse.y + yOffset - startingMouse.y;
+    draggedItem.x = mouse.x + posnInWindow.x - startingMouse.x;
+    draggedItem.y = mouse.y + posnInWindow.y - startingMouse.y;
 }
 
 function endDrag(mouse)
 {
-    if(draggedItem == null)
+    if (draggedItem == null)
         return;
 
-    if(draggedItem.x + draggedItem.width > toolbox.x){ //Don't drop it in the toolbox
+    if (draggedItem.x + draggedItem.width > toolbox.x) { //Don't drop it in the toolbox
         draggedItem.destroy();
         draggedItem = null;
-    }else{
-        draggedItem.z = startingZ;
+    } else {
         draggedItem.created = true;
         draggedItem = null;
     }
-- 
cgit v0.12


From 4600f2053802ad41550a84573bdcbe4b50fb5a67 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Fri, 7 May 2010 13:29:34 +1000
Subject: Doc fix

Task-number: QTBUG-10458
---
 src/declarative/util/qdeclarativelistmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 3810256..0985a6b 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -591,7 +591,7 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
     Changes the \a property of the item at \a index in the list model to \a value.
 
     \code
-        fruitModel.set(3, "cost", 5.95)
+        fruitModel.setProperty(3, "cost", 5.95)
     \endcode
 
     The \a index must be an element in the list.
-- 
cgit v0.12


From 17837067e9dbda02669487bdd64419c38e8a2ebd Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Fri, 7 May 2010 14:17:27 +1000
Subject: Add missing qml file to qdeclarativemousearea

---
 .../qdeclarativemousearea/data/rejectEvent.qml     | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml

diff --git a/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
new file mode 100644
index 0000000..fecfadf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
@@ -0,0 +1,28 @@
+import Qt 4.7
+
+Rectangle {
+    id: root
+    color: "#ffffff"
+    width: 320; height: 240
+    property bool mr1_pressed: false
+    property bool mr1_released: false
+    property bool mr1_canceled: false
+    property bool mr2_pressed: false
+    property bool mr2_released: false
+    property bool mr2_canceled: false
+
+    MouseArea {
+        id: mouseRegion1
+        anchors.fill: parent
+        onPressed: {console.log("press111"); root.mr1_pressed = true}
+        onReleased: {console.log("release111"); root.mr1_released = true}
+        onCanceled: {console.log("ungrab1111"); root.mr1_canceled = true}
+    }
+    MouseArea {
+        id: mouseRegion2
+        width: 120; height: 120
+        onPressed: {console.log("press222"); root.mr2_pressed = true; mouse.accepted = false}
+        onReleased: {console.log("release2222"); root.mr2_released = true}
+        onCanceled: {console.log("ungrab2222"); root.mr2_canceled = true}
+    }
+}
-- 
cgit v0.12


From 60a06af7200217aa16c8c130a1ed0afce31812ed Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 7 May 2010 14:23:56 +1000
Subject: Fix autotests (remove import Qt.widgets)

---
 .../auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml | 1 -
 tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml
index 91973a3..d430c2c 100644
--- a/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml
+++ b/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml
@@ -1,5 +1,4 @@
 import Qt 4.7
-import Qt.widgets 4.7
 
 Rectangle {
     color: "white"
diff --git a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
index 9bb0b37..3b851c1 100644
--- a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
+++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml
@@ -1,5 +1,4 @@
 import Qt 4.7
-import Qt.widgets 4.6
 
 QGraphicsWidget {
     size: "250x250"
-- 
cgit v0.12


From 32c2d17680a04fced714aa103b40d7de24d9eb26 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 7 May 2010 14:41:00 +1000
Subject: Fix autotests

---
 src/imports/imports.pro                            |  2 +-
 tests/auto/declarative/declarative.pro             |  1 -
 tests/auto/declarative/examples/tst_examples.cpp   | 23 +++----
 .../graphicswidgets/data/graphicswidgets.qml       | 52 ---------------
 .../graphicswidgets/graphicswidgets.pro            | 10 ---
 .../graphicswidgets/tst_graphicswidgets.cpp        | 74 ----------------------
 6 files changed, 9 insertions(+), 153 deletions(-)
 delete mode 100644 tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
 delete mode 100644 tests/auto/declarative/graphicswidgets/graphicswidgets.pro
 delete mode 100644 tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 1754908..a9d600e 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS += particles
+SUBDIRS += particles gestures
 
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
 contains(QT_CONFIG, mediaservices): SUBDIRS += multimedia
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 05c4c26..a9b069c 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,7 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
            examples \
-           graphicswidgets \        # Cover
            parserstress \           # Cover
            qmetaobjectbuilder \     # Cover
            qdeclarativeanimations \          # Cover
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 4f10a98..3759cb5 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -80,16 +80,6 @@ tst_examples::tst_examples()
 
 
     // Add directories you want excluded here
-    excludedDirs << "examples/declarative/extending";
-    excludedDirs << "examples/declarative/tutorials/extending";
-    excludedDirs << "examples/declarative/plugins";
-    excludedDirs << "examples/declarative/proxywidgets";
-    excludedDirs << "examples/declarative/gestures";
-
-    excludedDirs << "examples/declarative/imageprovider";
-    excludedDirs << "examples/declarative/layouts/graphicsLayouts";
-    excludedDirs << "demos/declarative/minehunt";
-
     excludedDirs << "doc/src/snippets/declarative/graphicswidgets";
 
 #ifdef QT_NO_WEBKIT
@@ -160,11 +150,14 @@ QStringList tst_examples::findQmlFiles(const QDir &d)
 
     QStringList rv;
 
-    QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"),
-                                    QDir::Files);
-    foreach (const QString &file, files) {
-        if (file.at(0).isLower()) {
-            rv << d.absoluteFilePath(file);
+    QStringList cppfiles = d.entryList(QStringList() << QLatin1String("*.cpp"), QDir::Files);
+    if (cppfiles.isEmpty()) {
+        QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"),
+                                        QDir::Files);
+        foreach (const QString &file, files) {
+            if (file.at(0).isLower()) {
+                rv << d.absoluteFilePath(file);
+            }
         }
     }
 
diff --git a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml b/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
deleted file mode 100644
index d6cf4de..0000000
--- a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-import Qt 4.7
-import Qt.widgets 4.7
-
-QGraphicsWidget {
-    geometry: "20,0,600x400"
-    layout: QGraphicsLinearLayout {
-        orientation: Qt.Horizontal
-        QGraphicsWidget {
-            layout: QGraphicsLinearLayout {
-                spacing: 10; orientation: Qt.Vertical
-                LayoutItem {
-                    QGraphicsLinearLayout.stretchFactor: 1
-                    QGraphicsLinearLayout.spacing: 1
-                    objectName: "left"
-                    minimumSize: "100x100"
-                    maximumSize: "300x300"
-                    preferredSize: "100x100"
-                    Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
-                }
-                LayoutItem {
-                    QGraphicsLinearLayout.stretchFactor: 10
-                    QGraphicsLinearLayout.spacing: 10
-                    objectName: "left"
-                    minimumSize: "100x100"
-                    maximumSize: "300x300"
-                    preferredSize: "100x100"
-                    Rectangle { objectName: "yellowRect"; color: "blue"; anchors.fill: parent }
-                }
-            }
-        }
-        QGraphicsWidget {
-            layout: QGraphicsLinearLayout {
-                spacing: 10; orientation: Qt.Horizontal; contentsMargin: 10
-                LayoutItem {
-                    objectName: "left"
-                    minimumSize: "100x100"
-                    maximumSize: "300x300"
-                    preferredSize: "100x100"
-                    Rectangle { objectName: "yellowRect"; color: "red"; anchors.fill: parent }
-                }
-                LayoutItem {
-                    objectName: "left"
-                    minimumSize: "100x100"
-                    maximumSize: "300x300"
-                    preferredSize: "100x100"
-                    Rectangle { objectName: "yellowRect"; color: "green"; anchors.fill: parent }
-                }
-            }
-        }
-    }
-}
-
diff --git a/tests/auto/declarative/graphicswidgets/graphicswidgets.pro b/tests/auto/declarative/graphicswidgets/graphicswidgets.pro
deleted file mode 100644
index b77b430..0000000
--- a/tests/auto/declarative/graphicswidgets/graphicswidgets.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_graphicswidgets.cpp
-
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-CONFIG += parallel_test
diff --git a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp b/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
deleted file mode 100644
index f1a71d5..0000000
--- a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-#include 
-#include 
-#include 
-#include 
-
-class tst_graphicswidgets : public QObject
-
-{
-    Q_OBJECT
-public:
-    tst_graphicswidgets();
-
-private slots:
-    void widgets();
-};
-
-tst_graphicswidgets::tst_graphicswidgets()
-{
-}
-
-void tst_graphicswidgets::widgets()
-{
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/graphicswidgets.qml"));
-    QGraphicsWidget *obj = qobject_cast(c.create());
-
-    QVERIFY(obj != 0);
-    delete obj;
-}
-
-QTEST_MAIN(tst_graphicswidgets)
-
-#include "tst_graphicswidgets.moc"
-- 
cgit v0.12


From bdfa2d47fa1a6abee6e966f82fadf7a3d97bab0b Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 7 May 2010 15:48:58 +1000
Subject: Doc

---
 src/imports/webkit/qdeclarativewebview.cpp | 33 ++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 5db812c..9571470 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -437,24 +437,39 @@ void QDeclarativeWebView::paintPage(const QRect& r)
 /*!
     \qmlproperty list WebView::javaScriptWindowObjects
 
-    This property is a list of object that are available from within
-    the webview's JavaScript context.
+    A list of QML objects to expose to the web page.
 
-    The \a object will be inserted as a child of the frame's window
-    object, under the name given by the attached property \c WebView.windowObjectName.
+    Each object will be added as a property of the web frame's window object.  The
+    property name is controlled by the value of \c WebView.windowObjectName 
+    attached property.
+
+    Exposing QML objects to a web page allows JavaScript executing in the web 
+    page itself to communicate with QML, by reading and writing properties and
+    by calling methods of the exposed QML objects.
+
+    This example shows how to call into a QML method using a window object.
 
     \qml
     WebView {
-        javaScriptWindowObjects: Object {
-            WebView.windowObjectName: "coordinates"
+        javaScriptWindowObjects: QtObject {
+            WebView.windowObjectName: "qml"
+
+            function qmlCall() { 
+                console.log("This call is in QML!");
+            }
         }
+
+        html: ""
     }
     \endqml
 
-    Properties of the object will be exposed as JavaScript properties and slots as
-    JavaScript methods.
+    The output of the example will be:
+    \code
+    This is in WebKit!
+    This call is in QML!
+    \endcode
 
-    If Javascript is not enabled for this page, then this property does nothing.
+    If Javascript is not enabled for the page, then this property does nothing.
 */
 QDeclarativeListProperty QDeclarativeWebView::javaScriptWindowObjects()
 {
-- 
cgit v0.12


From 4976130171033abdd8323a19229dcbfc5b008cfe Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Fri, 7 May 2010 16:15:37 +1000
Subject: Avoid many unnecessary allocations, so so that paint engines attached
 to pixmaps do not consume excessive amounts of memory, and so can still be
 reasonably kept cached with the pixmap. Saves 8K for every pixmaps drawn to
 on raster paint engine. Saves about 2K for other graphicssystems.

Task-number: QTBUG-10215
Reviewed-by: Gunnar
---
 src/gui/painting/qdatabuffer_p.h                   | 19 +++++++--
 src/gui/painting/qoutlinemapper.cpp                |  3 +-
 src/gui/painting/qoutlinemapper_p.h                | 11 ++++-
 src/gui/painting/qpaintengine_raster.cpp           | 47 ++++++++++++----------
 src/gui/painting/qpaintengine_raster_p.h           |  6 ++-
 src/gui/painting/qpaintengineex.cpp                |  3 +-
 src/gui/painting/qpathclipper.cpp                  | 23 +++++++----
 src/gui/painting/qpathclipper_p.h                  |  7 +++-
 src/gui/painting/qpolygonclipper_p.h               |  3 +-
 src/gui/painting/qrasterizer.cpp                   |  8 +++-
 src/gui/painting/qstroker.cpp                      |  2 +-
 src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h |  4 +-
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |  1 +
 .../gl2paintengineex/qtriangulatingstroker.cpp     |  5 ++-
 .../gl2paintengineex/qtriangulatingstroker_p.h     |  1 +
 src/opengl/gl2paintengineex/qtriangulator.cpp      | 12 +++---
 src/opengl/qpaintengine_opengl.cpp                 |  3 ++
 17 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index bc5f1ef..8f8544f 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -60,16 +60,20 @@ QT_BEGIN_NAMESPACE
 template  class QDataBuffer
 {
 public:
-    QDataBuffer(int res = 64)
+    QDataBuffer(int res)
     {
         capacity = res;
-        buffer = (Type*) qMalloc(capacity * sizeof(Type));
+        if (res)
+            buffer = (Type*) qMalloc(capacity * sizeof(Type));
+        else
+            buffer = 0;
         siz = 0;
     }
 
     ~QDataBuffer()
     {
-        qFree(buffer);
+        if (buffer)
+            qFree(buffer);
     }
 
     inline void reset() { siz = 0; }
@@ -104,6 +108,8 @@ public:
 
     inline void reserve(int size) {
         if (size > capacity) {
+            if (capacity == 0)
+                capacity = 1;
             while (capacity < size)
                 capacity *= 2;
             buffer = (Type*) qRealloc(buffer, capacity * sizeof(Type));
@@ -112,7 +118,12 @@ public:
 
     inline void shrink(int size) {
         capacity = size;
-        buffer = (Type*) qRealloc(buffer, capacity * sizeof(Type));
+        if (size)
+            buffer = (Type*) qRealloc(buffer, capacity * sizeof(Type));
+        else {
+            qFree(buffer);
+            buffer = 0;
+        }
     }
 
     inline void swap(QDataBuffer &other) {
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp
index ad0c2eb..1b01960 100644
--- a/src/gui/painting/qoutlinemapper.cpp
+++ b/src/gui/painting/qoutlinemapper.cpp
@@ -154,7 +154,8 @@ QT_FT_Outline *QOutlineMapper::convertPath(const QVectorPath &path)
         // ### We can kill this copying and just use the buffer straight...
 
         m_elements.resize(count);
-        memcpy(m_elements.data(), path.points(), count* sizeof(QPointF));
+        if (count)
+            memcpy(m_elements.data(), path.points(), count* sizeof(QPointF));
 
         m_element_types.resize(0);
     }
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h
index d0ce1a9..39b7593 100644
--- a/src/gui/painting/qoutlinemapper_p.h
+++ b/src/gui/painting/qoutlinemapper_p.h
@@ -87,8 +87,15 @@ const int QT_RASTER_COORD_LIMIT = 32767;
 class QOutlineMapper
 {
 public:
-    QOutlineMapper()
-        : m_round_coords(false)
+    QOutlineMapper() :
+        m_element_types(0),
+        m_elements(0),
+        m_elements_dev(0),
+        m_points(0),
+        m_tags(0),
+        m_contours(0),
+        m_polygon_dev(0),
+        m_round_coords(false)
     {
     }
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 9148ac2..483bc0c 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -336,17 +336,6 @@ void QRasterPaintEngine::init()
     d->hdc = 0;
 #endif
 
-    d->rasterPoolSize = 8192;
-    d->rasterPoolBase =
-#if defined(Q_WS_WIN64)
-        // We make use of setjmp and longjmp in qgrayraster.c which requires
-        // 16-byte alignment, hence we hardcode this requirement here..
-        (unsigned char *) _aligned_malloc(d->rasterPoolSize, sizeof(void*) * 2);
-#else
-        (unsigned char *) malloc(d->rasterPoolSize);
-#endif
-    Q_CHECK_PTR(d->rasterPoolBase);
-
     // The antialiasing raster.
     d->grayRaster.reset(new QT_FT_Raster);
     Q_CHECK_PTR(d->grayRaster.data());
@@ -354,8 +343,6 @@ void QRasterPaintEngine::init()
         QT_THROW(std::bad_alloc()); // an error creating the raster is caused by a bad malloc
 
 
-    qt_ft_grays_raster.raster_reset(*d->grayRaster.data(), d->rasterPoolBase, d->rasterPoolSize);
-
     d->rasterizer.reset(new QRasterizer);
     d->rasterBuffer.reset(new QRasterBuffer());
     d->outlineMapper.reset(new QOutlineMapper);
@@ -437,12 +424,6 @@ QRasterPaintEngine::~QRasterPaintEngine()
 {
     Q_D(QRasterPaintEngine);
 
-#if defined(Q_WS_WIN64)
-    _aligned_free(d->rasterPoolBase);
-#else
-    free(d->rasterPoolBase);
-#endif
-
     qt_ft_grays_raster.raster_done(*d->grayRaster.data());
 }
 
@@ -4090,6 +4071,22 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
         return;
     }
 
+    const int rasterPoolInitialSize = 8192;
+    int rasterPoolSize = rasterPoolInitialSize;
+    unsigned char *rasterPoolBase;
+#if defined(Q_WS_WIN64)
+    rasterPoolBase =
+        // We make use of setjmp and longjmp in qgrayraster.c which requires
+        // 16-byte alignment, hence we hardcode this requirement here..
+        (unsigned char *) _aligned_malloc(rasterPoolSize, sizeof(void*) * 2);
+#else
+    unsigned char rasterPoolOnStack[rasterPoolInitialSize];
+    rasterPoolBase = rasterPoolOnStack;
+#endif
+    Q_CHECK_PTR(rasterPoolBase);
+
+    qt_ft_grays_raster.raster_reset(*grayRaster.data(), rasterPoolBase, rasterPoolSize);
+
     void *data = userData;
 
     QT_FT_BBox clip_box = { deviceRect.x(),
@@ -4122,13 +4119,14 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
             int new_size = rasterPoolSize * 2;
             if (new_size > 1024 * 1024) {
                 qWarning("QPainter: Rasterization of primitive failed");
-                return;
+                break;
             }
 
 #if defined(Q_WS_WIN64)
             _aligned_free(rasterPoolBase);
 #else
-            free(rasterPoolBase);
+            if (rasterPoolBase != rasterPoolOnStack) // initially on the stack
+                free(rasterPoolBase);
 #endif
 
             rasterPoolSize = new_size;
@@ -4149,6 +4147,13 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
             done = true;
         }
     }
+
+#if defined(Q_WS_WIN64)
+    _aligned_free(rasterPoolBase);
+#else
+    if (rasterPoolBase != rasterPoolOnStack) // initially on the stack
+        free(rasterPoolBase);
+#endif
 }
 
 void QRasterPaintEnginePrivate::recalculateFastImages()
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 55eb82e..0a0b0b2 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -300,6 +300,10 @@ QRasterPaintEnginePrivate : public QPaintEngineExPrivate
 {
     Q_DECLARE_PUBLIC(QRasterPaintEngine)
 public:
+    QRasterPaintEnginePrivate() : QPaintEngineExPrivate(),
+        cachedLines(0)
+    {
+    }
 
     void rasterizeLine_dashed(QLineF line, qreal width,
                               int *dashIndex, qreal *dashOffset, bool *inDash);
@@ -354,8 +358,6 @@ public:
     QScopedPointer dashStroker;
 
     QScopedPointer grayRaster;
-    unsigned long rasterPoolSize;
-    unsigned char *rasterPoolBase;
 
     QDataBuffer cachedLines;
     QSpanData image_filler;
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index a78cafb..fda937e 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -149,6 +149,7 @@ QDebug Q_GUI_EXPORT &operator<<(QDebug &s, const QVectorPath &path)
 
 
 struct StrokeHandler {
+    StrokeHandler(int reserve) : pts(reserve), types(reserve) {}
     QDataBuffer pts;
     QDataBuffer types;
 };
@@ -394,7 +395,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
         return;
 
     if (!d->strokeHandler) {
-        d->strokeHandler = new StrokeHandler;
+        d->strokeHandler = new StrokeHandler(path.elementCount()+4);
         d->stroker.setMoveToHook(qpaintengineex_moveTo);
         d->stroker.setLineToHook(qpaintengineex_lineTo);
         d->stroker.setCubicToHook(qpaintengineex_cubicTo);
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index c910024..78553c9 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -278,7 +278,8 @@ private:
 };
 
 SegmentTree::SegmentTree(QPathSegments &segments)
-    : m_segments(segments)
+    : m_segments(segments),
+      m_intersections(0)
 {
     m_bounds.x1 = qt_inf();
     m_bounds.y1 = qt_inf();
@@ -806,7 +807,7 @@ void QWingedEdge::intersectAndAdd()
     for (int i = 0; i < m_segments.points(); ++i)
         addVertex(m_segments.pointAt(i));
 
-    QDataBuffer intersections;
+    QDataBuffer intersections(m_segments.segments());
     for (int i = 0; i < m_segments.segments(); ++i) {
         intersections.reset();
 
@@ -857,11 +858,17 @@ void QWingedEdge::intersectAndAdd()
     }
 }
 
-QWingedEdge::QWingedEdge()
+QWingedEdge::QWingedEdge() :
+    m_edges(0),
+    m_vertices(0),
+    m_segments(0)
 {
 }
 
-QWingedEdge::QWingedEdge(const QPainterPath &subject, const QPainterPath &clip)
+QWingedEdge::QWingedEdge(const QPainterPath &subject, const QPainterPath &clip) :
+    m_edges(subject.length()),
+    m_vertices(subject.length()),
+    m_segments(subject.length())
 {
     m_segments.setPath(subject);
     m_segments.addPath(clip);
@@ -1414,9 +1421,9 @@ bool QPathClipper::intersect()
     else if (clipIsRect)
         return subjectPath.intersects(r2);
 
-    QPathSegments a;
+    QPathSegments a(subjectPath.length());
     a.setPath(subjectPath);
-    QPathSegments b;
+    QPathSegments b(clipPath.length());
     b.setPath(clipPath);
 
     QIntersectionFinder finder;
@@ -1459,9 +1466,9 @@ bool QPathClipper::contains()
     if (clipIsRect)
         return subjectPath.contains(r2);
 
-    QPathSegments a;
+    QPathSegments a(subjectPath.length());
     a.setPath(subjectPath);
-    QPathSegments b;
+    QPathSegments b(clipPath.length());
     b.setPath(clipPath);
 
     QIntersectionFinder finder;
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index 7962400..fab618d 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -199,7 +199,7 @@ public:
     };
 
 
-    QPathSegments();
+    QPathSegments(int reserve);
 
     void setPath(const QPainterPath &path);
     void addPath(const QPainterPath &path);
@@ -345,7 +345,10 @@ inline QPathVertex::operator QPointF() const
     return QPointF(x, y);
 }
 
-inline QPathSegments::QPathSegments()
+inline QPathSegments::QPathSegments(int reserve) :
+    m_points(reserve),
+    m_segments(reserve),
+    m_intersections(reserve)
 {
 }
 
diff --git a/src/gui/painting/qpolygonclipper_p.h b/src/gui/painting/qpolygonclipper_p.h
index 1b4cbb3..cdaac1c 100644
--- a/src/gui/painting/qpolygonclipper_p.h
+++ b/src/gui/painting/qpolygonclipper_p.h
@@ -62,7 +62,8 @@ QT_BEGIN_NAMESPACE
 template  class QPolygonClipper
 {
 public:
-    QPolygonClipper()
+    QPolygonClipper() :
+        buffer1(0), buffer2(0)
     {
         x1 = y1 = x2 = y2 = 0;
     }
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index 51d01c9..f8f8afb 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -198,9 +198,11 @@ public:
 };
 
 QScanConverter::QScanConverter()
-   : m_alloc(0)
+   : m_lines(0)
+   , m_alloc(0)
    , m_size(0)
    , m_intersections(0)
+   , m_active(0)
 {
 }
 
@@ -310,6 +312,10 @@ struct QBoolToType
 template 
 void qScanConvert(QScanConverter &d, T allVertical)
 {
+    if (!d.m_lines.size()) {
+        d.m_active.reset();
+        return;
+    }
     qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder));
     int line = 0;
     for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) {
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index e43544c..9b8e099 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -187,7 +187,7 @@ static inline qreal adapted_angle_on_x(const QLineF &line)
 }
 
 QStrokerOps::QStrokerOps()
-    : m_customData(0), m_moveTo(0), m_lineTo(0), m_cubicTo(0)
+    : m_elements(0), m_customData(0), m_moveTo(0), m_lineTo(0), m_cubicTo(0)
 {
 }
 
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
index adc69ee..46029b9 100644
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
+++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
@@ -100,8 +100,10 @@ class QGL2PEXVertexArray
 {
 public:
     QGL2PEXVertexArray() :
+        vertexArray(0), vertexArrayStops(0),
         maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10),
-        boundingRectDirty(true) {}
+        boundingRectDirty(true)
+    { }
     
     inline void addRect(const QRectF &rect)
     {
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 6ba0c42..0a046dc 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -177,6 +177,7 @@ public:
             ctx(0),
             useSystemClip(true),
             elementIndicesVBOId(0),
+            opacityArray(0),
             snapToPixelGrid(false),
             addOffset(false),
             nativePaintingActive(false),
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
index f677ce1..9bc099d 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
@@ -481,7 +481,8 @@ static void qdashprocessor_cubicTo(qreal, qreal, qreal, qreal, qreal, qreal, voi
 }
 
 QDashedStrokeProcessor::QDashedStrokeProcessor()
-    : m_dash_stroker(0), m_inv_scale(1)
+    : m_points(0), m_types(0),
+      m_dash_stroker(0), m_inv_scale(1)
 {
     m_dash_stroker.setMoveToHook(qdashprocessor_moveTo);
     m_dash_stroker.setLineToHook(qdashprocessor_lineTo);
@@ -499,6 +500,8 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c
 
     m_points.reset();
     m_types.reset();
+    m_points.reserve(path.elementCount());
+    m_types.reserve(path.elementCount());
 
     qreal width = qpen_widthf(pen);
     if (width == 0)
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
index 956d7cc..ab27ed6 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
 class QTriangulatingStroker
 {
 public:
+    QTriangulatingStroker() : m_vertices(0) {}
     void process(const QVectorPath &path, const QPen &pen, const QRectF &clip);
 
     inline int vertexCount() const { return m_vertices.size(); }
diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp
index ce917ff..df7cbc2 100644
--- a/src/opengl/gl2paintengineex/qtriangulator.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulator.cpp
@@ -510,6 +510,7 @@ template 
 class QMaxHeap
 {
 public:
+    QMaxHeap() : m_data(0) {}
     inline int size() const {return m_data.size();}
     inline bool empty() const {return m_data.isEmpty();}
     inline bool isEmpty() const {return m_data.isEmpty();}
@@ -1299,7 +1300,8 @@ public:
     class ComplexToSimple
     {
     public:
-        inline ComplexToSimple(QTriangulator *parent) : m_parent(parent) { }
+        inline ComplexToSimple(QTriangulator *parent) : m_parent(parent),
+            m_edges(0), m_events(0), m_splits(0) { }
         void decompose();
     private:
         struct Edge
@@ -1412,7 +1414,7 @@ public:
     class SimpleToMonotone
     {
     public:
-        inline SimpleToMonotone(QTriangulator *parent) : m_parent(parent) { }
+        inline SimpleToMonotone(QTriangulator *parent) : m_parent(parent), m_edges(0), m_upperVertex(0) { }
         void decompose();
     private:
         enum VertexType {MergeVertex, EndVertex, RegularVertex, StartVertex, SplitVertex};
@@ -1486,7 +1488,7 @@ public:
         int m_length;
     };
 
-    inline QTriangulator() { }
+    inline QTriangulator() : m_vertices(0) { }
 
     // Call this only once.
     void initialize(const qreal *polygon, int count, uint hint, const QTransform &matrix);
@@ -2709,7 +2711,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition()
         return;
 
     Q_ASSERT(!m_edgeList.root);
-    QDataBuffer > diagonals;
+    QDataBuffer > diagonals(m_upperVertex.size());
 
     int i = 0;
     for (int index = 1; index < m_edges.size(); ++index) {
@@ -2853,7 +2855,7 @@ bool QTriangulator::SimpleToMonotone::CompareVertices::operator () (int i, int j
 void QTriangulator::MonotoneToTriangles::decompose()
 {
     QVector result;
-    QDataBuffer stack;
+    QDataBuffer stack(m_parent->m_indices.size());
     m_first = 0;
     // Require at least three more indices.
     while (m_first + 3 <= m_parent->m_indices.size()) {
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 306fd8b..d2b0d4f 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -668,6 +668,7 @@ public:
         , last_created_state(0)
         , shader_ctx(0)
         , grad_palette(0)
+        , tess_points(0)
         , drawable_texture(0)
         , ref_cleaner(this)
         {}
@@ -1950,6 +1951,8 @@ void QOpenGLPaintEnginePrivate::pathToVertexArrays(const QPainterPath &path)
 
 void QOpenGLPaintEnginePrivate::drawVertexArrays()
 {
+    if (tess_points_stops.count() == 0)
+        return;
     glEnableClientState(GL_VERTEX_ARRAY);
     glVertexPointer(2, GL_DOUBLE, 0, tess_points.data());
     int previous_stop = 0;
-- 
cgit v0.12


From 175eedd991d321d0902ea0065f9b288c62958a5d Mon Sep 17 00:00:00 2001
From: Thomas Zander 
Date: Tue, 4 May 2010 17:46:48 +0200
Subject: Add configure time checks for symbian environment

Adding test for various compile time components like rcomp and the compiler
actually working should make it failing much more transparant.

Reviewed-by: Thiago
---
 config.tests/symbian/simple/main.cpp   |  6 +++++
 config.tests/symbian/simple/simple.pro |  4 ++++
 configure                              | 41 +++++++++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 config.tests/symbian/simple/main.cpp
 create mode 100644 config.tests/symbian/simple/simple.pro

diff --git a/config.tests/symbian/simple/main.cpp b/config.tests/symbian/simple/main.cpp
new file mode 100644
index 0000000..41371da
--- /dev/null
+++ b/config.tests/symbian/simple/main.cpp
@@ -0,0 +1,6 @@
+#include 
+
+int main(int, char **) {
+    printf("test\n");
+    return 0;
+}
diff --git a/config.tests/symbian/simple/simple.pro b/config.tests/symbian/simple/simple.pro
new file mode 100644
index 0000000..fa086c9
--- /dev/null
+++ b/config.tests/symbian/simple/simple.pro
@@ -0,0 +1,4 @@
+TEMPLATE = app
+QT = 
+SOURCES += main.cpp
+
diff --git a/configure b/configure
index 6194eb5..a0ccf9a 100755
--- a/configure
+++ b/configure
@@ -780,7 +780,7 @@ L_FLAGS=
 RPATH_FLAGS=
 l_FLAGS=
 QCONFIG_FLAGS=
-XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++"
+XPLATFORM=              # This seems to be the QMAKESPEC, like "linux-g++" or "symbian/linux-gcce"
 PLATFORM=$QMAKESPEC
 QT_CROSS_COMPILE=no
 OPT_CONFIRM_LICENSE=no
@@ -4057,7 +4057,7 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then
 EOF
 fi
 
-if echo "$XPLATFORM" | grep symbian > /dev/null ; then
+case "$XPLATFORM" in *symbian*)
     cat << EOF
 
 Qt for Symbian only:
@@ -4069,7 +4069,8 @@ Qt for Symbian only:
     -no-usedeffiles .... Disable the usage of DEF files.
  *  -usedeffiles ....... Enable the usage of DEF files.
 EOF
-fi
+;;
+esac
 
    [ "x$ERROR" = "xyes" ] && exit 1
    exit 0
@@ -4697,6 +4698,40 @@ if [ "$CFG_ZLIB" = "auto" ]; then
     fi
 fi
 
+case "$XPLATFORM" in *symbian*)
+    if test -z "$EPOCROOT"; then
+        echo "Please export EPOCROOT. It should point to the sdk install dir"
+        exit 1
+    fi
+    if test ! -d "$EPOCROOT/epoc32"; then
+        echo "Could not find the 'epoc32' dir in your EPOCROOT."
+        exit 1
+    fi
+
+    # the main commands needed to compile;
+    (cd config.tests/symbian
+        mkdir -p rcomp
+        cd rcomp
+        rm -f rcomp_test.rsg
+        touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss
+        rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null
+        if test ! -f rcomp_test.rsg; then
+            echo "Finding a working rcomp in your PATH failed."
+            echo "Fatal error. Make sure you have the epoc tools working and in your PATH";
+            exit 1;
+        fi
+    )
+
+    # compile a simple main that uses printf
+    if ! "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/simple "simple" $L_FLAGS $I_FLAGS $l_FLAGS
+    then
+        echo "Testing your compiler failed. Could not compile a simple application."
+        echo "Fatal error; Rerun configure with -verbose to get more details."
+        exit 1;
+    fi
+    ;;
+esac
+
 if [ "$CFG_S60" = "auto" ]; then
     if echo "$XPLATFORM" | grep symbian > /dev/null; then
         CFG_S60=yes
-- 
cgit v0.12


From 9cd2a03b09cbe4b024304b1d5d761b464c6c05e4 Mon Sep 17 00:00:00 2001
From: aavit 
Date: Fri, 7 May 2010 10:12:07 +0200
Subject: my changes

---
 dist/changes-4.7.0 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index df782c0..3766c88 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -72,6 +72,8 @@ QtGui
     * Fixed a bug that led to missing text pixels in QTabBar when using
       small font sizes. (QTBUG-7137)
 
+ - QImage
+    * Added QImage::bitPlaneCount(). (QTBUG-7982)
 
 QtNetwork
 ---------
@@ -102,6 +104,20 @@ QtXmlPatterns
  - [QTBUG-8394] include/import/redefine schemas only once
  - QXmlSchema: fix crash with referencing elements
 
+Qt Plugins
+----------
+
+ - Jpeg image IO plugin
+    * Fixed failure to store certain QImage formats as jpeg (QTBUG-7780)
+    * Optimized smoothscaling
+    * Optimized to avoid data copy when reading from memory device (QTBUG-9095)
+
+ - SVG image IO plugin
+    * Added support for svgz format (QTBUG-8227)
+    * Fixed canRead() so that it can be used also for non-sequential
+      devices. (QTBUG-9053)
+    * Added support for clipping and scaling and backgroundcolor
+    * Optimized to avoid data copy when reading from memory device (QTBUG-9095)
 
 ****************************************************************************
 *                          Database Drivers                                *
-- 
cgit v0.12


From f5366aea8594946e78106c5f93ecb2d47f121d32 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 7 May 2010 10:00:28 +0200
Subject: QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators,
 not to

---
 src/corelib/io/qurl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 7b5bfed..67119b5 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5985,7 +5985,7 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
 {
     QUrl url;
     url.setScheme(QLatin1String("file"));
-    QString deslashified = QDir::toNativeSeparators(localFile);
+    QString deslashified = QDir::fromNativeSeparators(localFile);
 
     // magic for drives on windows
     if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {
-- 
cgit v0.12


From aebc59dde62651bbe60af626f289a587d475e73a Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 7 May 2010 10:19:25 +0200
Subject: tst_qxmlquery: Fix misuse of absolute paths as URLs

Reviewed-By: Peter Hartmann
---
 tests/auto/qxmlquery/tst_qxmlquery.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index be0d708..6fd9b93 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -857,7 +857,7 @@ void tst_QXmlQuery::bindVariableXSLTSuccess() const
     stylesheet.bindVariable(QLatin1String("paramSelectWithTypeIntBoundWithBindVariableRequired"),
                                           QVariant(QLatin1String("param5")));
 
-    stylesheet.setQuery(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/parameters.xsl"))));
+    stylesheet.setQuery(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/parameters.xsl"))));
 
     QVERIFY(stylesheet.isValid());
 
@@ -1798,11 +1798,11 @@ void tst_QXmlQuery::setFocusQUrl() const
     {
         QXmlQuery query(QXmlQuery::XSLT20);
 
-        const TestURIResolver resolver(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
+        const TestURIResolver resolver(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
         query.setUriResolver(&resolver);
 
         QVERIFY(query.setFocus(QUrl(QLatin1String("arbitraryURI"))));
-        query.setQuery(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/copyWholeDocument.xsl"))));
+        query.setQuery(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/copyWholeDocument.xsl"))));
         QVERIFY(query.isValid());
 
         QBuffer result;
@@ -2997,7 +2997,7 @@ void tst_QXmlQuery::setInitialTemplateNameQXmlName() const
 
     QCOMPARE(query.initialTemplateName(), name);
 
-    query.setQuery(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/namedTemplate.xsl"))));
+    query.setQuery(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/namedTemplate.xsl"))));
     QVERIFY(query.isValid());
 
     QBuffer result;
@@ -3059,7 +3059,7 @@ void tst_QXmlQuery::setNetworkAccessManager() const
     /* Ensure fn:doc() picks up the right QNetworkAccessManager. */
     {
         NetworkOverrider networkOverrider(QUrl(QLatin1String("tag:example.com:DOESNOTEXIST")),
-                                          QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/queries/simpleDocument.xml"))));
+                                          QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/queries/simpleDocument.xml"))));
 
         QXmlQuery query;
         query.setNetworkAccessManager(&networkOverrider);
@@ -3075,7 +3075,7 @@ void tst_QXmlQuery::setNetworkAccessManager() const
     /* Ensure setQuery() is using the right network manager. */
     {
         NetworkOverrider networkOverrider(QUrl(QLatin1String("tag:example.com:DOESNOTEXIST")),
-                                          QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/queries/concat.xq"))));
+                                          QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/queries/concat.xq"))));
 
         QXmlQuery query;
         query.setNetworkAccessManager(&networkOverrider);
@@ -3135,7 +3135,7 @@ void tst_QXmlQuery::multipleDocsAndFocus() const
     query.setQuery(QLatin1String("string(doc('") +
                    inputFile(QLatin1String(SRCDIR "../xmlpatterns/queries/simpleDocument.xml")) +
                    QLatin1String("'))"));
-    query.setFocus(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
+    query.setFocus(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
     query.setQuery(QLatin1String("string(.)"));
 
     QStringList result;
@@ -3159,11 +3159,11 @@ void tst_QXmlQuery::multipleEvaluationsWithDifferentFocus() const
     QXmlQuery query;
     QStringList result;
 
-    query.setFocus(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
+    query.setFocus(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
     query.setQuery(QLatin1String("string(.)"));
     QVERIFY(query.evaluateTo(&result));
 
-    query.setFocus(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
+    query.setFocus(QUrl(inputFileAsURI(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml"))));
     QVERIFY(query.evaluateTo(&result));
 }
 
-- 
cgit v0.12


From db1254131c8d372e1d47acbaaa7c5c2b2be5b7d7 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen 
Date: Fri, 7 May 2010 11:51:10 +0300
Subject: Fix fetchedRoot test variable to work also in Symbian

RVCT builds cannot seem to be able to deal with data symbols at runtime,
so made accessors for fetchedRoot test variable. Also moved it out
of QFileInfoGatherer class as there is no need to have it there.

Reviewed-by: Janne Koskinen
---
 src/gui/dialogs/qfileinfogatherer.cpp        | 15 +++++++++++++--
 src/gui/dialogs/qfileinfogatherer_p.h        |  3 ---
 tests/auto/qfiledialog2/tst_qfiledialog2.cpp | 16 +++++++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 3b279ae..af0506f 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -55,7 +55,18 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_FILESYSTEMMODEL
 
-bool QFileInfoGatherer::fetchedRoot = false;
+#ifdef QT_BUILD_INTERNAL
+static bool fetchedRoot = false;
+Q_AUTOTEST_EXPORT void qt_test_resetFetchedRoot()
+{
+    fetchedRoot = false;
+}
+
+Q_AUTOTEST_EXPORT bool qt_test_isFetchedRoot()
+{
+    return fetchedRoot;
+}
+#endif
 
 /*!
     Creates thread
@@ -278,7 +289,7 @@ void QFileInfoGatherer::getFileInfos(const QString &path, const QStringList &fil
 
     // List drives
     if (path.isEmpty()) {
-#if defined Q_AUTOTEST_EXPORT
+#ifdef QT_BUILD_INTERNAL
         fetchedRoot = true;
 #endif
         QFileInfoList infoList;
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index 5abcd94..8681eb5 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -195,9 +195,6 @@ private:
     uint userId;
     uint groupId;
 #endif
-public :
-    //for testing purpose
-    static bool fetchedRoot;
 };
 #endif // QT_NO_FILESYSTEMMODEL
 
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index 6bfa8be..eee495f 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -76,6 +76,13 @@
 # define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/"
 #endif
 
+#if defined QT_BUILD_INTERNAL
+QT_BEGIN_NAMESPACE
+Q_GUI_EXPORT bool qt_test_isFetchedRoot();
+Q_GUI_EXPORT void qt_test_resetFetchedRoot();
+QT_END_NAMESPACE
+#endif
+
 class QNonNativeFileDialog : public QFileDialog
 {
     Q_OBJECT
@@ -139,7 +146,7 @@ private:
 };
 
 tst_QFileDialog2::tst_QFileDialog2()
-{   
+{
 #if defined(Q_OS_WINCE)
     qApp->setAutoMaximizeThreshold(-1);
 #endif
@@ -177,19 +184,18 @@ void tst_QFileDialog2::listRoot()
     QFileInfoGatherer fileInfoGatherer;
     fileInfoGatherer.start();
     QTest::qWait(1500);
-
-    QFileInfoGatherer::fetchedRoot = false;
+    qt_test_resetFetchedRoot();
     QString dir(QDir::currentPath());
     QNonNativeFileDialog fd(0, QString(), dir);
     fd.show();
-    QCOMPARE(QFileInfoGatherer::fetchedRoot,false);
+    QCOMPARE(qt_test_isFetchedRoot(),false);
     fd.setDirectory("");
 #ifdef Q_OS_WINCE
     QTest::qWait(1500);
 #else
     QTest::qWait(500);
 #endif
-    QCOMPARE(QFileInfoGatherer::fetchedRoot,true);
+    QCOMPARE(qt_test_isFetchedRoot(),true);
 #endif
 }
 
-- 
cgit v0.12


From 070a3dbbb368f3e1b817a5ecff15127302458e7a Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 7 May 2010 11:54:47 +0200
Subject: Add some debugging (disabled) to QUrl::resolved

---
 src/corelib/io/qurl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 67119b5..d6ded9d 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5557,6 +5557,12 @@ QUrl QUrl::resolved(const QUrl &relative) const
     removeDotsFromPath(&t.d->encodedPath);
     t.d->path.clear();
 
+#if defined(QURL_DEBUG)
+    qDebug("QUrl(\"%s\").resolved(\"%s\") = \"%s\"",
+           toEncoded().constData(),
+           relative.toEncoded().constData(),
+           t.toEncoded().constData());
+#endif
     return t;
 }
 
-- 
cgit v0.12


From 91337cb62bca653c9df7e8b8f43f451facc1efb8 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 7 May 2010 11:56:50 +0200
Subject: QtDeclarative: RFC 3986 requires schemes to be considered
 case-insensitively

Reviewed-By: Alan Alpert
---
 src/declarative/qml/qdeclarativecompositetypemanager.cpp | 2 +-
 src/declarative/qml/qdeclarativeengine.cpp               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
index 0eb7e1b..b0c9a43 100644
--- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp
+++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
@@ -338,7 +338,7 @@ void QDeclarativeCompositeTypeManager::resourceReplyFinished()
 // WARNING, there is a copy of this function in qdeclarativeengine.cpp
 static QString toLocalFileOrQrc(const QUrl& url)
 {
-    if (url.scheme() == QLatin1String("qrc")) {
+    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0) {
         if (url.authority().isEmpty())
             return QLatin1Char(':') + url.path();
         return QString();
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 0ee6dfe..1387432 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1526,7 +1526,7 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val
 // WARNING, there is a copy of this function in qdeclarativecompositetypemanager.cpp
 static QString toLocalFileOrQrc(const QUrl& url)
 {
-    if (url.scheme() == QLatin1String("qrc")) {
+    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0) {
         if (url.authority().isEmpty())
             return QLatin1Char(':') + url.path();
         return QString();
-- 
cgit v0.12


From 694822cbe757f2b742740f593319337127b04d17 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 7 May 2010 11:59:06 +0200
Subject: QtDeclarative: avoid waiting for a network load on URIs with empty
 schemes.

The proper fix would be to have QNetworkAccessManager notify
immediately that this load cannot work (and it knows it can't
work). Then QtDeclarative can simply check what QNAM found.

Reviewed-By: Alan Alpert
---
 .../qml/qdeclarativecompositetypemanager.cpp       | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
index b0c9a43..625356c 100644
--- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp
+++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
@@ -360,7 +360,10 @@ void QDeclarativeCompositeTypeManager::loadResource(QDeclarativeCompositeTypeRes
         } else {
             resource->status = QDeclarativeCompositeTypeResource::Error;
         }
+    } else if (url.scheme().isEmpty()) {
 
+        // We can't open this, so just declare as an error
+        resource->status = QDeclarativeCompositeTypeResource::Error;
     } else {
 
         QNetworkReply *reply = 
@@ -382,27 +385,29 @@ void QDeclarativeCompositeTypeManager::loadSource(QDeclarativeCompositeTypeData
         if (file.open(QFile::ReadOnly)) {
             QByteArray data = file.readAll();
             setData(unit, data, url);
-        } else {
-            QString errorDescription;
-            // ### - Fill in error
-            errorDescription = QLatin1String("File error for URL ") + url.toString();
-            unit->status = QDeclarativeCompositeTypeData::Error;
-            // ### FIXME
-            QDeclarativeError error;
-            error.setDescription(errorDescription);
-            unit->errorType = QDeclarativeCompositeTypeData::AccessError;
-            unit->errors << error;
-            doComplete(unit);
+            return; // success
         }
-
-    } else {
+    } else if (!url.scheme().isEmpty()) {
         QNetworkReply *reply = 
             engine->networkAccessManager()->get(QNetworkRequest(url));
         QObject::connect(reply, SIGNAL(finished()),
                          this, SLOT(replyFinished()));
         QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
                          this, SLOT(requestProgress(qint64,qint64)));
+        return; // waiting
     }
+
+    // error happened
+    QString errorDescription;
+    // ### - Fill in error
+    errorDescription = QLatin1String("File error for URL ") + url.toString();
+    unit->status = QDeclarativeCompositeTypeData::Error;
+    // ### FIXME
+    QDeclarativeError error;
+    error.setDescription(errorDescription);
+    unit->errorType = QDeclarativeCompositeTypeData::AccessError;
+    unit->errors << error;
+    doComplete(unit);
 }
 
 void QDeclarativeCompositeTypeManager::requestProgress(qint64 received, qint64 total)
@@ -724,8 +729,10 @@ void QDeclarativeCompositeTypeManager::compile(QDeclarativeCompositeTypeData *un
         }
     }
 
-    QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(QLatin1String("qmldir")));
-    if (toLocalFileOrQrc(importUrl).isEmpty())
+    QUrl importUrl;
+    if (!unit->imports.baseUrl().scheme().isEmpty())
+        importUrl = unit->imports.baseUrl().resolved(QUrl(QLatin1String("qmldir")));
+    if (!importUrl.scheme().isEmpty() && toLocalFileOrQrc(importUrl).isEmpty())
         resourceList.prepend(importUrl);
 
     for (int ii = 0; ii < resourceList.count(); ++ii) {
-- 
cgit v0.12


From 14fdf300795032b21fe51a256b5b22d3c14ca301 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Fri, 7 May 2010 13:20:14 +0200
Subject: Doc: Chages to search feature, css and table order Changes the search
 results Fixed table css Added odd&even classes to tables generated by the
 thmlgenerator

Reviewed-by: Morten Engvoldsen
---
 doc/src/template/scripts/functions.js |  7 ++--
 doc/src/template/style/style.css      | 29 ++++++++++++++---
 tools/qdoc3/htmlgenerator.cpp         | 60 ++++++++++++++++++++++++++++-------
 3 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 4b3107f..306b628 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -83,9 +83,9 @@ function processNokiaData(response){
 		} 
 	}	
 	 
-	if(lookupCount == 0){$('#ul001').prepend('
  • no result
    • ');$('#ul001 li').css('display','block');}
-    if(articleCount == 0){$('#ul002').prepend('
  • no result
    • ');$('#ul002 li').css('display','block');}
-	if(exampleCount == 0){$('#ul003').prepend('
  • no result
    • ');$('#ul003 li').css('display','block');}
+	if(lookupCount == 0){$('#ul001').prepend('
  • Found no result
    • ');$('#ul001 li').css('display','block');}
+    if(articleCount == 0){$('#ul002').prepend('
  • Found no result
    • ');$('#ul002 li').css('display','block');}
+	if(exampleCount == 0){$('#ul003').prepend('
  • Found no result
    • ');$('#ul003 li').css('display','block');}
 	// reset count variables;
 	 lookupCount=0;
 	 articleCount = 0;
@@ -97,6 +97,7 @@ function processNokiaData(response){
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
 {
+	$('.liveResult').remove();
 	var value = document.getElementById('pageType').value; 
 	if((blankRE.test(value)) || (value.length < 3))
 	{
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 6bcb0db..644e56b 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -460,12 +460,12 @@
         padding-left: 12px;
         background: url(../images/bullet_sq.png) no-repeat 0 5px;
         font: normal 400 10pt/1 Verdana;
-        color: #44a51c;
+       /* color: #44a51c;*/
         margin-bottom: 10px; 
     }
     .content li:hover
     {
-        text-decoration: underline;
+      /*  text-decoration: underline;*/
     }
 
     .offline .wrap .content
@@ -747,11 +747,23 @@
     th
     {
         padding: 5px 15px 5px 15px;
+        background-color: #E1E1E1;
+        border-bottom: 1px solid #E6E6E6;
+        border-left: 1px solid #E6E6E6;
+        border-right: 1px solid #E6E6E6;
     }
     td
     {
         padding: 3px 15px 3px 20px;
+        border-left: 1px solid #E6E6E6;
+        border-right: 1px solid #E6E6E6;
+    }
+    tr.odd td:hover,  tr.even td:hover
+    {
+    /*    border-right: 1px solid #C3C3C3;
+        border-left: 1px solid #C3C3C3;*/
     }
+		
 	td.rightAlign
 	{
         padding: 3px 15px 3px 10px;
@@ -879,13 +891,22 @@
         font: 600 12px/1.2 Arial;
     }
 
-	.generic{}
+	.generic{
+		max-width:100%;
+	}
+	.generic td{
+		padding:0;
+	}
+	
 	.alignedsummary{}
 	.propsummary{}
 	.memItemLeft{}
 	.memItemRight{}
 	.bottomAlign{}
-	.highlightedCode{}
+	.highlightedCode
+	{
+	margin:10px;
+	}
 	.LegaleseLeft{}
 	.valuelist{}
 	.annotated{}
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 93b0218..6560b68 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -912,8 +912,14 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else if (atom->string() == ATOM_LIST_VALUE) {
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
-                out() << ""
-                      << ""
+                out() << "
    Constant
    ";
+                    //  << ""
+				if (++numTableRows % 2 == 1)
+					out() << "";
+				else
+					out() << "";
+
+					out() << ""
                       << ""
                       << "\n";
             }
@@ -1093,7 +1099,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         if (!atom->string().isEmpty()) {
             if (atom->string().contains("%"))
-                out() << "
    ConstantValueDescription
    string() << "\">\n ";
+                out() << "
    \n "; // width=\"" << atom->string() << "\">\n ";
             else {
                 out() << "
    \n";
             }
@@ -2456,7 +2462,13 @@ void HtmlGenerator::generateCompactList(const Node *relative,
 
     out() << "
    \n";
     for (k = 0; k < numRows; k++) {
-        out() << "\n";
+        if (++numTableRows % 2 == 1)
+            out() << "";
+        else
+            out() << "";
+        //break;
+
+//	out() << "\n";
         for (i = 0; i < NumColumns; i++) {
             if (currentOffset[i] >= firstOffset[i + 1]) {
                 // this column is finished
@@ -3159,8 +3171,13 @@ void HtmlGenerator::generateSectionList(const Section& section,
             twoColumn = (section.members.count() >= 5);
         }
         if (twoColumn)
-            out() << "
    \n"
-                  << "
    ";
+            out() << "\n";
+        if (++numTableRows % 2 == 1)
+            out() << "";
+        else
+            out() << "";
+			
+//                  << "
    ";
         out() << "
      \n";
 
         int i = 0;
@@ -4367,8 +4384,12 @@ void HtmlGenerator::generateQmlSummary(const Section& section,
             twoColumn = (count >= 5);
         }
         if (twoColumn)
-            out() << "\n"
-                  << "
      ";
+            out() << "\n";
+			        if (++numTableRows % 2 == 1)
+				out() << "";
+				else
+				out() << "";
+            //      << "";
+				else
+					out() << "";
+				
+				out() << "
      ";
         out() << "
        \n";
 
         int row = 0;
@@ -4410,7 +4431,14 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         while (p != qpgn->childNodes().end()) {
             if ((*p)->type() == Node::QmlProperty) {
                 qpn = static_cast(*p);
-                out() << "
      ";
+                
+				if (++numTableRows % 2 == 1)
+					out() << "
      ";
+                //out() << "
      "; // old
                 out() << "";
                 if (!qpn->isWritable())
                     out() << "read-only";
@@ -4436,7 +4464,12 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         const FunctionNode* qsn = static_cast(node);
         out() << "
      ";
         out() << "";
-        out() << "";
+		if (++numTableRows % 2 == 1)
+			out() << "";
+		else
+			out() << "";
+        out() << "";
 		else
 			out() << "";
-        out() << "";
+        out() << "
      ";
         out() << "
      ";
+        //out() << "
      ";
         out() << "";
         generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
         //generateQmlItem(qsn,relative,marker,false);
@@ -4448,7 +4481,12 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         const FunctionNode* qmn = static_cast(node);
         out() << "
      ";
         out() << "";
-        out() << "";
+		if (++numTableRows % 2 == 1)
+			out() << "";
+		else
+			out() << "";
+        out() << "";
-- 
cgit v0.12


From 137e196dc1ae2364265e7c1eb79c880120a79bb9 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Fri, 7 May 2010 13:45:39 +0200
Subject: qdoc: Reorganized examples panel.

---
 doc/src/declarative/examples.qdoc           |  5 +-
 doc/src/getting-started/examples.qdoc       | 92 ++++++++++++++++++++++++++++-
 tools/qdoc3/test/qt-html-templates.qdocconf | 18 +++---
 3 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index e01459f..481617e 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -40,8 +40,9 @@
 ****************************************************************************/
 
 /*!
-\page qdeclarativeexamples.html
-\title QML Examples and Demos
+  \page qdeclarativeexamples.html
+  \title QML Examples and Demos
+  \ingroup all-examples
 
 \previouspage Graphics View Examples
 \contentspage Qt Examples
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 542f672..0088817 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -50,6 +50,39 @@
 */
 
 /*!
+   \group all-examples
+   \title Qt Examples
+
+   Qt includes a set of examples that cover nearly every aspect of Qt
+   development. They aren't meant to be impressive when you run them,
+   but in each case the source code has been carefully written to
+   illustrate one or more best Qt programming practices. 
+
+   You can run the examples from the \l{Examples and Demos Launcher}
+   application (except see \l{QML Examples and Demos} {QML Examples}
+   for special instructions for running thos examples).
+
+   The examples are listed below by functional area. Each example
+   listed in a particular functional area is meant to illustrate how
+   best to use Qt to do some particular task in that functional area,
+   but the examples will often use features from other functional
+   areas as well for completeness.
+
+   If you are new to Qt, you should probably start by going through
+   the \l{Tutorials}, and then begin with the
+   \l{mainwindows/application} {Application} example.
+
+   In addition to these examples and the \l{Tutorials}{tutorials}, Qt
+   includes a \l{Qt Demonstrations}{selection of demos} that
+   deliberately show off Qt's features. You might want to look at
+   these as well.
+
+   \section1 Examples by functional area
+
+   \generatelist{related}
+*/
+
+/*!
     \page examples.html
     \title Qt Examples
     \brief The example programs provided with Qt.
@@ -459,8 +492,18 @@
 */
 
 /*!
+   \group gui-examples
+   \title GUI Examples
+   \brief These pages list examples of constructing GUI components.
+
+   \generatelist{related}
+*/
+
+/*!
     \page examples-widgets.html
     \title Widgets Examples
+    \ingroup all-examples
+    \ingroup gui-examples
 
     \contentspage Qt Examples
     \nextpage Dialog Examples
@@ -509,7 +552,9 @@
 
 /*!
     \page examples-dialogs.html
+    \ingroup all-examples
     \title Dialog Examples
+    \ingroup gui-examples
 
     \previouspage Widgets Examples
     \contentspage Qt Examples
@@ -539,7 +584,9 @@
 
 /*!
     \page examples-mainwindow.html
+    \ingroup all-examples
     \title Main Window Examples
+    \ingroup gui-examples
 
     \previouspage Dialog Examples
     \contentspage Qt Examples
@@ -567,7 +614,9 @@
 
 /*!
     \page examples-layouts.html
+    \ingroup all-examples
     \title Layout Examples
+    \ingroup gui-examples
 
     \previouspage Main Window Examples
     \contentspage Qt Examples
@@ -594,6 +643,7 @@
 
 /*!
     \page examples-itemviews.html
+    \ingroup all-examples
     \title Item Views Examples
 
     \previouspage Layout Examples
@@ -631,8 +681,18 @@
 */
 
 /*!
+   \group graphics-examples
+   \title Graphics Examples
+   \brief These pages list examples of doing graphics.
+
+   \generatelist{related}
+*/
+
+/*!
     \page examples-graphicsview.html
+    \ingroup all-examples
     \title Graphics View Examples
+    \ingroup graphics-examples
 
     \previouspage Item Views Examples
     \contentspage Qt Examples
@@ -677,7 +737,9 @@
 
 /*!
     \page examples-painting.html
+    \ingroup all-examples
     \title Painting Examples
+    \ingroup graphics-examples
 
     \previouspage QML Examples and Demos
     \contentspage Qt Examples
@@ -709,6 +771,7 @@
 
 /*!
     \page examples-richtext.html
+    \ingroup all-examples
     \title Rich Text Examples
 
     \previouspage Painting Examples
@@ -732,6 +795,7 @@
 
 /*!
     \page examples-desktop.html
+    \ingroup all-examples
     \title Desktop Examples
 
     \previouspage Rich Text Examples
@@ -755,7 +819,9 @@
 
 /*!
     \page examples-draganddrop.html
+    \ingroup all-examples
     \title Drag and Drop Examples
+    \ingroup gui-examples
 
     \previouspage Desktop Examples
     \contentspage Qt Examples
@@ -783,6 +849,7 @@
 
 /*!
     \page examples-threadandconcurrent.html
+    \ingroup all-examples
     \title Threading and Concurrent Programming Examples
 
     \previouspage Drag and Drop Examples
@@ -823,6 +890,7 @@
 
 /*!
     \page examples.tools.html
+    \ingroup all-examples
     \title Tools Examples
 
     \previouspage Threading and Concurrent Programming Examples
@@ -861,6 +929,7 @@
 
 /*!
     \page examples-network.html
+    \ingroup all-examples
     \title Network Examples
 
     \previouspage Tools Examples
@@ -899,6 +968,7 @@
 
 /*!
     \page examples-ipc.html
+    \ingroup all-examples
     \title Inter-Process Communication Examples
 
     \previouspage Network Examples
@@ -916,7 +986,9 @@
 
 /*!
     \page examples-opengl.html
+    \ingroup all-examples
     \title OpenGL Examples
+    \ingroup graphics-examples
 
     \previouspage Inter-Process Communication Examples
     \contentspage Qt Examples
@@ -950,7 +1022,9 @@
 
 /*!
     \page examples-openvg.html
+    \ingroup all-examples
     \title OpenVG Examples
+    \ingroup graphics-examples
 
     \previouspage OpenGL Examples
     \contentspage Qt Examples
@@ -971,6 +1045,7 @@
 
 /*!
     \page examples-multimedia.html
+    \ingroup all-examples
     \title Multimedia Examples
 
     \previouspage OpenGL Examples
@@ -1020,6 +1095,7 @@
 
 /*!
     \page examples-sql.html
+    \ingroup all-examples
     \title SQL Examples
 
     \previouspage Multimedia Examples
@@ -1049,6 +1125,7 @@
 
 /*!
     \page examples-xml.html
+    \ingroup all-examples
     \title XML Examples
 
     \previouspage SQL Examples
@@ -1085,6 +1162,7 @@
 
 /*!
     \page examples-designer.html
+    \ingroup all-examples
     \title Qt Designer Examples
 
     \previouspage XML Examples
@@ -1110,6 +1188,7 @@
 
 /*!
     \page examples-uitools.html
+    \ingroup all-examples
     \title UiTools Examples
 
     \previouspage Qt Designer Examples
@@ -1126,6 +1205,7 @@
 
 /*!
     \page examples-linguist.html
+    \ingroup all-examples
     \title Qt Linguist Examples
 
     \previouspage UiTools Examples
@@ -1146,6 +1226,7 @@
 
 /*!
     \page examples-script.html
+    \ingroup all-examples
     \title Qt Script Examples
 
     \previouspage Qt Linguist Examples
@@ -1175,6 +1256,7 @@
 
 /*!
     \page examples-webkit.html
+    \ingroup all-examples
     \title WebKit Examples
 
     \previouspage Qt Script Examples
@@ -1215,7 +1297,8 @@
 */
 
 /*!
-    \page examples-helpsystem.html
+    \page examples-helpsystem.html 
+    \ingroup all-examples
     \title Help System Examples
 
     \previouspage WebKit Examples
@@ -1239,6 +1322,7 @@
 
 /*!
     \page examples-statemachine.html
+    \ingroup all-examples
     \title State Machine Examples
 
     \previouspage Help System Examples
@@ -1265,6 +1349,7 @@
 
 /*!
     \page examples-animation.html
+    \ingroup all-examples
     \title Animation Framework Examples
 
     \previouspage State Machine Examples
@@ -1287,6 +1372,7 @@
 
 /*!
     \page examples-multitouch.html
+    \ingroup all-examples
     \title Multi-Touch Examples
 
     \previouspage Animation Framework Examples
@@ -1306,6 +1392,7 @@
 
 /*!
     \page examples-gestures.html
+    \ingroup all-examples
     \title Gestures Examples
 
     \previouspage Multi-Touch Examples
@@ -1322,6 +1409,7 @@
 
 /*!
     \page examples-dbus.html
+    \ingroup all-examples
     \title D-Bus Examples
 
     \previouspage Gestures Examples
@@ -1341,6 +1429,7 @@
 
 /*!
     \page examples-embeddedlinux.html
+    \ingroup all-examples
     \title Qt for Embedded Linux Examples
 
     \previouspage D-Bus Examples
@@ -1363,6 +1452,7 @@
 
 /*!
     \page examples-activeqt.html
+    \ingroup all-examples
     \title ActiveQt Examples
 
     \previouspage Qt for Embedded Linux Examples
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 8b007db..b94bb81 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -44,10 +44,10 @@ HTML.postheader         = " 
      \n" \
 			  "           \n" \
 			  "          
      \n" \
 			  "          
      \n" \
@@ -62,7 +62,7 @@ HTML.postheader         = " 
      \n" \
 			  "              
    • Painting & Graphics
      • \n" \
 			  "              
    • GUI Components
      • \n" \
 			  "              
    • Qt Quick
      • \n" \
-			  "              
    • Platform specifics
      • \n" \
+			  "              
    • Platform specific
      • \n" \
 			  "              \n" \
 			  "          
      \n" \
 			  "          
      \n" \
@@ -70,14 +70,14 @@ HTML.postheader         = " 
      \n" \
 			  "        
      \n" \
 			  "        
      \n" \
 			  "          
      \n" \
-			  "            API Examples
      \n" \
+			  "            Qt Examples\n" \
 			  "          
      \n" \
 			  "         \n" \
 			  "          
      \n" \
 			  "          
      \n" \
-- 
cgit v0.12


From 7af5c4c01207960a23a349a55372ca7ecd8824f4 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Fri, 7 May 2010 14:03:45 +0200
Subject: Doc: Tuning search script

Reviewed-by: Morten Engvoldsen
---
 doc/src/template/scripts/functions.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 306b628..108590f 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -48,37 +48,37 @@ function processNokiaData(response){
 		var linkEnd  = "";
 		
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
-			lookupCount=0;
+			lookupCount++;
 			//$('.live001').css('display','block');
 			
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 				full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
 				full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
 					
-				$('#ul001').prepend(full_li_element);
+				$('#ul001').append(full_li_element);
 		   		}
 			}
 	 
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
-			articleCount = 0;
+			articleCount++;
 	 		//$('.live002').css('display','block');
 				 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
 				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
 					
-				$('#ul002').prepend(full_li_element);
+				$('#ul002').append(full_li_element);
 	   		}
 		}
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
-			exampleCount = 0;
+			exampleCount++;
 	 		//$('.live003').css('display','block');
 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
 				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
 					
-				$('#ul003').prepend(full_li_element);
+				$('#ul003').append(full_li_element);
 	   		}
 		} 
 	}	
-- 
cgit v0.12


From 011620f153b6115ba3bde672ee90fce69d771a59 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Fri, 7 May 2010 14:14:36 +0200
Subject: qdoc: Fixed annotated list generation to use 
      ";
         else
             out() << "";
-        out() << "";
 
         if (!(node->type() == Node::Fake)) {
             Text brief = node->doc().trimmedBriefText(name);
-- 
cgit v0.12


From a260024eeb58b1b70ff8083773d9c34434cb360a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= 
Date: Fri, 7 May 2010 15:21:28 +0200
Subject: My 4.7.0 changelog entries.

---
 dist/changes-4.7.0 | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 3766c88..6bf7ea5 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -72,9 +72,38 @@ QtGui
     * Fixed a bug that led to missing text pixels in QTabBar when using
       small font sizes. (QTBUG-7137)
 
+ - QGraphicsEffect
+    * Fixed rendering bugs when scrolling graphics items with drop
+      shadows.
+
  - QImage
+    * [QTBUG-9640] Prevented unneccessary copy in
+      QImage::setAlphaChannel().
     * Added QImage::bitPlaneCount(). (QTBUG-7982)
 
+ - QPainter
+    * [QTBUG-10018] Fixed image drawing inconsistencies when drawing
+      1x1 source rects with rotating / shear / perspective transforms.
+    * Optimized various blending and rendering operations for ARM
+      processors with a NEON vector unit.
+    * Fixed some performance issues when drawing sub-pixmaps of large
+      pixmaps and falling back to raster in the X11 paint engine.
+
+ - QPainterPath
+    * [QTBUG-3778] Fixed bug in painter path polygon intersection code.
+    * [QTBUG-7396] Optimized painter path intersections for when at
+      least one of the paths is a rectangle by special casing.
+    * [QTBUG-8035] Got rid of bezier intersection code in the boolean
+      operators (intersect, subtract, unite) to prevent numerical
+      stability issues.
+
+ - QRegion
+    * [QTBUG-7699] Fixed crash caused by large x-coordinates.
+
+ - QTransform
+    * [QTBUG-8557] Fixed bug in QTransform::type() potentially occuring
+      after using operator/ or operator* or their overloads.
+
 QtNetwork
 ---------
  - QHostInfo: Added a small 60 second DNS cache
-- 
cgit v0.12


From 346aa62e0ca4d02c32cae227165db004d2f15214 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Mon, 10 May 2010 10:32:59 +1000
Subject: Avoid changing header dependencies. (should fix compile on Symbian)

---
 src/gui/painting/qpaintengine_raster.cpp | 5 +++++
 src/gui/painting/qpaintengine_raster_p.h | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 483bc0c..6f395f6 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -251,6 +251,11 @@ static void qt_debug_path(const QPainterPath &path)
 }
 #endif
 
+QRasterPaintEnginePrivate::QRasterPaintEnginePrivate() :
+    QPaintEngineExPrivate(),
+    cachedLines(0)
+{
+}
 
 
 /*!
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 0a0b0b2..1016f8d 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -300,10 +300,7 @@ QRasterPaintEnginePrivate : public QPaintEngineExPrivate
 {
     Q_DECLARE_PUBLIC(QRasterPaintEngine)
 public:
-    QRasterPaintEnginePrivate() : QPaintEngineExPrivate(),
-        cachedLines(0)
-    {
-    }
+    QRasterPaintEnginePrivate();
 
     void rasterizeLine_dashed(QLineF line, qreal width,
                               int *dashIndex, qreal *dashOffset, bool *inDash);
-- 
cgit v0.12


From 1ca5742e83b650750d45d03882e8109c61c1f392 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Mon, 10 May 2010 10:54:32 +1000
Subject: There is no Qt.widgets

Task-number: QTBUG-10469
---
 examples/declarative/layouts/layoutItem/layoutItem.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qml b/examples/declarative/layouts/layoutItem/layoutItem.qml
index 9b9db22..460c564 100644
--- a/examples/declarative/layouts/layoutItem/layoutItem.qml
+++ b/examples/declarative/layouts/layoutItem/layoutItem.qml
@@ -1,5 +1,4 @@
 import Qt 4.7
-import Qt.widgets 4.7
 
 LayoutItem {//Sized by the layout
     id: resizable
-- 
cgit v0.12


From b524e356424fe386eae56f65600077ce52ca6f92 Mon Sep 17 00:00:00 2001
From: Alexis Menard 
Date: Mon, 10 May 2010 03:43:12 +0200
Subject: Optimize QGW constructor.

Mostly by avoiding sending useless QVariant at construction time.
itemChange is virtual, the user implementation will never be called.
Worst case the QGW one.

Reviewed-by:janarve
---
 src/gui/graphicsview/qgraphicsitem.cpp     | 7 ++++---
 src/gui/graphicsview/qgraphicswidget.cpp   | 3 ---
 src/gui/graphicsview/qgraphicswidget_p.cpp | 9 ++++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index ba674dd..b2bdc5c 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1090,6 +1090,10 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q
     if (newParent == parent)
         return;
 
+    if (isWidget)
+        static_cast(this)->fixFocusChainBeforeReparenting((newParent &&
+                                                        newParent->isWidget()) ? static_cast(newParent) : 0,
+                                                        scene);
     if (scene) {
         // Deliver the change to the index
         if (scene->d_func()->indexMethod != QGraphicsScene::NoIndex)
@@ -1796,9 +1800,6 @@ static void _q_qgraphicsItemSetFlag(QGraphicsItem *item, QGraphicsItem::Graphics
 */
 void QGraphicsItem::setFlags(GraphicsItemFlags flags)
 {
-    if (isWindow())
-        flags |= ItemIsPanel;
-
     // Notify change and check for adjustment.
     if (quint32(d_ptr->flags) == quint32(flags))
         return;
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index b264447..478c0c3 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -1105,9 +1105,6 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
         }
         break;
     case ItemParentChange: {
-        QGraphicsItem *parent = qVariantValue(value);
-        d->fixFocusChainBeforeReparenting((parent && parent->isWidget()) ? static_cast(parent) : 0, scene());
-
         // Deliver ParentAboutToChange.
         QEvent event(QEvent::ParentAboutToChange);
         QApplication::sendEvent(this, &event);
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index 6e397b6..50b315a 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -71,14 +71,17 @@ void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFl
     adjustWindowFlags(&wFlags);
     windowFlags = wFlags;
 
-    q->setParentItem(parentItem);
+    if (parentItem)
+        setParentItemHelper(parentItem, 0, 0);
+
     q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::DefaultType));
     q->setGraphicsItem(q);
 
     resolveLayoutDirection();
     q->unsetWindowFrameMargins();
-    q->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption);
-    q->setFlag(QGraphicsItem::ItemSendsGeometryChanges);
+    flags |= QGraphicsItem::ItemUsesExtendedStyleOption | QGraphicsItem::ItemSendsGeometryChanges;
+    if (windowFlags & Qt::Window)
+        flags |= QGraphicsItem::ItemIsPanel;
 }
 
 qreal QGraphicsWidgetPrivate::titleBarHeight(const QStyleOptionTitleBar &options) const
-- 
cgit v0.12


From 6ab242e23832f0ab10ef26a3b7b505cf086ddf43 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Mon, 10 May 2010 12:04:18 +1000
Subject: Prevent handling of Up/Down on Mac OS X, for consistency with other
 platforms.

Task-number: QTBUG-10438
---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp          | 9 +++++++--
 .../qdeclarativetextinput/tst_qdeclarativetextinput.cpp          | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 9ae4e1a..604f508 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -62,6 +62,9 @@ QT_BEGIN_NAMESPACE
 
     Input constraints include setting a QValidator, an input mask, or a
     maximum input length.
+
+    On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled.
+    If you want such bindings (on any platform), you will need to construct them in QML.
 */
 QDeclarativeTextInput::QDeclarativeTextInput(QDeclarativeItem* parent)
     : QDeclarativePaintedItem(*(new QDeclarativeTextInputPrivate), parent)
@@ -860,10 +863,12 @@ void QDeclarativeTextInputPrivate::focusChanged(bool hasFocus)
 void QDeclarativeTextInput::keyPressEvent(QKeyEvent* ev)
 {
     Q_D(QDeclarativeTextInput);
-    if(((d->control->cursor() == 0 && ev->key() == Qt::Key_Left)
+    if (((ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down) && ev->modifiers() == Qt::NoModifier) // Don't allow MacOSX up/down support, and we don't allow a completer.
+        || (((d->control->cursor() == 0 && ev->key() == Qt::Key_Left)
             || (d->control->cursor() == d->control->text().length()
                 && ev->key() == Qt::Key_Right))
-            && (d->lastSelectionStart == d->lastSelectionEnd)){
+            && (d->lastSelectionStart == d->lastSelectionEnd)))
+    {
         //ignore when moving off the end
         //unless there is a selection, because then moving will do something (deselect)
         ev->ignore();
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 0065ccf..c00390d 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -576,6 +576,14 @@ void tst_qdeclarativetextinput::navigation()
     simulateKey(canvas, Qt::Key_Left);
     QVERIFY(input->hasFocus() == true);
 
+    // Up and Down should NOT do Home/End, even on Mac OS X (QTBUG-10438).
+    input->setCursorPosition(2);
+    QCOMPARE(input->cursorPosition(),2);
+    simulateKey(canvas, Qt::Key_Up);
+    QCOMPARE(input->cursorPosition(),2);
+    simulateKey(canvas, Qt::Key_Down);
+    QCOMPARE(input->cursorPosition(),2);
+
     delete canvas;
 }
 
-- 
cgit v0.12


From c4d8435f80ef72fa419591a666b4e989ccb2c173 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Mon, 10 May 2010 12:19:16 +1000
Subject: Remove debug messages from mousearea autotest file

---
 .../declarative/qdeclarativemousearea/data/rejectEvent.qml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
index fecfadf..c01e938 100644
--- a/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
+++ b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml
@@ -14,15 +14,15 @@ Rectangle {
     MouseArea {
         id: mouseRegion1
         anchors.fill: parent
-        onPressed: {console.log("press111"); root.mr1_pressed = true}
-        onReleased: {console.log("release111"); root.mr1_released = true}
-        onCanceled: {console.log("ungrab1111"); root.mr1_canceled = true}
+        onPressed: { root.mr1_pressed = true }
+        onReleased: { root.mr1_released = true }
+        onCanceled: { root.mr1_canceled = true }
     }
     MouseArea {
         id: mouseRegion2
         width: 120; height: 120
-        onPressed: {console.log("press222"); root.mr2_pressed = true; mouse.accepted = false}
-        onReleased: {console.log("release2222"); root.mr2_released = true}
-        onCanceled: {console.log("ungrab2222"); root.mr2_canceled = true}
+        onPressed: { root.mr2_pressed = true; mouse.accepted = false }
+        onReleased: { root.mr2_released = true }
+        onCanceled: { root.mr2_canceled = true }
     }
 }
-- 
cgit v0.12


From b1b8d79cecb40e94ddaf91c0e319209849d27f9e Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Mon, 10 May 2010 12:29:13 +1000
Subject: Fixes doc of mouse area's onEntered

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

diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 74f2338..1947c00 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -197,8 +197,8 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
     This handler is called when the mouse enters the mouse area.
 
     By default the onEntered handler is only called while a button is
-    pressed.  Setting hoverEnabled to true enables handling of
-    onExited when no mouse button is pressed.
+    pressed. Setting hoverEnabled to true enables handling of
+    onEntered when no mouse button is pressed.
 
     \sa hoverEnabled
 */
@@ -209,7 +209,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
     This handler is called when the mouse exists the mouse area.
 
     By default the onExited handler is only called while a button is
-    pressed.  Setting hoverEnabled to true enables handling of
+    pressed. Setting hoverEnabled to true enables handling of
     onExited when no mouse button is pressed.
 
     \sa hoverEnabled
-- 
cgit v0.12


From 9fabb4624a3b1209bc7fb5a4edd919c62df20233 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Mon, 10 May 2010 12:56:43 +1000
Subject: Add some test asserts

---
 src/declarative/util/qdeclarativepropertychanges.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index c7e3bc5..6e88259 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -163,11 +163,13 @@ public:
 
     virtual void execute(Reason) {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
+        Q_ASSERT(expression != ownedExpression);
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse(Reason) {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
+        Q_ASSERT(reverseExpression != ownedExpression);
     }
 
     virtual void saveOriginals() {
@@ -177,6 +179,7 @@ public:
 
     virtual void rewind() {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
+        Q_ASSERT(rewindExpression != ownedExpression);
     }
     virtual void saveCurrentValues() { 
         rewindExpression = QDeclarativePropertyPrivate::signalExpression(property); 
-- 
cgit v0.12


From 5280485f2b614c7b0417e37f91b959b689835b42 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Mon, 10 May 2010 16:25:01 +1000
Subject: Removed multimedia effects from tvtennis declarative example

The multimedia elements are not part of 4.7 anymore.

Reviewed-by: Martin Jones
---
 examples/declarative/tvtennis/click.wav    | Bin 3056 -> 0 bytes
 examples/declarative/tvtennis/paddle.wav   | Bin 5320 -> 0 bytes
 examples/declarative/tvtennis/tvtennis.qml |   8 --------
 3 files changed, 8 deletions(-)
 delete mode 100644 examples/declarative/tvtennis/click.wav
 delete mode 100644 examples/declarative/tvtennis/paddle.wav

diff --git a/examples/declarative/tvtennis/click.wav b/examples/declarative/tvtennis/click.wav
deleted file mode 100644
index 26c46f8..0000000
Binary files a/examples/declarative/tvtennis/click.wav and /dev/null differ
diff --git a/examples/declarative/tvtennis/paddle.wav b/examples/declarative/tvtennis/paddle.wav
deleted file mode 100644
index 604e0e5..0000000
Binary files a/examples/declarative/tvtennis/paddle.wav and /dev/null differ
diff --git a/examples/declarative/tvtennis/tvtennis.qml b/examples/declarative/tvtennis/tvtennis.qml
index 354a16f..c90d9c5 100644
--- a/examples/declarative/tvtennis/tvtennis.qml
+++ b/examples/declarative/tvtennis/tvtennis.qml
@@ -1,5 +1,4 @@
 import Qt 4.7
-import Qt.multimedia 4.7
 
 Rectangle {
     id: page
@@ -17,17 +16,12 @@ Rectangle {
         x: 20; width: 20; height: 20; z: 1
         color: "Lime"
 
-        SoundEffect { id: paddle; source: "paddle.wav" }
-        SoundEffect { id: wall; source: "click.wav" }
-
         // Move the ball to the right and back to the left repeatedly
         SequentialAnimation on x {
             loops: Animation.Infinite
             NumberAnimation { to: page.width - 40; duration: 2000 }
-            ScriptAction { script: paddle.play() }
             PropertyAction { target: ball; property: "direction"; value: "left" }
             NumberAnimation { to: 20; duration: 2000 }
-            ScriptAction { script: paddle.play() }
             PropertyAction { target: ball; property: "direction"; value: "right" }
         }
 
@@ -37,10 +31,8 @@ Rectangle {
         // Detect the ball hitting the top or bottom of the view and bounce it
         onYChanged: {
             if (y <= 0) {
-                wall.play();
                 targetY = page.height - 20;
             } else if (y >= page.height - 20) {
-                wall.play();
                 targetY = 0;
             }
         }
-- 
cgit v0.12


From abcec6ba4b126358c50bf4c539253f88da6bb2d6 Mon Sep 17 00:00:00 2001
From: Nicolai de Haan 
Date: Wed, 5 May 2010 16:54:34 +0200
Subject: Opt out of visual-config size checks with extension
 EGL_NV_post_convert_replication. QTBUG-9444.

Task-number:   QTBUG-9444
Merge-request: 612
Reviewed-by:   Trond
---
 src/gui/egl/qegl_x11.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index cb8dcda..969acc4 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -163,6 +163,11 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config)
         int matchingCount = 0;
         chosenVisualInfo = XGetVisualInfo(X11->display, VisualIDMask, &visualInfoTemplate, &matchingCount);
         if (chosenVisualInfo) {
+            // Skip size checks if implementation supports non-matching visual
+            // and config (http://bugreports.qt.nokia.com/browse/QTBUG-9444).
+            if (QEgl::hasExtension("EGL_NV_post_convert_replication"))
+                return visualId;
+
             int visualRedSize = countBits(chosenVisualInfo->red_mask);
             int visualGreenSize = countBits(chosenVisualInfo->green_mask);
             int visualBlueSize = countBits(chosenVisualInfo->blue_mask);
-- 
cgit v0.12


From 346215c3d9f0be621a833e7c735501504c7aa0b0 Mon Sep 17 00:00:00 2001
From: Jakub Wieczorek 
Date: Mon, 10 May 2010 11:02:37 +0200
Subject: tst_SuiteTest: Fix a meaningless switch statement

The switch statement, that specifies which test handler should be used to run
a test suite was missing break; statements, which made it always fall back
to the XML Schema test suite.

Merge-request: 619
Reviewed-by: Benjamin Poulain 
---
 tests/auto/xmlpatternsxqts/tst_suitetest.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index 64120c7..ec63858 100644
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
@@ -89,10 +89,17 @@ void tst_SuiteTest::runTestSuite() const
 
     TestSuite::SuiteType suiteType;
     switch (m_suiteType) {
-        case XQuerySuite: suiteType = TestSuite::XQuerySuite;
-        case XsltSuite: suiteType = TestSuite::XsltSuite;
-        case XsdSuite: suiteType = TestSuite::XsdSuite;
-        default: break;
+    case XQuerySuite:
+        suiteType = TestSuite::XQuerySuite;
+        break;
+    case XsltSuite:
+        suiteType = TestSuite::XsltSuite;
+        break;
+    case XsdSuite:
+        suiteType = TestSuite::XsdSuite;
+        break;
+    default:
+        break;
     }
 
     TestSuite *const ts = TestSuite::openCatalog(catalogPath, errMsg, true, suiteType);
-- 
cgit v0.12


From 48d22dbcf4a8608b0e5242b25f0b4f771656b683 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Mon, 10 May 2010 12:51:37 +0200
Subject: Doc: Updates to the html template and javascript

Reviewed-by: Morten Engvoldsen
---
 doc/src/template/scripts/functions.js       | 9 +++++++++
 tools/qdoc3/htmlgenerator.cpp               | 1 +
 tools/qdoc3/test/qt-html-templates.qdocconf | 5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 108590f..2362bc4 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -50,6 +50,8 @@ function processNokiaData(response){
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
 			lookupCount++;
 			//$('.live001').css('display','block');
+			$('#ul001 .defaultLink').css('display','none');
+
 			
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 				full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
@@ -62,6 +64,8 @@ function processNokiaData(response){
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
 			articleCount++;
 	 		//$('.live002').css('display','block');
+			$('#ul002 .defaultLink').css('display','none');
+
 				 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
@@ -73,6 +77,8 @@ function processNokiaData(response){
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
 			exampleCount++;
 	 		//$('.live003').css('display','block');
+			$('#ul003 .defaultLink').css('display','none');
+
 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
 			    full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue;
@@ -114,6 +120,9 @@ function CheckEmptyAndLoadList()
 
 // Loads on doc ready
 	$(document).ready(function () {
+	var pageTitle = $('title').html();
+		$('#feedform').append('');
+
         $('#pageType').keyup(function () {
           var searchString = $('#pageType').val() ;
           if ((searchString == null) || (searchString.length < 3)) {
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 67aa6c6..638ae94 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1849,6 +1849,7 @@ void HtmlGenerator::generateFooter(const Node *node)
 
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
           << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
+	      out() << "  \n";
           out() << "\n";
           out() <<   "\n";
 }
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index b94bb81..534f19f 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -127,8 +127,9 @@ HTML.footer             = "        \n" \
 			  "      
      \n" \
 			  "        X\n" \
 			  "      
      \n" \
-			  "    
      \n" \
-			  "      
      \n" \
+			  "    \n" \
+			  "      
      \n" \
+			  "      \n" \
 			  "      
      \n" \
 			  "    \n" \
-- 
cgit v0.12


From 20b7f5773777b8999f21f50e55b8f446a29fd976 Mon Sep 17 00:00:00 2001
From: Janne Anttila 
Date: Mon, 10 May 2010 14:18:53 +0300
Subject: Workaround for Symbian Open C bug in socket connect.

Socket connect in Symbian may return non-standard EPIPE error,
after which the connection is terminated. Added Symbian specific
workaround to set socket to UnconnectedState if EPIPE errno is
received. In addition a bug report for Open C is created:
http://developer.symbian.org/bugs/show_bug.cgi?id=2676

Task-number: QT-3362
Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
---
 src/network/socket/qnativesocketengine_unix.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index d155357..70bb0da 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -425,6 +425,9 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &addr, quint16
         case EBADF:
         case EFAULT:
         case ENOTSOCK:
+#ifdef Q_OS_SYMBIAN
+        case EPIPE:
+#endif
             socketState = QAbstractSocket::UnconnectedState;
         default:
             break;
-- 
cgit v0.12


From 5e07004df26cbf65a0fe0096a3417a5329f72431 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Mon, 10 May 2010 14:14:38 +0200
Subject: Doc correction to css

Reviewed-by: Morten Engvoldsen
---
 doc/src/template/style/style.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 644e56b..2e01af6 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1026,8 +1026,8 @@
     {
         display: inline-block;
         width: 49%; 
-       /* *width:42%;
-        _width:42%;*/
+        *width:42%;
+        _width:42%;
         padding:0 2% 0 1%;
         vertical-align:top;
 
@@ -1036,8 +1036,8 @@
     .indexboxcont .indexIcon
     {
         width: 11%; 
-       /* *width:18%;
-        _width:18%;*/
+        *width:18%;
+        _width:18%;
         overflow:hidden;
 
 }
-- 
cgit v0.12


From 147ef453d130fc7817b3b4406502b1b887ab6c79 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Mon, 10 May 2010 14:20:47 +0200
Subject: qdoc: Another revision of the top doc page.

More to come.
---
 doc/src/getting-started/examples.qdoc       | 31 ++++++-----------------------
 doc/src/index.qdoc                          | 22 ++++++++++----------
 doc/src/overviews.qdoc                      | 13 ++++++++----
 tools/qdoc3/test/qt-html-templates.qdocconf | 13 ++++++------
 4 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 0088817..400714f 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -492,18 +492,10 @@
 */
 
 /*!
-   \group gui-examples
-   \title GUI Examples
-   \brief These pages list examples of constructing GUI components.
-
-   \generatelist{related}
-*/
-
-/*!
     \page examples-widgets.html
     \title Widgets Examples
     \ingroup all-examples
-    \ingroup gui-examples
+    \brief Lots of examples of how to use different kinds of widgets.
 
     \contentspage Qt Examples
     \nextpage Dialog Examples
@@ -554,7 +546,7 @@
     \page examples-dialogs.html
     \ingroup all-examples
     \title Dialog Examples
-    \ingroup gui-examples
+    \brief Using Qt's standard dialogs and building and using custom dialogs.
 
     \previouspage Widgets Examples
     \contentspage Qt Examples
@@ -586,7 +578,7 @@
     \page examples-mainwindow.html
     \ingroup all-examples
     \title Main Window Examples
-    \ingroup gui-examples
+    \building applications around a main window.
 
     \previouspage Dialog Examples
     \contentspage Qt Examples
@@ -616,7 +608,7 @@
     \page examples-layouts.html
     \ingroup all-examples
     \title Layout Examples
-    \ingroup gui-examples
+    Using Qt's layout-based approach to widget management.
 
     \previouspage Main Window Examples
     \contentspage Qt Examples
@@ -645,6 +637,7 @@
     \page examples-itemviews.html
     \ingroup all-examples
     \title Item Views Examples
+    \brief Using the model/view design pattern to separate presentation from data.
 
     \previouspage Layout Examples
     \contentspage Qt Examples
@@ -681,18 +674,10 @@
 */
 
 /*!
-   \group graphics-examples
-   \title Graphics Examples
-   \brief These pages list examples of doing graphics.
-
-   \generatelist{related}
-*/
-
-/*!
     \page examples-graphicsview.html
     \ingroup all-examples
     \title Graphics View Examples
-    \ingroup graphics-examples
+    \brief Using Qt to manage and interact with a large (potentially) number of graphics items.
 
     \previouspage Item Views Examples
     \contentspage Qt Examples
@@ -739,7 +724,6 @@
     \page examples-painting.html
     \ingroup all-examples
     \title Painting Examples
-    \ingroup graphics-examples
 
     \previouspage QML Examples and Demos
     \contentspage Qt Examples
@@ -821,7 +805,6 @@
     \page examples-draganddrop.html
     \ingroup all-examples
     \title Drag and Drop Examples
-    \ingroup gui-examples
 
     \previouspage Desktop Examples
     \contentspage Qt Examples
@@ -988,7 +971,6 @@
     \page examples-opengl.html
     \ingroup all-examples
     \title OpenGL Examples
-    \ingroup graphics-examples
 
     \previouspage Inter-Process Communication Examples
     \contentspage Qt Examples
@@ -1024,7 +1006,6 @@
     \page examples-openvg.html
     \ingroup all-examples
     \title OpenVG Examples
-    \ingroup graphics-examples
 
     \previouspage OpenGL Examples
     \contentspage Qt Examples
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 92f91e6..e6efe4d 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -70,26 +70,26 @@
             
      
               
      
                 
               
      
               
      
                 
               
      
               
      
                 
        
                   
      • Canvas UI with Graphics View
        • 
-                  
      • UI design & Qt Quick
        • 
                   
      • Input/output
        • 
                   
      • Integrating Web Content
        • 
                   
      • X-platform, debug & deploy
        • 
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index b2ba3a1..cb6541d 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -49,9 +49,9 @@
 
 /*!
     \group qt-basic-concepts
-    \title Qt Basic Concepts
+    \title Basic Qt Architecture
 
-    \brief The basic concepts of the Qt cross-platform application and UI framework.
+    \brief The basic architecture of the Qt cross-platform application and UI framework.
 
     Qt is a cross-platform application and UI framework for writing
     web-enabled applications for desktop, mobile, and embedded
@@ -63,9 +63,14 @@
 
 /*!
     \group qt-gui-concepts
-    \title Qt GUI Construction
+    \title Qt Desktop UI Components
 
-    \brief The Qt components for constructing Graphical User Intefaces.
+    \brief The Qt components for constructing native look & feel desktop UI's.
+
+    These pages are about Qt's traditional set of GUI components for
+    building both native look ^ feel and custom UI's for the desktop
+    environment. Use \l {declarativeui.html} {Qt Quick} for building 
+    UI's for mobile devices.
 
     \generatelist {related}
  */
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index b94bb81..e691705 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -47,7 +47,7 @@ HTML.postheader         = " 
        \n" \
 			  "              
      • Modules
        • \n" \
 			  "              
      • Namespaces
        • \n" \
 			  "              
      • Global stuff
        • \n" \
-			  "              
      • QML Elements
        • \n" \
+			  "              
      • QML elements
        • \n" \
 			  "            
       \n" \
 			  "          
      \n" \
 			  "          
      \n" \
@@ -58,11 +58,10 @@ HTML.postheader         = " 
      \n" \
 			  "            Qt Topics\n" \
 			  "          
      \n" \
 			  "              \n" \
 			  "          
      \n" \
 			  "          
      \n" \
@@ -70,7 +69,7 @@ HTML.postheader         = " 
      \n" \
 			  "        
      \n" \
 			  "        
      \n" \
 			  "          
      \n" \
-			  "            Qt Examples
      \n" \
+			  "            Examples\n" \
 			  "          
      \n" \
 			  "        
        \n" \
 			  "              
      • Examples
        • \n" \
-- 
cgit v0.12


From 0828b63ce77846f14994f7c47468f0db8b42fbd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= 
Date: Mon, 10 May 2010 12:39:52 +0200
Subject: Revert "Use QUrl::isLocalFile and fix the scheme checking in local
 URLs."

This reverts commit ebddf7a8739d7f4aaa7d9cb8a41a14eebb65e4f4.
---
 src/network/access/qnetworkaccessfilebackend.cpp | 11 +++--------
 src/network/access/qnetworkaccessmanager.cpp     | 11 ++++++-----
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp   |  6 ------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 710c258..4560153 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -65,15 +65,10 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0 || url.isLocalFile()) {
+    if (url.scheme() == QLatin1String("qrc") || !url.toLocalFile().isEmpty())
         return new QNetworkAccessFileBackend;
-    } else if (!url.scheme().isEmpty() && url.authority().isEmpty()) {
-        // check if QFile could, in theory, open this URL via the file engines
-        // it has to be in the format:
-        //    prefix:path/to/file
-        // or prefix:/path/to/file
-        //
-        // this construct here must match the one below in open()
+    else if (!url.isEmpty() && url.authority().isEmpty()) {
+        // check if QFile could, in theory, open this URL
         QFileInfo fi(url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery));
         if (fi.exists() || (op == QNetworkAccessManager::PutOperation && fi.dir().exists()))
             return new QNetworkAccessFileBackend;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 10fdc6f..1c7661d 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -907,20 +907,21 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
 {
     Q_D(QNetworkAccessManager);
 
-    bool isLocalFile = req.url().isLocalFile();
-
     // 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://
     if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation)
-         && isLocalFile) {
+         && (req.url().scheme() == QLatin1String("file")
+             || req.url().scheme().isEmpty())) {
         return new QFileNetworkReply(this, req, op);
     }
 
 #ifndef QT_NO_BEARERMANAGEMENT
     // Return a disabled network reply if network access is disabled.
     // Except if the scheme is empty or file://.
-    if (!d->networkAccessible && !isLocalFile) {
+    if (!d->networkAccessible && !(req.url().scheme() == QLatin1String("file") ||
+                                      req.url().scheme().isEmpty())) {
         return new QDisabledNetworkReply(this, req, op);
     }
 
@@ -962,7 +963,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
     QUrl url = request.url();
     QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
 #ifndef QT_NO_BEARERMANAGEMENT
-    if (!isLocalFile) {
+    if (req.url().scheme() != QLatin1String("file") && !req.url().scheme().isEmpty()) {
         connect(this, SIGNAL(networkSessionConnected()),
                 reply, SLOT(_q_networkSessionConnected()));
     }
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index c4d458f..9d942bf 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1166,12 +1166,6 @@ void tst_QNetworkReply::getErrors_data()
     QTest::addColumn("httpStatusCode");
     QTest::addColumn("dataIsEmpty");
 
-    // empties
-    QTest::newRow("empty-url") << QString() << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
-    QTest::newRow("empty-scheme-host") << SRCDIR "/rfc3252.txt" << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
-    QTest::newRow("empty-scheme") << "//" + QtNetworkSettings::winServerName() + "/testshare/test.pri"
-            << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
-
     // file: errors
     QTest::newRow("file-host") << "file://this-host-doesnt-exist.troll.no/foo.txt"
 #if !defined Q_OS_WIN
-- 
cgit v0.12


From 82433177590490e6a69074c2d86adaa7741b4913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= 
Date: Mon, 10 May 2010 14:11:54 +0200
Subject: Revert "QUrl::fromLocalFile: fix silly mistake: it's
 fromNativeSeparators, not to"

This reverts commit f5366aea8594946e78106c5f93ecb2d47f121d32.
---
 src/corelib/io/qurl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index d6ded9d..7e5c622 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5991,7 +5991,7 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
 {
     QUrl url;
     url.setScheme(QLatin1String("file"));
-    QString deslashified = QDir::fromNativeSeparators(localFile);
+    QString deslashified = QDir::toNativeSeparators(localFile);
 
     // magic for drives on windows
     if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {
-- 
cgit v0.12


From cc422e939d671bba8d70a5d02abfb893627303cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= 
Date: Mon, 10 May 2010 14:12:42 +0200
Subject: Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"

This reverts commit a9fb306a1cf1308a3f8b9bb12ed01aed1f6f6f8d.
---
 src/network/access/qnetworkaccessftpbackend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index da336d0..1a59011 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -77,7 +77,7 @@ QNetworkAccessFtpBackendFactory::create(QNetworkAccessManager::Operation op,
     }
 
     QUrl url = request.url();
-    if (url.scheme().compare(QLatin1String("ftp"), Qt::CaseInsensitive) == 0)
+    if (url.scheme() == QLatin1String("ftp"))
         return new QNetworkAccessFtpBackend;
     return 0;
 }
-- 
cgit v0.12


From 98e935eed5549e479f6666680aed1711dc42111c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= 
Date: Mon, 10 May 2010 14:12:52 +0200
Subject: Revert "Improve QUrl handling of local file paths"

This reverts commit a2f797b52c4274a62a7cf1f0939aca1429afe211.
---
 src/corelib/io/qurl.cpp      | 73 +++++++++++++-------------------------------
 src/corelib/io/qurl.h        |  1 -
 tests/auto/qurl/tst_qurl.cpp | 11 +------
 3 files changed, 23 insertions(+), 62 deletions(-)

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 7e5c622..d4b8b5f 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5976,22 +5976,19 @@ bool QUrl::isDetached() const
 
 
 /*!
-    Returns a QUrl representation of \a localFile, interpreted as a local
-    file. This function accepts paths separated by slashes as well as the
-    native separator for this platform.
+    Returns a QUrl representation of \a localFile, interpreted as a
+    local file.
 
-    This function also accepts paths with a doubled leading slash (or
-    backslash) to indicate a remote file, as in
-    "//servername/path/to/file.txt". Note that only certain platforms can
-    actually open this file using QFile::open().
-
-    \sa toLocalFile(), isLocalFile(), QDir::toNativeSeparators
+    \sa toLocalFile()
 */
 QUrl QUrl::fromLocalFile(const QString &localFile)
 {
     QUrl url;
     url.setScheme(QLatin1String("file"));
-    QString deslashified = QDir::toNativeSeparators(localFile);
+    QString deslashified = localFile;
+    deslashified.replace(QLatin1Char('\\'), QLatin1Char('/'));
+
+
 
     // magic for drives on windows
     if (deslashified.length() > 1 && deslashified.at(1) == QLatin1Char(':') && deslashified.at(0) != QLatin1Char('/')) {
@@ -6010,61 +6007,35 @@ QUrl QUrl::fromLocalFile(const QString &localFile)
 }
 
 /*!
-    Returns the path of this URL formatted as a local file path. The path
-    returned will use forward slashes, even if it was originally created
-    from one with backslashes.
+    Returns the path of this URL formatted as a local file path.
 
-    If this URL contains a non-empty hostname, it will be encoded in the
-    returned value in the form found on SMB networks (for example,
-    "//servername/path/to/file.txt").
-
-    \sa fromLocalFile(), isLocalFile()
+    \sa fromLocalFile()
 */
 QString QUrl::toLocalFile() const
 {
-    // the call to isLocalFile() also ensures that we're parsed
-    if (!isLocalFile())
-        return QString();
+    if (!d) return QString();
+    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
 
     QString tmp;
     QString ourPath = path();
+    if (d->scheme.isEmpty() || QString::compare(d->scheme, QLatin1String("file"), Qt::CaseInsensitive) == 0) {
 
-    // magic for shared drive on windows
-    if (!d->host.isEmpty()) {
-        tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
-                                               ? QLatin1Char('/') + ourPath :  ourPath);
-    } else {
-        tmp = ourPath;
-        // magic for drives on windows
-        if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
-            tmp.remove(0, 1);
+        // magic for shared drive on windows
+        if (!d->host.isEmpty()) {
+            tmp = QLatin1String("//") + d->host + (ourPath.length() > 0 && ourPath.at(0) != QLatin1Char('/')
+                                                  ? QLatin1Char('/') + ourPath :  ourPath);
+        } else {
+            tmp = ourPath;
+            // magic for drives on windows
+            if (ourPath.length() > 2 && ourPath.at(0) == QLatin1Char('/') && ourPath.at(2) == QLatin1Char(':'))
+                tmp.remove(0, 1);
+        }
     }
 
     return tmp;
 }
 
 /*!
-    \since 4.7
-    Returns true if this URL is pointing to a local file path. A URL is a
-    local file path if the scheme is "file".
-
-    Note that this function considers URLs with hostnames to be local file
-    paths, even if the eventual file path cannot be opened with
-    QFile::open().
-
-    \sa fromLocalFile(), toLocalFile()
-*/
-bool QUrl::isLocalFile() const
-{
-    if (!d) return false;
-    if (!QURL_HASFLAG(d->stateFlags, QUrlPrivate::Parsed)) d->parse();
-
-    if (d->scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)
-        return false;   // not file
-    return true;
-}
-
-/*!
     Returns true if this URL is a parent of \a childUrl. \a childUrl is a child
     of this URL if the two URLs share the same scheme and authority,
     and this URL's path is a parent of the path of \a childUrl.
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 162aa7c..6f8331a 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -183,7 +183,6 @@ public:
 
     static QUrl fromLocalFile(const QString &localfile);
     QString toLocalFile() const;
-    bool isLocalFile() const;
 
     QString toString(FormattingOptions options = None) const;
 
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 67bf0c1..fa42adc 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -314,7 +314,6 @@ void tst_QUrl::constructing()
 
 
     QUrl buildUNC;
-    buildUNC.setScheme(QString::fromLatin1("file"));
     buildUNC.setHost(QString::fromLatin1("somehost"));
     buildUNC.setPath(QString::fromLatin1("somepath"));
     QCOMPARE(buildUNC.toLocalFile(), QString::fromLatin1("//somehost/somepath"));
@@ -1758,15 +1757,7 @@ void tst_QUrl::toLocalFile_data()
     QTest::newRow("data7")	<< QString::fromLatin1("file://somehost/") << QString::fromLatin1("//somehost/");
     QTest::newRow("data8")	<< QString::fromLatin1("file://somehost") << QString::fromLatin1("//somehost");
     QTest::newRow("data9")	<< QString::fromLatin1("file:////somehost/somedir/somefile") << QString::fromLatin1("//somehost/somedir/somefile");
-    QTest::newRow("data10")	<< QString::fromLatin1("FILE:/a.txt") << QString::fromLatin1("/a.txt");
-
-    // and some that result in empty (i.e., not local)
-    QTest::newRow("xdata0") << QString::fromLatin1("/a.txt") << QString();
-    QTest::newRow("xdata1") << QString::fromLatin1("//a.txt") << QString();
-    QTest::newRow("xdata2") << QString::fromLatin1("///a.txt") << QString();
-    QTest::newRow("xdata3") << QString::fromLatin1("foo:/a.txt") << QString();
-    QTest::newRow("xdata4") << QString::fromLatin1("foo://a.txt") << QString();
-    QTest::newRow("xdata5") << QString::fromLatin1("foo:///a.txt") << QString();
+
 }
 
 void tst_QUrl::toLocalFile()
-- 
cgit v0.12


From dc63ab9018b1a7db94e822e710346600a83a4bc6 Mon Sep 17 00:00:00 2001
From: Thomas Zander 
Date: Mon, 10 May 2010 14:12:46 +0200
Subject: Allow EPOCROOT env var to be without trailing slash.

---
 mkspecs/symbian/linux-gcce/qmake.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
index 57bb56a..faac2f1 100644
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ b/mkspecs/symbian/linux-gcce/qmake.conf
@@ -83,13 +83,13 @@ for(line, QMAKE_GCC_SEARCH_DIRS) {
     }
 }
 
-QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
-
-INCLUDEPATH = ${EPOCROOT}epoc32/include/ \
-    $${EPOCROOT}epoc32/include/variant \
-    $${EPOCROOT}epoc32/include/stdapis \
-    $${EPOCROOT}epoc32/include/gcce \
-    ${EPOCROOT}epoc32/include/stdapis/sys \
-    ${EPOCROOT}epoc32/include/stdapis/stlport \
+QMAKE_LIBDIR += $${EPOCROOT}/epoc32/release/armv5/lib
+
+INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \
+    $${EPOCROOT}/epoc32/include/variant \
+    $${EPOCROOT}/epoc32/include/stdapis \
+    $${EPOCROOT}/epoc32/include/gcce \
+    ${EPOCROOT}/epoc32/include/stdapis/sys \
+    ${EPOCROOT}/epoc32/include/stdapis/stlport \
     $$INCLUDEPATH
 
-- 
cgit v0.12


From 4ad58161814a80409f790bf8269e147551adfee0 Mon Sep 17 00:00:00 2001
From: Thomas Zander 
Date: Mon, 10 May 2010 15:16:55 +0200
Subject: Documentation updates for Qt/Symbian on Linux development

---
 doc/src/getting-started/installation.qdoc | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3ea351e..36abc10 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -703,21 +703,19 @@ If you are using pre-built binaries, follow the instructions given in the
 \ingroup qtsymbian
 \brief How to install Qt on the Symbian platform using Linux.
 
-\note Qt for the Symbian platform has some requirements that are given in more detail
-in the \l{Qt for the Symbian platform Requirements} document. TODO list requirements like SDK here.
-
 \note \bold {This document describes how to install and configure Qt for
 the Symbian platform from scratch, using Linux as the build host.
-Qt does not come with a binary package for Linux yet, but if you want to avoid
-the full build of Qt and start developing applications right away, you can
-download drop-in binaries from here: TODO}
+Qt for Symbian binaries can be downloaded directly so development of
+applications using Qt for Symbian can start right away.}
 
 \list 1
 
     \o  Setup the development environment
 
-        TODO Make sure your Symbian development environment is correctly installed and
-        patched as explained in the \l{Qt for the Symbian platform Requirements} document.
+        \note Qt for the Symbian platform has some requirements on the development
+        platform. The Symbian SDK for Linux as well as a cross compiler for the ARM
+        processor used on Symbian devices should be present on the development machine.
+        See {http://qt.gitorious.org/qt/pages/QtCreatorSymbianLinux} for more details.
 
     \o  Install Qt
 
@@ -770,7 +768,7 @@ download drop-in binaries from here: TODO}
 
             The Qt libraries are built with "All -Tcb" capability, so that
             they can support all types of applications. However, these
-            capabilities are automatically lowered if you make a selfsigned
+            capabilities are automatically lowered if you make a self-signed
             package.
 
         \o Building a Qt package with a Symbian developer certificate
@@ -826,7 +824,7 @@ download drop-in binaries from here: TODO}
 
                Note the identifier on the line where your Symbian device
                appears. Then execute the following, using the first and
-               second part of the identifier in place of \c XXXX,
+               second part of the identifier in place of \c XXX,
                respectively.
 
                \snippet doc/src/snippets/code/doc_src_installation.qdoc 44
-- 
cgit v0.12


From ae09e6a14dce54190758428a9ea369cd28d36d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= 
Date: Mon, 10 May 2010 15:23:09 +0200
Subject: Made paint engine texture drawing work in GL ES 2 and updated docs.

Now QGLWidget::drawTexture() can be used on OpenGL ES 2.0 when there's
an active painter.

Task-number: QTBUG-10420
Reviewed-by: Trond
---
 src/opengl/qgl.cpp | 73 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index cfacf26..a3c1bac 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2773,23 +2773,27 @@ static void qDrawTextureRect(const QRectF &target, GLint textureWidth, GLint tex
 /*!
     \since 4.4
 
-    Draws the given texture, \a textureId, to the given target rectangle,
-    \a target, in OpenGL model space. The \a textureTarget should be a 2D
-    texture target.
+    This function supports the following use cases:
+
+    \list
+    \i On OpenGL and OpenGL ES 1.x it draws the given texture, \a textureId,
+    to the given target rectangle, \a target, in OpenGL model space. The
+    \a textureTarget should be a 2D texture target.
+    \i On OpenGL and OpenGL ES 2.x, if a painter is active, not inside a
+    beginNativePainting / endNativePainting block, and uses the
+    engine with type QPaintEngine::OpenGL2, the function will draw the given
+    texture, \a textureId, to the given target rectangle, \a target,
+    respecting the current painter state. This will let you draw a texture
+    with the clip, transform, render hints, and composition mode set by the
+    painter. Note that the texture target needs to be GL_TEXTURE_2D for this
+    use case, and that this is the only supported use case under OpenGL ES 2.x.
+    \endlist
 
-    \note This function is not supported under OpenGL/ES 2.0.
 */
 void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
 {
-#ifndef QT_OPENGL_ES_2
-#ifdef QT_OPENGL_ES
-    if (textureTarget != GL_TEXTURE_2D) {
-        qWarning("QGLContext::drawTexture(): texture target must be GL_TEXTURE_2D on OpenGL ES");
-        return;
-    }
-#else
-
-     if (d_ptr->active_engine && 
+#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2)
+     if (d_ptr->active_engine &&
          d_ptr->active_engine->type() == QPaintEngine::OpenGL2) {
          QGL2PaintEngineEx *eng = static_cast(d_ptr->active_engine);
          if (!eng->isNativePaintingActive()) {
@@ -2799,7 +2803,15 @@ void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum text
                 return;
         }
      }
+#endif
 
+#ifndef QT_OPENGL_ES_2
+#ifdef QT_OPENGL_ES
+    if (textureTarget != GL_TEXTURE_2D) {
+        qWarning("QGLContext::drawTexture(): texture target must be GL_TEXTURE_2D on OpenGL ES");
+        return;
+    }
+#else
     const bool wasEnabled = glIsEnabled(GL_TEXTURE_2D);
     GLint oldTexture;
     glGetIntegerv(GL_TEXTURE_BINDING_2D, &oldTexture);
@@ -2821,7 +2833,7 @@ void QGLContext::drawTexture(const QRectF &target, GLuint textureId, GLenum text
     Q_UNUSED(target);
     Q_UNUSED(textureId);
     Q_UNUSED(textureTarget);
-    qWarning("drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget) not supported with OpenGL ES/2.0");
+    qWarning("drawTexture() with OpenGL ES 2.0 requires an active OpenGL2 paint engine");
 #endif
 }
 
@@ -2836,14 +2848,26 @@ void QGLContext::drawTexture(const QRectF &target, QMacCompatGLuint textureId, Q
 /*!
     \since 4.4
 
-    Draws the given texture at the given \a point in OpenGL model
-    space. The \a textureTarget should be a 2D texture target.
+    This function supports the following use cases:
+
+    \list
+    \i By default it draws the given texture, \a textureId,
+    at the given \a point in OpenGL model space. The
+    \a textureTarget should be a 2D texture target.
+    \i If a painter is active, not inside a
+    beginNativePainting / endNativePainting block, and uses the
+    engine with type QPaintEngine::OpenGL2, the function will draw the given
+    texture, \a textureId, at the given \a point,
+    respecting the current painter state. This will let you draw a texture
+    with the clip, transform, render hints, and composition mode set by the
+    painter. Note that the texture target needs to be GL_TEXTURE_2D for this
+    use case.
+    \endlist
 
-    \note This function is not supported under OpenGL/ES.
+    \note This function is not supported under any version of OpenGL ES.
 */
 void QGLContext::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
 {
-    // this would be ok on OpenGL ES 2.0, but currently we don't have a define for that
 #ifdef QT_OPENGL_ES
     Q_UNUSED(point);
     Q_UNUSED(textureId);
@@ -4911,11 +4935,8 @@ void QGLWidget::deleteTexture(QMacCompatGLuint id)
 /*!
     \since 4.4
 
-    Draws the given texture, \a textureId to the given target rectangle,
-    \a target, in OpenGL model space. The \a textureTarget should be a 2D
-    texture target.
-
-    Equivalent to the corresponding QGLContext::drawTexture().
+    Calls the corresponding QGLContext::drawTexture() on
+    this widget's context.
 */
 void QGLWidget::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
 {
@@ -4935,10 +4956,8 @@ void QGLWidget::drawTexture(const QRectF &target, QMacCompatGLuint textureId, QM
 /*!
     \since 4.4
 
-    Draws the given texture, \a textureId, at the given \a point in OpenGL
-    model space. The \a textureTarget should be a 2D texture target.
-
-    Equivalent to the corresponding QGLContext::drawTexture().
+    Calls the corresponding QGLContext::drawTexture() on
+    this widget's context.
 */
 void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
 {
-- 
cgit v0.12


From e5622ab31b8cd20074fe29c1d597c1d7f4c6e6e8 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen 
Date: Mon, 10 May 2010 16:34:51 +0200
Subject: Fix typos in Elastic Nodes example documentation.

Among other things, use \c instead of \e (courier instead of italic).
---
 doc/src/examples/elasticnodes.qdoc | 124 +++++++++++++++++++------------------
 1 file changed, 65 insertions(+), 59 deletions(-)

diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc
index edc62d8..e6e6594 100644
--- a/doc/src/examples/elasticnodes.qdoc
+++ b/doc/src/examples/elasticnodes.qdoc
@@ -83,7 +83,7 @@
     also reimplements \l{QGraphicsItem::shape()}{shape()} to ensure its hit
     area has an elliptic shape (as opposed to the default bounding rectangle).
 
-    For edge management purposes the node provides a simple API for adding
+    For edge management purposes, the node provides a simple API for adding
     edges to a node, and for listing all connected edges.
 
     The \l{QGraphicsItem::advance()}{advance()} reimplementation is called
@@ -126,16 +126,21 @@
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 2
 
-    The \e calculateForces() function implements the elastic forces effect that
-    pulls and pushes on nodes in the grid. In addition to this algorithm, the
-    user can move one node around with the mouse. Because we do not want the
-    two to interfere, we start by checking if this \c Node is the current mouse
-    grabber item (i.e., QGraphicsScene::mouseGrabberItem()). Because we need to
-    find all neighboring (but not necessarily connected) nodes, we also make
-    sure the item is part of a scene in the first place.
+    There are two ways to move a node. The \c calculateForces() function
+    implements the elastic effect that pulls and pushes on nodes in the grid.
+    In addition, the user can directly move one node around with the mouse.
+    Because we do not want the two approaches to operate at the same time on
+    the same node, we start \c calculateForces() by checking if this \c Node is
+    the current mouse grabber item (i.e., QGraphicsScene::mouseGrabberItem()).
+    Because we need to find all neighboring (but not necessarily connected)
+    nodes, we also make sure the item is part of a scene in the first place.
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 3
 
+    The "elastic" effect comes from an algorithm that applies pushing and
+    pulling forces. The effect is impressive, and surprisingly simple to
+    implement.
+
     The algorithm has two steps: the first is to calculate the forces that push
     the nodes apart, and the second is to subtract the forces that pull the
     nodes together. First we need to find all the nodes in the graph. We call
@@ -143,19 +148,20 @@
     qgraphicsitem_cast() to look for \c Node instances.
 
     We make use of \l{QGraphicsItem::mapFromItem()}{mapFromItem()} to create a
-    vector pointing from this node to each other node, in \l{The Graphics View
-    Coordinate System}{local coordinates}. We use the decomposed components of
-    this vector to determine the direction and strength of force that apply to
-    the node. The forces are added up for each node, and weighted so that the
-    closest nodes are given the strongest force. The sum of all forces are
-    stored in \e xvel (X-velocity) and \e yvel (Y-velocity).
+    temporary vector pointing from this node to each other node, in \l{The
+    Graphics View Coordinate System}{local coordinates}. We use the decomposed
+    components of this vector to determine the direction and strength of force
+    that should apply to the node. The forces accumulate for each node, and are
+    then adjusted so that the closest nodes are given the strongest force, with
+    rapid degradation when distance increases. The sum of all forces is stored
+    in \c xvel (X-velocity) and \c yvel (Y-velocity).
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 4
 
-    The edges between the nodes represent the forces that pull the nodes
-    together. By visiting each edge that is connected to this node, we can use
-    a similar approach as above to find the direction and strength of all
-    forces. These forces are subtracted from \e xvel and \e yvel.
+    The edges between the nodes represent forces that pull the nodes together.
+    By visiting each edge that is connected to this node, we can use a similar
+    approach as above to find the direction and strength of all pulling forces.
+    These forces are subtracted from \c xvel and \c yvel.
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 5
 
@@ -166,20 +172,20 @@
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 6
 
-    The final step of \e calculateForces() determines the node's new position.
+    The final step of \c calculateForces() determines the node's new position.
     We add the force to the node's current position. We also make sure the new
     position stays inside of our defined boundaries. We don't actually move the
-    item in this function; that's done in a separate step, from \e advance().
+    item in this function; that's done in a separate step, from \c advance().
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 7
 
-    The \e advance() function updates the item's current position. It is called
-    from \e GraphWidget::timerEvent(). If the node's position changed, the
+    The \c advance() function updates the item's current position. It is called
+    from \c GraphWidget::timerEvent(). If the node's position changed, the
     function returns true; otherwise false is returned.
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 8
 
-    The \e Node's bounding rectangle is a 20x20 sized rectangle centered around
+    The \c Node's bounding rectangle is a 20x20 sized rectangle centered around
     its origin (0, 0), adjusted by 2 units in all directions to compensate for
     the node's outline stroke, and by 3 units down and to the right to make
     room for a simple drop shadow.
@@ -188,8 +194,8 @@
 
     The shape is a simple ellipse. This ensures that you must click inside the
     node's elliptic shape in order to drag it around. You can test this effect
-    by running the example, and zooming far enough in so that the nodes become
-    very large. Without reimplementing \l{QGraphicsItem::shape()}{shape()}, the
+    by running the example, and zooming far in so that the nodes are very
+    large. Without reimplementing \l{QGraphicsItem::shape()}{shape()}, the
     item's hit area would be identical to its bounding rectangle (i.e.,
     rectangular).
 
@@ -197,7 +203,7 @@
 
     This function implements the node's painting. We start by drawing a simple
     dark gray elliptic drop shadow at (-7, -7), that is, (3, 3) units down and
-    to the right.
+    to the right from the top-left corner (-10, -10) of the ellipse.
 
     We then draw an ellipse with a radial gradient fill. This fill is either
     Qt::yellow to Qt::darkYellow when raised, or the opposite when sunken. In
@@ -217,8 +223,8 @@
     calculations.
 
     This notification is the only reason why the nodes need to keep a pointer
-    back to the \e GraphWidget. Another approach could be to provide such
-    notification using a signal; in such case, \e Node would need to inherit
+    back to the \c GraphWidget. Another approach could be to provide such
+    notification using a signal; in such case, \c Node would need to inherit
     from QGraphicsObject.
 
     \snippet examples/graphicsview/elasticnodes/node.cpp 12
@@ -226,14 +232,14 @@
     Because we have set the \l{QGraphicsItem::ItemIsMovable}{ItemIsMovable}
     flag, we don't need to implement the logic that moves the node according to
     mouse input; this is already provided for us. We still need to reimplement
-    the mouse press and release handlers though, to update the nodes' visual
+    the mouse press and release handlers, though, to update the nodes' visual
     appearance (i.e., sunken or raised).
 
     \section1 Edge Class Definition
 
-    The \e Edge class represents the arrow-lines between the nodes in this
+    The \c Edge class represents the arrow-lines between the nodes in this
     example. The class is very simple: it maintains a source- and destination
-    node pointer, and provides an \e adjust() function that makes sure the line
+    node pointer, and provides an \c adjust() function that makes sure the line
     starts at the position of the source, and ends at the position of the
     destination. The edges are the only items that change continuously as
     forces pull and push on the nodes.
@@ -242,13 +248,13 @@
 
     \snippet examples/graphicsview/elasticnodes/edge.h 0
 
-    \e Edge inherits from QGraphicsItem, as it's a simple class that has no use
+    \c Edge inherits from QGraphicsItem, as it's a simple class that has no use
     for signals, slots, and properties (compare to QGraphicsObject).
 
     The constructor takes two node pointers as input. Both pointers are
     mandatory in this example. We also provide get-functions for each node.
 
-    The \e adjust() function repositions the edge, and the item also implements
+    The \c adjust() function repositions the edge, and the item also implements
     \l{QGraphicsItem::boundingRect()}{boundingRect()} and
     \{QGraphicsItem::paint()}{paint()}.
 
@@ -256,7 +262,7 @@
 
     \snippet examples/graphicsview/elasticnodes/edge.cpp 0
 
-    The \e Edge constructor initializes its arrowSize data member to 10 units;
+    The \c Edge constructor initializes its \c arrowSize data member to 10 units;
     this determines the size of the arrow which is drawn in
     \l{QGraphicsItem::paint()}{paint()}.
 
@@ -265,7 +271,7 @@
     This ensures that the edge items are not considered for mouse input at all
     (i.e., you cannot click the edges). Then, the source and destination
     pointers are updated, this edge is registered with each node, and we call
-    \e adjust() to update this edge's start end end position.
+    \c adjust() to update this edge's start end end position.
 
     \snippet examples/graphicsview/elasticnodes/edge.cpp 1
 
@@ -274,7 +280,7 @@
 
     \snippet examples/graphicsview/elasticnodes/edge.cpp 2
 
-    In \e adjust(), we define two points: \e sourcePoint, and \e destPoint,
+    In \c adjust(), we define two points: \c sourcePoint, and \c destPoint,
     pointing at the source and destination nodes' origins respectively. Each
     point is calculated using \l{The Graphics View Coordinate System}{local
     coordinates}.
@@ -295,7 +301,7 @@
 
     It's important to notice that we call
     \l{QGraphicsItem::prepareGeometryChange()}{prepareGeometryChange()} in this
-    function. The reason is that the variables \e sourcePoint and \e destPoint
+    function. The reason is that the variables \c sourcePoint and \c destPoint
     are used directly when painting, and they are returned from the
     \l{QGraphicsItem::boundingRect()}{boundingRect()} reimplementation. We must
     always call
@@ -338,26 +344,26 @@
 
     \section1 GraphWidget Class Definition
 
-    \e GraphWidget is a subclass of QGraphicsView, which provides the main
+    \c GraphWidget is a subclass of QGraphicsView, which provides the main
     window with scrollbars.
 
     \snippet examples/graphicsview/elasticnodes/graphwidget.h 0
 
-    It provides a basic constructor that initializes the scene, an \e
+    The class provides a basic constructor that initializes the scene, an \c
     itemMoved() function to notify changes in the scene's node graph, a few
     event handlers, a reimplementation of
     \l{QGraphicsView::drawBackground()}{drawBackground()}, and a helper
-    function for scaling the view by mouse or keyboard.
+    function for scaling the view by using the mouse wheel or keyboard.
 
     \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 0
 
-    \e GraphicsWidget's constructor creates the scene, and because most items
-    move around most of the time, it sets QGraphicsScene::NoIndex. Then the
-    scene gets a fixed \l{QGraphicsScene::sceneRect}{scene rectangle}.
-    The scene is then assigned to the \e GraphWidget view.
+    \c GraphicsWidget's constructor creates the scene, and because most items
+    move around most of the time, it sets QGraphicsScene::NoIndex. The scene
+    then gets a fixed \l{QGraphicsScene::sceneRect}{scene rectangle}, and is
+    assigned to the \c GraphWidget view.
 
     The view enables QGraphicsView::CacheBackground to cache rendering of its
-    static and somewhat complex background. Because the graph renders a close
+    static, and somewhat complex, background. Because the graph renders a close
     collection of small items that all move around, it's unnecessary for
     Graphics View to waste time finding accurate update regions, so we set the
     QGraphicsView::BoundingRectViewportUpdate viewport update mode. The default
@@ -381,15 +387,15 @@
 
     \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 2
 
-    \e GraphWidget is notified of node movement through this \e itemMoved()
+    \c GraphWidget is notified of node movement through this \c itemMoved()
     function. Its job is simply to restart the main timer in case it's not
     running already. The timer is designed to stop when the graph stabilizes,
     and start once it's unstable again.
 
     \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 3
 
-    This is \e GraphWidget's key event handler. The arrow keys move the center
-    node around, the '+' and '-' keys zoom in and out by calling \e
+    This is \c GraphWidget's key event handler. The arrow keys move the center
+    node around, the '+' and '-' keys zoom in and out by calling \c
     scaleView(), and the enter and space keys randomize the positions of the
     nodes. All other key events (e.g., page up and page down) are handled by
     QGraphicsView's default implementation.
@@ -398,16 +404,16 @@
 
     The timer event handler's job is to run the whole force calculation
     machinery as a smooth animation. Each time the timer is triggered, the
-    handler will find all nodes in the scene, and call \e
+    handler will find all nodes in the scene, and call \c
     Node::calculateForces() on each node, one at a time. Then, in a final step
-    it will call \e Node::advance() to move all nodes to their new positions.
-    By checking the return value of \e advance(), we can decide if the grid
+    it will call \c Node::advance() to move all nodes to their new positions.
+    By checking the return value of \c advance(), we can decide if the grid
     stabilized (i.e., no nodes moved). If so, we can stop the timer.
 
     \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 5
 
     In the wheel event handler, we convert the mouse wheel delta to a scale
-    factor, and pass this factor to \e scaleView(). This approach takes into
+    factor, and pass this factor to \c scaleView(). This approach takes into
     account the speed that the wheel is rolled. The faster you roll the mouse
     wheel, the faster the view will zoom.
 
@@ -415,24 +421,24 @@
 
     The view's background is rendered in a reimplementation of
     QGraphicsView::drawBackground(). We draw a large rectangle filled with a
-    linear gradient, with a drop shadow, and then render text in top. The text
-    is rendered twice to give a similar simple drop-shadow effect.
+    linear gradient, add a drop shadow, and then render text on top. The text
+    is rendered twice for a simple drop-shadow effect.
 
     This background rendering is quite expensive; this is why the view enables
     QGraphicsView::CacheBackground.
 
     \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 7
 
-    The \e scaleView() helper function checks that the scale factor stays
+    The \c scaleView() helper function checks that the scale factor stays
     within certain limits (i.e., you cannot zoom too far in nor too far out),
-    and then applies this scale.
+    and then applies this scale to the view.
 
     \section1 The main() Function
 
-    In contrast to the complexity of the rest of this example, the \e main()
+    In contrast to the complexity of the rest of this example, the \c main()
     function is very simple: We create a QApplication instance, seed the
-    randomizer using qsrand(), and then create and show an instance of \e
-    GraphWidget. Because all nodes in the grid are moved initially, the \e
+    randomizer using qsrand(), and then create and show an instance of \c
+    GraphWidget. Because all nodes in the grid are moved initially, the \c
     GraphWidget timer will start immediately after control has returned to the
     event loop.
 */
-- 
cgit v0.12


From 2df5a9567ff83a547c3c66e4b523844b78968108 Mon Sep 17 00:00:00 2001
From: Shane Kearns 
Date: Thu, 6 May 2010 17:34:58 +0100
Subject: Run autotests with minimal capabilities

The autotests were previously run with ALL-Tcb capability which gives
them more access to the filesystem etc. than a typical Qt application.

To have more realistic testing environmnent, tests are run with no
capabilities other than those required for the Qt APIs they use.
i.e. NetworkServices for network tests, None for others.

Reviewed-by: Liang Qi
---
 mkspecs/features/qttest_p4.prf                                       | 2 +-
 tests/auto/languagechange/tst_languagechange.cpp                     | 4 ++--
 tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro           | 1 +
 tests/auto/qabstractsocket/qabstractsocket.pro                       | 1 +
 tests/auto/qdirmodel/tst_qdirmodel.cpp                               | 5 +++++
 tests/auto/qftp/qftp.pro                                             | 1 +
 tests/auto/qhostaddress/qhostaddress.pro                             | 1 +
 tests/auto/qhostinfo/qhostinfo.pro                                   | 1 +
 tests/auto/qhttp/qhttp.pro                                           | 1 +
 tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro         | 2 ++
 tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro                   | 1 +
 tests/auto/qhttpsocketengine/qhttpsocketengine.pro                   | 1 +
 tests/auto/qiodevice/qiodevice.pro                                   | 1 +
 tests/auto/qlocalsocket/qlocalsocket.pro                             | 1 +
 tests/auto/qnativesocketengine/qnativesocketengine.pro               | 1 +
 tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro           | 1 +
 .../qnetworkaccessmanager_and_qprogressdialog.pro                    | 1 +
 tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro             | 2 ++
 tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro           | 1 +
 tests/auto/qnetworkcookie/qnetworkcookie.pro                         | 1 +
 tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro                   | 1 +
 tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro                   | 1 +
 tests/auto/qnetworkinterface/qnetworkinterface.pro                   | 1 +
 tests/auto/qnetworkproxy/qnetworkproxy.pro                           | 1 +
 tests/auto/qnetworkreply/qnetworkreply.pro                           | 1 +
 tests/auto/qnetworkrequest/qnetworkrequest.pro                       | 1 +
 tests/auto/qnetworksession/qnetworksession.pro                       | 1 +
 tests/auto/qsocketnotifier/qsocketnotifier.pro                       | 1 +
 tests/auto/qsocks5socketengine/qsocks5socketengine.pro               | 1 +
 tests/auto/qsslcertificate/qsslcertificate.pro                       | 1 +
 tests/auto/qsslcipher/qsslcipher.pro                                 | 1 +
 tests/auto/qsslerror/qsslerror.pro                                   | 1 +
 tests/auto/qsslkey/qsslkey.pro                                       | 1 +
 tests/auto/qsslsocket/qsslsocket.pro                                 | 2 +-
 tests/auto/qtcpserver/qtcpserver.pro                                 | 1 +
 tests/auto/qtcpsocket/qtcpsocket.pro                                 | 1 +
 tests/auto/qudpsocket/qudpsocket.pro                                 | 1 +
 tests/auto/qurl/qurl.pro                                             | 1 +
 38 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index e3faef1..d2011d0 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -6,7 +6,7 @@ qtAddLibrary(QtTest)
 symbian:{
     TARGET.EPOCHEAPSIZE = 0x100000 0x2000000
 #    DEFINES += QTEST_NO_SPECIALIZATIONS
-    TARGET.CAPABILITY="ALL -TCB"
+    TARGET.CAPABILITY="None"
     RSS_RULES ="group_name=\"QtTests\";" 
 }
 
diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp
index d04707e..bcc3be4 100644
--- a/tests/auto/languagechange/tst_languagechange.cpp
+++ b/tests/auto/languagechange/tst_languagechange.cpp
@@ -238,8 +238,8 @@ void tst_languageChange::retranslatability()
         QString fooName = tmpParentDir + "/foo";
         QDir dir;
         QCOMPARE(dir.mkpath(tmpDir), true);
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-        // Just create a new file instead of copying exe, because exe is not there in emulator
+#if defined(Q_OS_SYMBIAN)
+        // Just create a new file instead of copying exe, because there is no read access to /sys/bin
         {
             QFile fooFile(fooName);
             QVERIFY(fooFile.open(QIODevice::WriteOnly | QIODevice::Text));
diff --git a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
index a57c56f..2e2577d 100644
--- a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
@@ -9,3 +9,4 @@ wince*|symbian: {
    DEPLOYMENT += testFiles
 }
 
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qabstractsocket/qabstractsocket.pro b/tests/auto/qabstractsocket/qabstractsocket.pro
index 59999af..814a7d2 100644
--- a/tests/auto/qabstractsocket/qabstractsocket.pro
+++ b/tests/auto/qabstractsocket/qabstractsocket.pro
@@ -7,4 +7,5 @@ QT = core network
 
 SOURCES += tst_qabstractsocket.cpp
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp
index 1bc5b7f..41bbd87 100644
--- a/tests/auto/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp
@@ -613,6 +613,11 @@ void tst_QDirModel::task196768_sorting()
     //this task showed that the persistent model indexes got corrupted when sorting
     QString path = SRCDIR;
 
+#ifdef Q_OS_SYMBIAN
+    if(!RProcess().HasCapability(ECapabilityAllFiles))
+        QEXPECT_FAIL("", "QTBUG-9746", Continue);
+#endif
+
     QDirModel model;
 
     /* QDirModel has a bug if we show the content of the subdirectory inside a hidden directory
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/qftp/qftp.pro
index c060296..33d479a 100644
--- a/tests/auto/qftp/qftp.pro
+++ b/tests/auto/qftp/qftp.pro
@@ -14,6 +14,7 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
    TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+   TARGET.CAPABILITY = NetworkServices
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qhostaddress/qhostaddress.pro b/tests/auto/qhostaddress/qhostaddress.pro
index b208214..7bcbfb0 100644
--- a/tests/auto/qhostaddress/qhostaddress.pro
+++ b/tests/auto/qhostaddress/qhostaddress.pro
@@ -12,3 +12,4 @@ wince*: {
 }
 }
 
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro
index 9bfe576..06a4b17 100644
--- a/tests/auto/qhostinfo/qhostinfo.pro
+++ b/tests/auto/qhostinfo/qhostinfo.pro
@@ -10,4 +10,5 @@ wince*: {
   win32:LIBS += -lws2_32
 }
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/qhttp/qhttp.pro
index 8678a19..23a73c4 100644
--- a/tests/auto/qhttp/qhttp.pro
+++ b/tests/auto/qhttp/qhttp.pro
@@ -21,6 +21,7 @@ wince*: {
     addFiles.sources = rfc3252.txt trolltech
     addFiles.path = .
     DEPLOYMENT = addFiles webFiles cgi
+    TARGET.CAPABILITY = NetworkServices
 } else:vxworks*: {
     DEFINES += SRCDIR=\\\"\\\"
 } else {
diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 0021bc1..d9e2dce 100644
--- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -4,3 +4,5 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
 QT = core network
+
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
index 1782b43..36d56c6 100644
--- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
+++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
@@ -4,3 +4,4 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
 QT = core network
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
index f6ad073..d76ebb6 100644
--- a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
+++ b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
@@ -8,5 +8,6 @@ MOC_DIR=tmp
 
 QT = core network
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
 
diff --git a/tests/auto/qiodevice/qiodevice.pro b/tests/auto/qiodevice/qiodevice.pro
index e695bf6..716cdce 100644
--- a/tests/auto/qiodevice/qiodevice.pro
+++ b/tests/auto/qiodevice/qiodevice.pro
@@ -14,6 +14,7 @@ wince*: {
    addFiles.sources = tst_qiodevice.cpp
    addFiles.path = .
    DEPLOYMENT += addFiles
+   TARGET.CAPABILITY = NetworkServices
 } else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
    contains(QT_CONFIG, qt3support):QT += qt3support
diff --git a/tests/auto/qlocalsocket/qlocalsocket.pro b/tests/auto/qlocalsocket/qlocalsocket.pro
index 0849453..287e946 100644
--- a/tests/auto/qlocalsocket/qlocalsocket.pro
+++ b/tests/auto/qlocalsocket/qlocalsocket.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = lackey test
 !wince*:!symbian*: SUBDIRS += example
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qnativesocketengine/qnativesocketengine.pro b/tests/auto/qnativesocketengine/qnativesocketengine.pro
index ad40d53..0275d37 100644
--- a/tests/auto/qnativesocketengine/qnativesocketengine.pro
+++ b/tests/auto/qnativesocketengine/qnativesocketengine.pro
@@ -9,4 +9,5 @@ MOC_DIR=tmp
 
 QT = core network
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro b/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro
index e2889c1..3ccbffb 100644
--- a/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro
+++ b/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 SOURCES += tst_qnetworkaccessmanager.cpp
 QT = core network
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
index 7ed5b07..378deba 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
+++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp
 QT += network
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro
index 8feb95f..885dbf7 100644
--- a/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro
+++ b/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro
@@ -2,3 +2,5 @@ load(qttest_p4)
 SOURCES  += tst_qnetworkaddressentry.cpp
 
 QT = core network
+
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro
index b24fe00..77ad347 100644
--- a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro
+++ b/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 QT += network
 SOURCES  += tst_qnetworkcachemetadata.cpp
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkcookie/qnetworkcookie.pro b/tests/auto/qnetworkcookie/qnetworkcookie.pro
index 95d8b6e..2f31138 100644
--- a/tests/auto/qnetworkcookie/qnetworkcookie.pro
+++ b/tests/auto/qnetworkcookie/qnetworkcookie.pro
@@ -2,3 +2,4 @@ load(qttest_p4)
 SOURCES  += tst_qnetworkcookie.cpp
 
 QT = core network
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
index 3a8e61b..6d75fab 100644
--- a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
+++ b/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
@@ -2,3 +2,4 @@ load(qttest_p4)
 SOURCES  += tst_qnetworkcookiejar.cpp
 
 QT = core network
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro
index f47d6d7..3b13087 100644
--- a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 QT += network
 SOURCES  += tst_qnetworkdiskcache.cpp
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkinterface/qnetworkinterface.pro b/tests/auto/qnetworkinterface/qnetworkinterface.pro
index 26095e9..1c5feee 100644
--- a/tests/auto/qnetworkinterface/qnetworkinterface.pro
+++ b/tests/auto/qnetworkinterface/qnetworkinterface.pro
@@ -3,4 +3,5 @@ SOURCES  += tst_qnetworkinterface.cpp
 
 QT = core network
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkproxy/qnetworkproxy.pro b/tests/auto/qnetworkproxy/qnetworkproxy.pro
index 8ffc80c..fc0a216 100644
--- a/tests/auto/qnetworkproxy/qnetworkproxy.pro
+++ b/tests/auto/qnetworkproxy/qnetworkproxy.pro
@@ -7,4 +7,5 @@ QT = core network
 
 SOURCES += tst_qnetworkproxy.cpp
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qnetworkreply/qnetworkreply.pro b/tests/auto/qnetworkreply/qnetworkreply.pro
index fd8454c..86d3155 100644
--- a/tests/auto/qnetworkreply/qnetworkreply.pro
+++ b/tests/auto/qnetworkreply/qnetworkreply.pro
@@ -4,3 +4,4 @@ SUBDIRS = test
 requires(contains(QT_CONFIG,private_tests))
 
 !wince*:SUBDIRS += echo
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qnetworkrequest/qnetworkrequest.pro b/tests/auto/qnetworkrequest/qnetworkrequest.pro
index f576ba2..f96fd3b 100644
--- a/tests/auto/qnetworkrequest/qnetworkrequest.pro
+++ b/tests/auto/qnetworkrequest/qnetworkrequest.pro
@@ -2,3 +2,4 @@ load(qttest_p4)
 SOURCES  += tst_qnetworkrequest.cpp
 
 QT = core network
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qnetworksession/qnetworksession.pro b/tests/auto/qnetworksession/qnetworksession.pro
index a85925b..34761e5 100644
--- a/tests/auto/qnetworksession/qnetworksession.pro
+++ b/tests/auto/qnetworksession/qnetworksession.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = lackey test
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/qsocketnotifier/qsocketnotifier.pro
index ec924c1..c43c96a 100644
--- a/tests/auto/qsocketnotifier/qsocketnotifier.pro
+++ b/tests/auto/qsocketnotifier/qsocketnotifier.pro
@@ -6,5 +6,6 @@ requires(contains(QT_CONFIG,private_tests))
 
 include(../qnativesocketengine/qsocketengine.pri)
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
 
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
index 4a32852..cd5e6e7 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
@@ -11,6 +11,7 @@ QT = core network
 
 # Symbian toolchain does not support correct include semantics
 symbian:INCPATH+=..\..\..\include\QtNetwork\private
+symbian: TARGET.CAPABILITY = NetworkServices
 
 
 requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/qsslcertificate/qsslcertificate.pro
index b237f2e..d7671ea 100644
--- a/tests/auto/qsslcertificate/qsslcertificate.pro
+++ b/tests/auto/qsslcertificate/qsslcertificate.pro
@@ -24,4 +24,5 @@ wince*: {
   DEFINES += SRCDIR=\\\".\\\"
 } else:!symbian {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+   TARGET.CAPABILITY = NetworkServices
 }
diff --git a/tests/auto/qsslcipher/qsslcipher.pro b/tests/auto/qsslcipher/qsslcipher.pro
index 6eae588..78fd387 100644
--- a/tests/auto/qsslcipher/qsslcipher.pro
+++ b/tests/auto/qsslcipher/qsslcipher.pro
@@ -14,4 +14,5 @@ win32 {
   }
 }
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qsslerror/qsslerror.pro b/tests/auto/qsslerror/qsslerror.pro
index ee5872b..5b907fb 100644
--- a/tests/auto/qsslerror/qsslerror.pro
+++ b/tests/auto/qsslerror/qsslerror.pro
@@ -14,4 +14,5 @@ win32 {
   }
 }
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qsslkey/qsslkey.pro b/tests/auto/qsslkey/qsslkey.pro
index 32138f8..e3eeef9 100644
--- a/tests/auto/qsslkey/qsslkey.pro
+++ b/tests/auto/qsslkey/qsslkey.pro
@@ -24,4 +24,5 @@ wince*: {
    DEFINES += SRCDIR=\\\".\\\"
 } else:!symbian {
    DEFINES+= SRCDIR=\\\"$$PWD\\\"
+   TARGET.CAPABILITY = NetworkServices
 }
diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro
index 541b2d9..3557fc8 100644
--- a/tests/auto/qsslsocket/qsslsocket.pro
+++ b/tests/auto/qsslsocket/qsslsocket.pro
@@ -24,7 +24,7 @@ wince* {
 } else:symbian {
     DEFINES += QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     TARGET.EPOCHEAPSIZE="0x100 0x1000000"
-    TARGET.CAPABILITY="ALL -TCB"
+    TARGET.CAPABILITY=NetworkServices
 
     certFiles.sources = certs ssl.tar.gz
     certFiles.path    = .
diff --git a/tests/auto/qtcpserver/qtcpserver.pro b/tests/auto/qtcpserver/qtcpserver.pro
index fe5ea37..a3744a2 100644
--- a/tests/auto/qtcpserver/qtcpserver.pro
+++ b/tests/auto/qtcpserver/qtcpserver.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = test crashingServer
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
 
diff --git a/tests/auto/qtcpsocket/qtcpsocket.pro b/tests/auto/qtcpsocket/qtcpsocket.pro
index 3d4eba3..370a695 100644
--- a/tests/auto/qtcpsocket/qtcpsocket.pro
+++ b/tests/auto/qtcpsocket/qtcpsocket.pro
@@ -6,3 +6,4 @@ wince*|symbian*|vxworks* : SUBDIRS = test
 
 
 requires(contains(QT_CONFIG,private_tests))
+symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qudpsocket/qudpsocket.pro b/tests/auto/qudpsocket/qudpsocket.pro
index 4ef8a40..8fd3545 100644
--- a/tests/auto/qudpsocket/qudpsocket.pro
+++ b/tests/auto/qudpsocket/qudpsocket.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = test clientserver
 
+symbian: TARGET.CAPABILITY = NetworkServices
 
 
diff --git a/tests/auto/qurl/qurl.pro b/tests/auto/qurl/qurl.pro
index 72c93bc..018bb38 100644
--- a/tests/auto/qurl/qurl.pro
+++ b/tests/auto/qurl/qurl.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
 SOURCES  += tst_qurl.cpp
 QT = core
+symbian: TARGET.CAPABILITY = NetworkServices
-- 
cgit v0.12


From 48acfd970f5fab740fd16ecdc31656c56ec2356b Mon Sep 17 00:00:00 2001
From: Shane Kearns 
Date: Mon, 10 May 2010 15:26:12 +0100
Subject: Fix compile errors

Added #ifdef QT_BUILD_INTERNAL for autotests which rely on AUTOTEST_EXPORT
symbols (only available in internal developer configurations)

Reviewed-by: Liang Qi
---
 tests/auto/qwidget/tst_qwidget.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 76e20b9..5d47aed 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9514,6 +9514,8 @@ void tst_QWidget::destroyBackingStore()
     w.update();
     QApplication::processEvents();
     QCOMPARE(w.numPaintEvents, 2);
+#else
+    QSKIP("Test case relies on developer build (AUTOTEST_EXPORT)", SkipAll);
 #endif
 }
 
@@ -9992,6 +9994,7 @@ void tst_QWidget::focusProxyAndInputMethods()
     delete toplevel;
 }
 
+#ifdef QT_BUILD_INTERNAL
 class scrollWidgetWBS : public QWidget
 {
 public:
@@ -10011,9 +10014,11 @@ public:
         }
     }
 };
+#endif
 
 void tst_QWidget::scrollWithoutBackingStore()
 {
+#ifdef QT_BUILD_INTERNAL
     scrollWidgetWBS scrollable;
     scrollable.resize(100,100);
     QLabel child(QString("@"),&scrollable);
@@ -10027,6 +10032,9 @@ void tst_QWidget::scrollWithoutBackingStore()
     QCOMPARE(child.pos(),QPoint(25,25));
     scrollable.enableBackingStore();
     QCOMPARE(child.pos(),QPoint(25,25));
+#else
+    QSKIP("Test case relies on developer build (AUTOTEST_EXPORT)", SkipAll);
+#endif
 }
 
 void tst_QWidget::taskQTBUG_7532_tabOrderWithFocusProxy()
-- 
cgit v0.12


From a21d6927e58a72ac5123d2479cbcc06bd764dfa4 Mon Sep 17 00:00:00 2001
From: Shane Kearns 
Date: Mon, 10 May 2010 16:45:05 +0100
Subject: Remove test cases which cause stack overflow

These test cases are not considered reasonable for a small screen device
(625 widgets). Patching the QWidget code to use iteration rather than
recursion is considered too risky, as the code is performance critical.

Task-number: QTBUG-8512
Reviewed-by: Bjoern Erik Nilsen
---
 tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
index 8c30be4..7015bd1 100644
--- a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
@@ -159,12 +159,17 @@ void tst_QWidget::update_data()
     QTest::newRow("10x10x1 opaque")        << 10 << 10 << 1   << true;
     QTest::newRow("10x10x10 opaque")       << 10 << 10 << 10  << true;
     QTest::newRow("10x10x100 opaque")      << 10 << 10 << 100 << true;
+#ifndef Q_OS_SYMBIAN
+    //These test cases cause stack overflow in QWidgetPrivate::paintSiblingsRecursive
+    //see http://bugreports.qt.nokia.com/browse/QTBUG-8512
+    //Symbian threads have a hard limit of 80kB user stack
     QTest::newRow("25x25x1 transparent ")  << 25 << 25 << 1   << false;
     QTest::newRow("25x25x10 transparent")  << 25 << 25 << 10  << false;
     QTest::newRow("25x25x100 transparent") << 25 << 25 << 100 << false;
     QTest::newRow("25x25x1 opaque")        << 25 << 25 << 1   << true;
     QTest::newRow("25x25x10 opaque")       << 25 << 25 << 10  << true;
     QTest::newRow("25x25x100 opaque")      << 25 << 25 << 100 << true;
+#endif
 }
 
 void tst_QWidget::update()
-- 
cgit v0.12


From 121e325e7bb2f14f4c9e4e25078ac16b47dcd372 Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Mon, 10 May 2010 21:13:21 +0200
Subject: Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux

If there is no window manager the current coordinate are taken in account
even if WA_Moved is false.
When a dockwidget is hidden, it is sent far in the negative coordinate.

The test was failing because the WM is assync and may take some time to
update the geometry.
---
 src/gui/widgets/qdockwidget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp
index ae00710..11f0a94 100644
--- a/src/gui/widgets/qdockwidget.cpp
+++ b/src/gui/widgets/qdockwidget.cpp
@@ -1269,8 +1269,11 @@ void QDockWidget::setFloating(bool floating)
     QRect r = d->undockedGeometry;
 
     d->setWindowState(floating, false, floating ? r : QRect());
+
     if (floating && r.isNull()) {
-	    setAttribute(Qt::WA_Moved, false); //we want it at the default position
+        if (x() < 0 || y() < 0) //may happen if we have been hidden
+            move(QPoint());
+        setAttribute(Qt::WA_Moved, false); //we want it at the default position
     }
 }
 
-- 
cgit v0.12


From da8d6c23ceaeb1f266c9c499e98c9fedb1d1e20d Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Tue, 11 May 2010 08:13:33 +1000
Subject: Error message on QWS appears to have changed.

---
 .../declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index dc9c2b2..d68b3e3 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -123,7 +123,7 @@ void tst_qdeclarativefontloader::failLocalFont()
     QString componentStr = "import Qt 4.7\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());
 #ifdef Q_WS_QWS
-    QTest::ignoreMessage(QtDebugMsg, QString("FT_New_Face failed with index 0 : 51 ").toLatin1());
+    QTest::ignoreMessage(QtDebugMsg, QString("FT_New_Face failed with index 0 : 2 ").toLatin1());
 #endif
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-- 
cgit v0.12


From cd70183a86f3586eb34c15f11af03746f28f4acc Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Tue, 11 May 2010 08:57:17 +1000
Subject: Remove unnecesary check for debug output.

---
 .../declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
index d68b3e3..36908d9 100644
--- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
+++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
@@ -122,9 +122,6 @@ void tst_qdeclarativefontloader::failLocalFont()
 {
     QString componentStr = "import Qt 4.7\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());
-#ifdef Q_WS_QWS
-    QTest::ignoreMessage(QtDebugMsg, QString("FT_New_Face failed with index 0 : 2 ").toLatin1());
-#endif
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeFontLoader *fontObject = qobject_cast(component.create());
-- 
cgit v0.12


From 129940723d9145a4380f7e44c06cbaa88ee4053b Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Tue, 11 May 2010 11:07:23 +1000
Subject: Correct ownership of signal handlers in state changes.

When a state uses override, we may apply the same replacesignalhandler
on top of itself. Make sure we update ownership accordingly.

Task-number: QTBUG-10523
---
 .../util/qdeclarativepropertychanges.cpp           | 35 +++++++++++++++++-----
 .../data/signalOverrideCrash2.qml                  | 24 +++++++++++++++
 .../qdeclarativestates/tst_qdeclarativestates.cpp  | 16 ++++++++++
 3 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml

diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 6e88259..94780c4 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -161,15 +161,22 @@ public:
     QDeclarativeExpression *rewindExpression;
     QDeclarativeGuard ownedExpression;
 
+    virtual bool changesBindings() { return true; }
+    virtual void clearBindings() {
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, 0);
+    }
+
     virtual void execute(Reason) {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
-        Q_ASSERT(expression != ownedExpression);
+        QDeclarativePropertyPrivate::setSignalExpression(property, expression);
+        if (ownedExpression == expression)
+            ownedExpression = 0;
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse(Reason) {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
-        Q_ASSERT(reverseExpression != ownedExpression);
+        QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
+        if (ownedExpression == reverseExpression)
+            ownedExpression = 0;
     }
 
     virtual void saveOriginals() {
@@ -177,12 +184,26 @@ public:
         reverseExpression = rewindExpression;
     }
 
+    virtual void copyOriginals(QDeclarativeActionEvent *other)
+    {
+        QDeclarativeReplaceSignalHandler *rsh = static_cast(other);
+        saveCurrentValues();
+        if (rsh == this)
+            return;
+        reverseExpression = rsh->reverseExpression;
+        if (rsh->ownedExpression == reverseExpression) {
+            ownedExpression = rsh->ownedExpression;
+            rsh->ownedExpression = 0;
+        }
+    }
+
     virtual void rewind() {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
-        Q_ASSERT(rewindExpression != ownedExpression);
+        QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
+        if (ownedExpression == rewindExpression)
+            ownedExpression = 0;
     }
     virtual void saveCurrentValues() { 
-        rewindExpression = QDeclarativePropertyPrivate::signalExpression(property); 
+        rewindExpression = QDeclarativePropertyPrivate::signalExpression(property);
     }
 
     virtual bool override(QDeclarativeActionEvent*other) {
diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
new file mode 100644
index 0000000..2215ee4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml
@@ -0,0 +1,24 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRect
+    width: 400
+    height: 400
+
+    states: [
+        State {
+            name: "state1"
+            PropertyChanges {
+                target: myRect
+                onHeightChanged: console.log("Hello World")
+                color: "green"
+            }
+        },
+        State {
+            name: "state2"; extend: "state1"
+            PropertyChanges {
+                target: myRect
+                color: "red"
+        }
+    }]
+}
diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
index 13992ad..ea074a4 100644
--- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
+++ b/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp
@@ -87,6 +87,7 @@ private slots:
     void basicBinding();
     void signalOverride();
     void signalOverrideCrash();
+    void signalOverrideCrash2();
     void parentChange();
     void parentChangeErrors();
     void anchorChanges();
@@ -449,6 +450,21 @@ void tst_qdeclarativestates::signalOverrideCrash()
     rect->doSomething();
 }
 
+void tst_qdeclarativestates::signalOverrideCrash2()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent rectComponent(&engine, SRCDIR "/data/signalOverrideCrash2.qml");
+    QDeclarativeRectangle *rect = qobject_cast(rectComponent.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeItemPrivate::get(rect)->setState("state1");
+    QDeclarativeItemPrivate::get(rect)->setState("state2");
+    QDeclarativeItemPrivate::get(rect)->setState("state1");
+
+    delete rect;
+}
+
 void tst_qdeclarativestates::parentChange()
 {
     QDeclarativeEngine engine;
-- 
cgit v0.12


From aa40b01fcda22e654790aaf93a6b14f947cdea72 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Tue, 11 May 2010 13:09:49 +1000
Subject: Round ideal width up to prevent incorrect word wrapping on Mac OS X

QTBUG-10539
---
 src/declarative/graphicsitems/qdeclarativetextedit.cpp                | 4 +++-
 .../declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index d095dbe..6d86e58 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -46,6 +46,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -1107,7 +1109,7 @@ void QDeclarativeTextEdit::updateSize()
         setBaselineOffset(fm.ascent() + yoff + d->textMargin);
 
         //### need to comfirm cost of always setting these
-        int newWidth = (int)d->document->idealWidth();
+        int newWidth = qCeil(d->document->idealWidth());
         d->document->setTextWidth(newWidth); // ### QTextDoc> Alignment will not work unless textWidth is set. Does Text need this line as well?
         int cursorWidth = 1;
         if(d->cursor)
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 8cc0e3f..b92024f 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -202,7 +202,7 @@ void tst_qdeclarativetextedit::width()
         QFont f;
         QFontMetricsF fm(f);
         qreal metricWidth = fm.size(Qt::TextExpandTabs && Qt::TextShowMnemonic, standard.at(i)).width();
-        metricWidth = floor(metricWidth);
+        metricWidth = ceil(metricWidth);
 
         QString componentStr = "import Qt 4.7\nTextEdit { text: \"" + standard.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
@@ -219,7 +219,7 @@ void tst_qdeclarativetextedit::width()
         document.setHtml(richText.at(i));
         document.setDocumentMargin(0);
 
-        int documentWidth = document.idealWidth();
+        int documentWidth = ceil(document.idealWidth());
 
         QString componentStr = "import Qt 4.7\nTextEdit { text: \"" + richText.at(i) + "\" }";
         QDeclarativeComponent texteditComponent(&engine);
-- 
cgit v0.12


From 367798c3cfaac56d82b29a90061d621e2b5854a5 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Tue, 11 May 2010 14:08:17 +1000
Subject: Correct Flipable back item based on parent, not scene transform

Flipable transformation consists of two parts:
    1.  Detecting that the back face is visible
    2.  Transforming the back item as though "it were on the front"
These are two steps.  The first should be done in scene coordinates, and
the second relative to the Flipable parent.

QTBUG-10532
---
 src/declarative/graphicsitems/qdeclarativeflipable.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index e2fc809..d926119 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -190,12 +190,15 @@ void QDeclarativeFlipablePrivate::updateSceneTransformFromParent()
     QPointF p2(1, 0);
     QPointF p3(1, 1);
 
-    p1 = sceneTransform.map(p1);
-    p2 = sceneTransform.map(p2);
-    p3 = sceneTransform.map(p3);
-
-    qreal cross = (p1.x() - p2.x()) * (p3.y() - p2.y()) -
-                  (p1.y() - p2.y()) * (p3.x() - p2.x());
+    QPointF scenep1 = sceneTransform.map(p1);
+    QPointF scenep2 = sceneTransform.map(p2);
+    QPointF scenep3 = sceneTransform.map(p3);
+    p1 = q->mapToParent(p1);
+    p2 = q->mapToParent(p2);
+    p3 = q->mapToParent(p3);
+
+    qreal cross = (scenep1.x() - scenep2.x()) * (scenep3.y() - scenep2.y()) -
+                  (scenep1.y() - scenep2.y()) * (scenep3.x() - scenep2.x());
 
     wantBackYFlipped = p1.x() >= p2.x();
     wantBackXFlipped = p2.y() >= p3.y();
-- 
cgit v0.12


From 2445d7adc19bb1355cbba8361345feb9d4cf10f9 Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Tue, 11 May 2010 09:21:50 +0200
Subject: Emit numFlagsChanged

Task-number: QTBUG-10552
---
 demos/declarative/minehunt/minehunt.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 93cd1c1..2a4ed10 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -212,6 +212,8 @@ void MinehuntGame::reset()
     }
     nMines = 12;
     nFlags = 0;
+    emit numMinesChanged();
+    emit numFlagsChanged();
     setPlaying(false);
     QTimer::singleShot(600,this, SLOT(setBoard()));
 }
-- 
cgit v0.12


From 952ab3f97a77c1f15b526df13c96602f6501f8ea Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Tue, 11 May 2010 17:44:12 +1000
Subject: Cleanup and simplify the webbrowser demo.

---
 demos/declarative/webbrowser/content/Button.qml    |  18 ++
 .../webbrowser/content/FlickableWebView.qml        |   2 +-
 demos/declarative/webbrowser/content/Header.qml    |  69 ++++++++
 .../webbrowser/content/RectSoftShadow.qml          |  32 ----
 .../content/RetractingWebBrowserHeader.qml         | 113 -------------
 demos/declarative/webbrowser/content/ScrollBar.qml |  66 ++++++++
 demos/declarative/webbrowser/content/UrlInput.qml  |  44 +++++
 .../webbrowser/content/fieldtext/FieldText.qml     | 157 ------------------
 .../webbrowser/content/fieldtext/pics/cancel.png   | Bin 1038 -> 0 bytes
 .../webbrowser/content/fieldtext/pics/ok.png       | Bin 655 -> 0 bytes
 .../webbrowser/content/pics/addressbar-filled.png  | Bin 694 -> 0 bytes
 .../webbrowser/content/pics/addressbar-filled.sci  |   6 -
 .../webbrowser/content/pics/addressbar.png         | Bin 467 -> 0 bytes
 .../webbrowser/content/pics/addressbar.sci         |   6 -
 .../webbrowser/content/pics/back-disabled.png      | Bin 475 -> 0 bytes
 demos/declarative/webbrowser/content/pics/back.png | Bin 707 -> 0 bytes
 .../webbrowser/content/pics/display.png            | Bin 0 -> 998 bytes
 .../webbrowser/content/pics/edit-delete.png        | Bin 0 -> 1333 bytes
 .../declarative/webbrowser/content/pics/footer.png | Bin 200 -> 0 bytes
 .../declarative/webbrowser/content/pics/footer.sci |   6 -
 .../webbrowser/content/pics/forward-disabled.png   | Bin 471 -> 0 bytes
 .../webbrowser/content/pics/forward.png            | Bin 682 -> 0 bytes
 .../webbrowser/content/pics/go-next-view.png       | Bin 0 -> 1187 bytes
 .../webbrowser/content/pics/go-previous-view.png   | Bin 0 -> 1226 bytes
 .../declarative/webbrowser/content/pics/header.png | Bin 193 -> 0 bytes
 .../declarative/webbrowser/content/pics/reload.png | Bin 1283 -> 0 bytes
 .../webbrowser/content/pics/scrollbar.png          | Bin 0 -> 161 bytes
 .../webbrowser/content/pics/softshadow-bottom.png  | Bin 186 -> 0 bytes
 .../webbrowser/content/pics/softshadow-left.png    | Bin 598 -> 0 bytes
 .../webbrowser/content/pics/softshadow-left.sci    |   5 -
 .../webbrowser/content/pics/softshadow-right.png   | Bin 636 -> 0 bytes
 .../webbrowser/content/pics/softshadow-right.sci   |   5 -
 .../webbrowser/content/pics/softshadow-top.png     | Bin 186 -> 0 bytes
 .../webbrowser/content/pics/titlebar-bg.png        | Bin 0 -> 213 bytes
 .../webbrowser/content/pics/view-refresh.png       | Bin 0 -> 2182 bytes
 demos/declarative/webbrowser/webbrowser.qml        | 183 +++------------------
 36 files changed, 225 insertions(+), 487 deletions(-)
 create mode 100644 demos/declarative/webbrowser/content/Button.qml
 create mode 100644 demos/declarative/webbrowser/content/Header.qml
 delete mode 100644 demos/declarative/webbrowser/content/RectSoftShadow.qml
 delete mode 100644 demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
 create mode 100644 demos/declarative/webbrowser/content/ScrollBar.qml
 create mode 100644 demos/declarative/webbrowser/content/UrlInput.qml
 delete mode 100644 demos/declarative/webbrowser/content/fieldtext/FieldText.qml
 delete mode 100644 demos/declarative/webbrowser/content/fieldtext/pics/cancel.png
 delete mode 100644 demos/declarative/webbrowser/content/fieldtext/pics/ok.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/addressbar-filled.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/addressbar-filled.sci
 delete mode 100644 demos/declarative/webbrowser/content/pics/addressbar.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/addressbar.sci
 delete mode 100644 demos/declarative/webbrowser/content/pics/back-disabled.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/back.png
 create mode 100644 demos/declarative/webbrowser/content/pics/display.png
 create mode 100644 demos/declarative/webbrowser/content/pics/edit-delete.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/footer.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/footer.sci
 delete mode 100644 demos/declarative/webbrowser/content/pics/forward-disabled.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/forward.png
 create mode 100644 demos/declarative/webbrowser/content/pics/go-next-view.png
 create mode 100644 demos/declarative/webbrowser/content/pics/go-previous-view.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/header.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/reload.png
 create mode 100644 demos/declarative/webbrowser/content/pics/scrollbar.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/softshadow-bottom.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/softshadow-left.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/softshadow-left.sci
 delete mode 100644 demos/declarative/webbrowser/content/pics/softshadow-right.png
 delete mode 100644 demos/declarative/webbrowser/content/pics/softshadow-right.sci
 delete mode 100644 demos/declarative/webbrowser/content/pics/softshadow-top.png
 create mode 100644 demos/declarative/webbrowser/content/pics/titlebar-bg.png
 create mode 100644 demos/declarative/webbrowser/content/pics/view-refresh.png

diff --git a/demos/declarative/webbrowser/content/Button.qml b/demos/declarative/webbrowser/content/Button.qml
new file mode 100644
index 0000000..a1baf16
--- /dev/null
+++ b/demos/declarative/webbrowser/content/Button.qml
@@ -0,0 +1,18 @@
+import Qt 4.7
+
+Item {
+    property alias image: icon.source
+    property variant action
+
+    width: 40; height: parent.height
+
+    Image {
+        id: icon; anchors.centerIn: parent
+        opacity: action.enabled ? 1.0 : 0.4
+    }
+
+    MouseArea {
+        anchors { fill: parent; topMargin: -10; bottomMargin: -10 }
+        onClicked: action.trigger()
+    }
+}
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 50ea97d..2862cc4 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -15,7 +15,7 @@ Flickable {
     contentWidth: Math.max(parent.width,webView.width*webView.scale)
     contentHeight: Math.max(parent.height,webView.height*webView.scale)
     anchors.top: headerSpace.bottom
-    anchors.bottom: footer.top
+    anchors.bottom: parent.top
     anchors.left: parent.left
     anchors.right: parent.right
     pressDelay: 200
diff --git a/demos/declarative/webbrowser/content/Header.qml b/demos/declarative/webbrowser/content/Header.qml
new file mode 100644
index 0000000..7c93580
--- /dev/null
+++ b/demos/declarative/webbrowser/content/Header.qml
@@ -0,0 +1,69 @@
+import Qt 4.7
+
+Image {
+    property alias editUrl: urlInput.url
+
+    source: "pics/titlebar-bg.png"; fillMode: Image.TileHorizontally
+
+    x: webView.contentX < 0 ? -webView.contentX : webView.contentX > webView.contentWidth-webView.width
+       ? -webView.contentX+webView.contentWidth-webView.width : 0
+
+    y: {
+        if (webView.progress < 1.0)
+            return 0;
+        else {
+            webView.contentY < 0 ? -webView.contentY : webView.contentY > height ? -height : -webView.contentY
+        }
+    }
+
+    Column {
+        width: parent.width
+
+        Item {
+            width: parent.width; height: 20
+            Text {
+                anchors.centerIn: parent
+                text: webView.title; font.pixelSize: 14; font.bold: true
+                color: "white"; styleColor: "black"; style: Text.Sunken
+            }
+        }
+
+        Item {
+            width: parent.width; height: 40
+
+            Button {
+                id: backButton
+                action: webView.back; image: "pics/go-previous-view.png"
+                anchors { left: parent.left; bottom: parent.bottom }
+            }
+
+            Button {
+                id: nextButton
+                anchors.left: backButton.right
+                action: webView.forward; image: "pics/go-next-view.png"
+            }
+
+            UrlInput {
+                id: urlInput
+                anchors { left: nextButton.right; right: reloadButton.left }
+                image: "pics/display.png"
+                onUrlEntered: {
+                    webBrowser.urlString = url
+                    webBrowser.focus = true
+                }
+            }
+
+            Button {
+                id: reloadButton
+                anchors { right: parent.right; rightMargin: 4 }
+                action: webView.reload; image: "pics/view-refresh.png"; visible: webView.progress == 1.0
+            }
+
+            Button {
+                id: stopButton
+                anchors { right: parent.right; rightMargin: 4 }
+                action: webView.stop; image: "pics/edit-delete.png"; visible: webView.progress < 1.0
+            }
+        }
+    }
+}
diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml
deleted file mode 100644
index 53d098c..0000000
--- a/demos/declarative/webbrowser/content/RectSoftShadow.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-import Qt 4.7
-
-Item {
-    BorderImage {
-        source: "pics/softshadow-left.sci"
-        x: -16
-        y: -16
-        width: 16
-        height: parent.height+32
-    }
-    BorderImage {
-        source: "pics/softshadow-right.sci"
-        x: parent.width
-        y: -16
-        width: 16
-        height: parent.height+32
-    }
-    Image {
-        source: "pics/softshadow-top.png"
-        x: 0
-        y: -16
-        width: parent.width
-        height: 16
-    }
-    Image {
-        source: "pics/softshadow-bottom.png"
-        x: 0
-        y: parent.height
-        width: parent.width
-        height: 16
-    }
-}
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
deleted file mode 100644
index b02a5bf..0000000
--- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml
+++ /dev/null
@@ -1,113 +0,0 @@
-import Qt 4.7
-
-import "fieldtext"
-
-Image {
-    property alias editUrl: editUrl.text
-
-    id: header
-    source: "pics/header.png"
-    width: parent.width
-    height: 60
-    x: webView.contentX < 0 ? -webView.contentX : webView.contentX > webView.contentWidth-webView.width
-                             ? -webView.contentX+webView.contentWidth-webView.width : 0
-    y: webView.contentY < 0 ? -webView.contentY : progressOff*
-                            (webView.contentY>height?-height:-webView.contentY)
-    Row {
-        id: headerTitle
-
-        anchors.top: header.top
-        anchors.topMargin: 4
-        x: parent.width > headerIcon.width+headerText.width+6 ? (parent.width-headerIcon.width-headerText.width-6)/2 : 0
-        spacing: 6
-
-        Image {
-            id: headerIcon
-            pixmap: webView.icon
-        }
-
-        Text {
-            id: headerText
-
-            text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...'
-
-            color: "white"
-            styleColor: "black"
-            style: Text.Raised
-
-            font.family: "Helvetica"
-            font.pointSize: 10
-            font.bold: true
-
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
-    Item {
-        width: parent.width
-        anchors.top: headerTitle.bottom
-        anchors.topMargin: 2
-        anchors.bottom: parent.bottom
-
-        Item {
-            id: urlBox
-            height: 31
-            anchors.left: parent.left
-            anchors.leftMargin: 12
-            anchors.right: parent.right
-            anchors.rightMargin: 12
-            anchors.top: parent.top
-            clip: true
-            property bool mouseGrabbed: false
-
-            BorderImage {
-                source: "pics/addressbar.sci"
-                anchors.fill: urlBox
-            }
-
-            BorderImage {
-                id: urlBoxhl
-                source: "pics/addressbar-filled.sci"
-                width: parent.width*webView.progress
-                height: parent.height
-                opacity: 1-header.progressOff
-                clip: true
-            }
-
-            FieldText {
-                id: editUrl
-                mouseGrabbed: parent.mouseGrabbed
-
-                text: webBrowser.urlString
-                label: "url:"
-                onConfirmed: { webBrowser.urlString = editUrl.text; webView.focus=true }
-                onCancelled: { webView.focus=true }
-                onStartEdit: { webView.focus=false }
-
-                anchors.left: urlBox.left
-                anchors.right: urlBox.right
-                anchors.leftMargin: 6
-                anchors.verticalCenter: urlBox.verticalCenter
-                anchors.verticalCenterOffset: 1
-            }
-        }
-    }
-
-    property real progressOff : 1
-    states: [
-        State {
-            name: "ProgressShown"
-            when: webView.progress < 1.0
-            PropertyChanges { target: header; progressOff: 0; }
-        }
-    ]
-    transitions: [
-        Transition {
-            NumberAnimation {
-                targets: header
-                properties: "progressOff"
-                easing.type: Easing.InOutQuad
-                duration: 300
-            }
-        }
-    ]
-}
diff --git a/demos/declarative/webbrowser/content/ScrollBar.qml b/demos/declarative/webbrowser/content/ScrollBar.qml
new file mode 100644
index 0000000..976297b
--- /dev/null
+++ b/demos/declarative/webbrowser/content/ScrollBar.qml
@@ -0,0 +1,66 @@
+import Qt 4.7
+
+Item {
+    id: container
+
+    property variant scrollArea
+    property variant orientation: Qt.Vertical
+
+    opacity: 0
+
+    function position()
+    {
+        var ny = 0;
+        if (container.orientation == Qt.Vertical)
+            ny = scrollArea.visibleArea.yPosition * container.height;
+        else
+            ny = scrollArea.visibleArea.xPosition * container.width;
+        if (ny > 2) return ny; else return 2;
+    }
+
+    function size()
+    {
+        var nh, ny;
+
+        if (container.orientation == Qt.Vertical)
+            nh = scrollArea.visibleArea.heightRatio * container.height;
+        else
+            nh = scrollArea.visibleArea.widthRatio * container.width;
+
+        if (container.orientation == Qt.Vertical)
+            ny = scrollArea.visibleArea.yPosition * container.height;
+        else
+            ny = scrollArea.visibleArea.xPosition * container.width;
+
+        if (ny > 3) {
+            var t;
+            if (container.orientation == Qt.Vertical)
+                t = Math.ceil(container.height - 3 - ny);
+            else
+                t = Math.ceil(container.width - 3 - ny);
+            if (nh > t) return t; else return nh;
+        } else return nh + ny;
+    }
+
+    Rectangle { anchors.fill: parent; color: "Black"; opacity: 0.5 }
+
+    BorderImage {
+        source: "pics/scrollbar.png"
+        border { left: 1; right: 1; top: 1; bottom: 1 }
+        x: container.orientation == Qt.Vertical ? 2 : position()
+        width: container.orientation == Qt.Vertical ? container.width - 4 : size()
+        y: container.orientation == Qt.Vertical ? position() : 2
+        height: container.orientation == Qt.Vertical ? size() : container.height - 4
+    }
+
+    states: State {
+        name: "visible"
+        when: scrollArea.moving
+        PropertyChanges { target: container; opacity: 1.0 }
+    }
+
+    transitions: Transition {
+        from: "visible"; to: ""
+        NumberAnimation { properties: "opacity"; duration: 600 }
+    }
+}
diff --git a/demos/declarative/webbrowser/content/UrlInput.qml b/demos/declarative/webbrowser/content/UrlInput.qml
new file mode 100644
index 0000000..9f7fc38
--- /dev/null
+++ b/demos/declarative/webbrowser/content/UrlInput.qml
@@ -0,0 +1,44 @@
+import Qt 4.7
+
+Item {
+    id: container
+
+    property alias image: bg.source
+    property alias url: urlText.text
+
+    signal urlEntered(string url)
+
+    width: parent.height; height: parent.height
+
+    BorderImage {
+        id: bg; rotation: 180
+        x: 8; width: parent.width - 16; height: 30;
+        anchors.verticalCenter: parent.verticalCenter
+        border { left: 10; top: 10; right: 10; bottom: 10 }
+    }
+
+    Rectangle {
+        anchors.bottom: bg.bottom
+        x: 18; height: 4; color: "#63b1ed"
+        width: (bg.width - 20) * webView.progress
+        opacity: webView.progress == 1.0 ? 0.0 : 1.0
+    }
+
+    TextInput {
+        id: urlText
+        horizontalAlignment: TextEdit.AlignLeft
+        font.pixelSize: 14; focusOnPress: true
+        Keys.onEscapePressed: {
+            urlText.text = webView.url
+            webView.focus = true
+        }
+        Keys.onReturnPressed: {
+            container.urlEntered(urlText.text)
+            webView.focus = true
+        }
+        anchors {
+            left: parent.left; right: parent.right; leftMargin: 18; rightMargin: 18
+            verticalCenter: parent.verticalCenter
+        }
+    }
+}
diff --git a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
deleted file mode 100644
index d1d003f..0000000
--- a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
+++ /dev/null
@@ -1,157 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: fieldText
-    height: 30
-    property string text: ""
-    property string label: ""
-    property bool mouseGrabbed: false
-    signal confirmed
-    signal cancelled
-    signal startEdit
-
-    function edit() {
-        if (!mouseGrabbed) {
-            fieldText.startEdit();
-            fieldText.state='editing';
-            mouseGrabbed=true;
-        }
-    }
-
-    function confirm() {
-        fieldText.state='';
-        fieldText.text = textEdit.text;
-        mouseGrabbed=false;
-        fieldText.confirmed();
-    }
-
-    function reset() {
-        textEdit.text = fieldText.text;
-        fieldText.state='';
-        mouseGrabbed=false;
-        fieldText.cancelled();
-    }
-
-    Image {
-        id: cancelIcon
-        width: 22
-        height: 22
-        anchors.right: parent.right
-        anchors.rightMargin: 4
-        anchors.verticalCenter: parent.verticalCenter
-        source: "pics/cancel.png"
-        opacity: 0
-    }
-
-    Image {
-        id: confirmIcon
-        width: 22
-        height: 22
-        anchors.left: parent.left
-        anchors.leftMargin: 4
-        anchors.verticalCenter: parent.verticalCenter
-        source: "pics/ok.png"
-        opacity: 0
-    }
-
-    TextInput {
-        id: textEdit
-        text: fieldText.text
-        focus: false
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.verticalCenter: parent.verticalCenter
-        color: "black"
-        font.bold: true
-        readOnly: true
-        onAccepted: confirm()
-        Keys.onEscapePressed: reset()
-    }
-
-    Text {
-        id: textLabel
-        x: 5
-        width: parent.width-10
-        anchors.verticalCenter: parent.verticalCenter
-        horizontalAlignment: Text.AlignHCenter
-        color: fieldText.state == "editing" ? "#505050" : "#AAAAAA"
-        font.italic: true
-        font.bold: true
-        text: label
-        opacity: textEdit.text == '' ? 1 : 0
-        Behavior on opacity {
-            NumberAnimation {
-                property: "opacity"
-                duration: 250
-            }
-        }
-    }
-
-    MouseArea {
-        anchors.fill: cancelIcon
-        onClicked: { reset() }
-    }
-
-    MouseArea {
-        anchors.fill: confirmIcon
-        onClicked: { confirm() }
-    }
-
-    MouseArea {
-        id: editRegion
-        anchors.fill: textEdit
-        onClicked: { edit() }
-    }
-
-    states: [
-    State {
-        name: "editing"
-        PropertyChanges {
-            target: confirmIcon
-            opacity: 1
-        }
-        PropertyChanges {
-            target: cancelIcon
-            opacity: 1
-        }
-        PropertyChanges {
-            target: textEdit
-            color: "black"
-            readOnly: false
-            focus: true
-            selectionStart: 0
-            selectionEnd: -1
-        }
-        PropertyChanges {
-            target: editRegion
-            opacity: 0
-        }
-        PropertyChanges {
-            target: textEdit.anchors
-            leftMargin: 34
-        }
-        PropertyChanges {
-            target: textEdit.anchors
-            rightMargin: 34
-        }
-    }
-    ]
-
-    transitions: [
-    Transition {
-        from: ""
-        to: "*"
-        reversible: true
-        NumberAnimation {
-            properties: "opacity,leftMargin,rightMargin"
-            duration: 200
-        }
-        ColorAnimation {
-            property: "color"
-            duration: 150
-        }
-    }
-    ]
-}
diff --git a/demos/declarative/webbrowser/content/fieldtext/pics/cancel.png b/demos/declarative/webbrowser/content/fieldtext/pics/cancel.png
deleted file mode 100644
index ecc9533..0000000
Binary files a/demos/declarative/webbrowser/content/fieldtext/pics/cancel.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/fieldtext/pics/ok.png b/demos/declarative/webbrowser/content/fieldtext/pics/ok.png
deleted file mode 100644
index 5795f04..0000000
Binary files a/demos/declarative/webbrowser/content/fieldtext/pics/ok.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/addressbar-filled.png b/demos/declarative/webbrowser/content/pics/addressbar-filled.png
deleted file mode 100644
index d8452ec..0000000
Binary files a/demos/declarative/webbrowser/content/pics/addressbar-filled.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/addressbar-filled.sci b/demos/declarative/webbrowser/content/pics/addressbar-filled.sci
deleted file mode 100644
index 96c5efb..0000000
--- a/demos/declarative/webbrowser/content/pics/addressbar-filled.sci
+++ /dev/null
@@ -1,6 +0,0 @@
-border.left: 7
-border.top: 7
-border.bottom: 7
-border.right: 7
-source: addressbar-filled.png
-
diff --git a/demos/declarative/webbrowser/content/pics/addressbar.png b/demos/declarative/webbrowser/content/pics/addressbar.png
deleted file mode 100644
index 3278f58..0000000
Binary files a/demos/declarative/webbrowser/content/pics/addressbar.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/addressbar.sci b/demos/declarative/webbrowser/content/pics/addressbar.sci
deleted file mode 100644
index 8f1cd18..0000000
--- a/demos/declarative/webbrowser/content/pics/addressbar.sci
+++ /dev/null
@@ -1,6 +0,0 @@
-border.left: 7
-border.top: 7
-border.bottom: 7
-border.right: 7
-source: addressbar.png
-
diff --git a/demos/declarative/webbrowser/content/pics/back-disabled.png b/demos/declarative/webbrowser/content/pics/back-disabled.png
deleted file mode 100644
index 91b9e76..0000000
Binary files a/demos/declarative/webbrowser/content/pics/back-disabled.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/back.png b/demos/declarative/webbrowser/content/pics/back.png
deleted file mode 100644
index 9988dd3..0000000
Binary files a/demos/declarative/webbrowser/content/pics/back.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/display.png b/demos/declarative/webbrowser/content/pics/display.png
new file mode 100644
index 0000000..9507f43
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/display.png differ
diff --git a/demos/declarative/webbrowser/content/pics/edit-delete.png b/demos/declarative/webbrowser/content/pics/edit-delete.png
new file mode 100644
index 0000000..351659b
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/edit-delete.png differ
diff --git a/demos/declarative/webbrowser/content/pics/footer.png b/demos/declarative/webbrowser/content/pics/footer.png
deleted file mode 100644
index 8391a93..0000000
Binary files a/demos/declarative/webbrowser/content/pics/footer.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/footer.sci b/demos/declarative/webbrowser/content/pics/footer.sci
deleted file mode 100644
index 7be58f1..0000000
--- a/demos/declarative/webbrowser/content/pics/footer.sci
+++ /dev/null
@@ -1,6 +0,0 @@
-border.left: 5
-border.top: 0
-border.bottom: 0
-border.right: 5
-source: footer.png
-
diff --git a/demos/declarative/webbrowser/content/pics/forward-disabled.png b/demos/declarative/webbrowser/content/pics/forward-disabled.png
deleted file mode 100644
index cb87f4f..0000000
Binary files a/demos/declarative/webbrowser/content/pics/forward-disabled.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/forward.png b/demos/declarative/webbrowser/content/pics/forward.png
deleted file mode 100644
index 83870ee..0000000
Binary files a/demos/declarative/webbrowser/content/pics/forward.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/go-next-view.png b/demos/declarative/webbrowser/content/pics/go-next-view.png
new file mode 100644
index 0000000..3bce02d
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/go-next-view.png differ
diff --git a/demos/declarative/webbrowser/content/pics/go-previous-view.png b/demos/declarative/webbrowser/content/pics/go-previous-view.png
new file mode 100644
index 0000000..3ec011e
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/go-previous-view.png differ
diff --git a/demos/declarative/webbrowser/content/pics/header.png b/demos/declarative/webbrowser/content/pics/header.png
deleted file mode 100644
index 26588c3..0000000
Binary files a/demos/declarative/webbrowser/content/pics/header.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/reload.png b/demos/declarative/webbrowser/content/pics/reload.png
deleted file mode 100644
index 45b5535..0000000
Binary files a/demos/declarative/webbrowser/content/pics/reload.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/scrollbar.png b/demos/declarative/webbrowser/content/pics/scrollbar.png
new file mode 100644
index 0000000..0228dcf
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/scrollbar.png differ
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-bottom.png b/demos/declarative/webbrowser/content/pics/softshadow-bottom.png
deleted file mode 100644
index 85b0b44..0000000
Binary files a/demos/declarative/webbrowser/content/pics/softshadow-bottom.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-left.png b/demos/declarative/webbrowser/content/pics/softshadow-left.png
deleted file mode 100644
index 02926d1..0000000
Binary files a/demos/declarative/webbrowser/content/pics/softshadow-left.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-left.sci b/demos/declarative/webbrowser/content/pics/softshadow-left.sci
deleted file mode 100644
index 45c88d5..0000000
--- a/demos/declarative/webbrowser/content/pics/softshadow-left.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 0
-border.top: 16
-border.bottom: 16
-border.right: 0
-source: softshadow-left.png
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-right.png b/demos/declarative/webbrowser/content/pics/softshadow-right.png
deleted file mode 100644
index e459f4f..0000000
Binary files a/demos/declarative/webbrowser/content/pics/softshadow-right.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-right.sci b/demos/declarative/webbrowser/content/pics/softshadow-right.sci
deleted file mode 100644
index 4d459c0..0000000
--- a/demos/declarative/webbrowser/content/pics/softshadow-right.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 0
-border.top: 16
-border.bottom: 16
-border.right: 0
-source: softshadow-right.png
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-top.png b/demos/declarative/webbrowser/content/pics/softshadow-top.png
deleted file mode 100644
index 9a9e232..0000000
Binary files a/demos/declarative/webbrowser/content/pics/softshadow-top.png and /dev/null differ
diff --git a/demos/declarative/webbrowser/content/pics/titlebar-bg.png b/demos/declarative/webbrowser/content/pics/titlebar-bg.png
new file mode 100644
index 0000000..06961e8
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/titlebar-bg.png differ
diff --git a/demos/declarative/webbrowser/content/pics/view-refresh.png b/demos/declarative/webbrowser/content/pics/view-refresh.png
new file mode 100644
index 0000000..afa2a9d
Binary files /dev/null and b/demos/declarative/webbrowser/content/pics/view-refresh.png differ
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index f1a6034..27da814 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -3,168 +3,39 @@ import org.webkit 1.0
 
 import "content"
 
-Item {
+Rectangle {
     id: webBrowser
 
     property string urlString : "http://qt.nokia.com/"
 
-    width: 640
-    height: 480
+    width: 800; height: 600
+    color: "#343434"
+
+    FlickableWebView {
+        id: webView
+        url: webBrowser.urlString
+        anchors { top: headerSpace.bottom; left: parent.left; right: parent.right; bottom: parent.bottom }
+
+    }
 
     Item {
-        id: webPanel
-        anchors.fill: parent
-        clip: true
-        Rectangle {
-            color: "#555555"
-            anchors.fill: parent
-        }
-        Image {
-            source: "content/pics/softshadow-bottom.png"
-            width: webPanel.width
-            height: 16
-        }
-        Image {
-            source: "content/pics/softshadow-top.png"
-            width: webPanel.width
-            height: 16
-            anchors.bottom: footer.top
-        }
-        RectSoftShadow {
-            x: -webView.contentX
-            y: -webView.contentY
-            width: webView.contentWidth
-            height: webView.contentHeight+headerSpace.height
-        }
-        Item {
-            id: headerSpace
-            width: parent.width
-            height: 60
-            z: 1
+        id: headerSpace
+        width: parent.width; height: 62
+    }
 
-            RetractingWebBrowserHeader { id: header }
-        }
-        FlickableWebView {
-            id: webView
-            width: parent.width
-            anchors.top: headerSpace.bottom
-            anchors.bottom: footer.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-        }
-        BorderImage {
-            id: footer
-            source: "content/pics/footer.sci"
-            width: parent.width
-            height: 43
-            anchors.bottom: parent.bottom
-            Rectangle {
-                y: -1
-                width: parent.width
-                height: 1
-                color: "#555555"
-            }
-            Item {
-                id: backbutton
-                width: back_e.width
-                height: back_e.height
-                anchors.right: reload.left
-                anchors.rightMargin: 10
-                anchors.verticalCenter: parent.verticalCenter
-                Image {
-                    id: back_e
-                    source: "content/pics/back.png"
-                    anchors.fill: parent
-                }
-                Image {
-                    id: back_d
-                    source: "content/pics/back-disabled.png"
-                    anchors.fill: parent
-                }
-                states: [
-                    State {
-                        name: "Enabled"
-                        when: webView.back.enabled==true
-                        PropertyChanges { target: back_e; opacity: 1 }
-                        PropertyChanges { target: back_d; opacity: 0 }
-                    },
-                    State {
-                        name: "Disabled"
-                        when: webView.back.enabled==false
-                        PropertyChanges { target: back_e; opacity: 0 }
-                        PropertyChanges { target: back_d; opacity: 1 }
-                    }
-                ]
-                transitions: [
-                    Transition {
-                        NumberAnimation {
-                            properties: "opacity"
-                            easing.type: Easing.InOutQuad
-                            duration: 300
-                        }
-                    }
-                ]
-                MouseArea {
-                    anchors.fill: back_e
-                    onClicked: { if (webView.back.enabled) webView.back.trigger() }
-                }
-            }
-            Image {
-                id: reload
-                source: "content/pics/reload.png"
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.verticalCenter: parent.verticalCenter
-            }
-            MouseArea {
-                anchors.fill: reload
-                onClicked: { webView.reload.trigger() }
-            }
-            Item {
-                id: forwardbutton
-                width: forward_e.width
-                height: forward_e.height
-                anchors.left: reload.right
-                anchors.leftMargin: 10
-                anchors.verticalCenter: parent.verticalCenter
-                Image {
-                    id: forward_e
-                    source: "content/pics/forward.png"
-                    anchors.fill: parent
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-                Image {
-                    id: forward_d
-                    source: "content/pics/forward-disabled.png"
-                    anchors.fill: parent
-                }
-                states: [
-                    State {
-                        name: "Enabled"
-                        when: webView.forward.enabled==true
-                        PropertyChanges { target: forward_e; opacity: 1 }
-                        PropertyChanges { target: forward_d; opacity: 0 }
-                    },
-                    State {
-                        name: "Disabled"
-                        when: webView.forward.enabled==false
-                        PropertyChanges { target: forward_e; opacity: 0 }
-                        PropertyChanges { target: forward_d; opacity: 1 }
-                    }
-                ]
-                transitions: [
-                    Transition {
-                        NumberAnimation {
-                            properties: "opacity"
-                            easing.type: Easing.InOutQuad
-                            duration: 320
-                        }
-                    }
-                ]
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: { if (webView.forward.enabled) webView.forward.trigger() }
-                }
-            }
-        }
+    Header {
+        id: header
+        editUrl: webBrowser.urlString
+        width: headerSpace.width; height: headerSpace.height
     }
+
+    ScrollBar {
+        scrollArea: webView; width: 8
+        anchors { right: parent.right; top: header.bottom; bottom: parent.bottom }
+    }
+
+//    ScrollBar {
+//        scrollArea: webView; height: 8; orientation: Qt.Horizontal
+//        anchors { right: parent.right; rightMargin: 8; left: parent.left; bottom: parent.bottom }
+//    }
 }
-- 
cgit v0.12


From a7b128ae838b006be1259ef6ba79da5440ed52dd Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Tue, 11 May 2010 09:59:56 +0200
Subject: Stabilize tst_QColumnView::parentCurrentIndex

---
 tests/auto/qcolumnview/tst_qcolumnview.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index 90f499d..1da8c5d 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -596,11 +596,11 @@ void tst_QColumnView::clicked()
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, localPoint);
     QCOMPARE(clickedSpy.count(), 1);
     qApp->processEvents();
-    
+
     if (sizeof(qreal) != sizeof(double)) {
         QSKIP("Skipped due to rounding errors", SkipAll);
     }
-    
+
     for (int i = 0; i < view.createdColumns.count(); ++i) {
         QAbstractItemView *column = view.createdColumns.at(i);
         if (column && column->selectionModel() && (column->rootIndex() == home))
@@ -961,9 +961,9 @@ void tst_QColumnView::parentCurrentIndex()
     QVERIFY(third.isValid());
     view.setCurrentIndex(third);
     QTest::qWait(ANIMATION_DELAY);
-    QCOMPARE(view.createdColumns[0]->currentIndex(), first);
-    QCOMPARE(view.createdColumns[1]->currentIndex(), second);
-    QCOMPARE(view.createdColumns[2]->currentIndex(), third);
+    QTRY_COMPARE(view.createdColumns[0]->currentIndex(), first);
+    QTRY_COMPARE(view.createdColumns[1]->currentIndex(), second);
+    QTRY_COMPARE(view.createdColumns[2]->currentIndex(), third);
 
     first = model.index(0, 0, QModelIndex());
     second = model.index(secondRow, 0, first);
-- 
cgit v0.12


From aa04c975442aace80d95f9f70ab11fa845436c54 Mon Sep 17 00:00:00 2001
From: Janne Koskinen 
Date: Tue, 11 May 2010 11:22:59 +0300
Subject: fix webkit crash when accessing network on Symbian

Fixes crash on startup and crashes on network requests

Task-number: QTBUG-9820
Reviewed-by: Janne Anttila
---
 src/plugins/bearer/symbian/qnetworksession_impl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 1b9c8cc..5fc0edb 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -947,7 +947,7 @@ void QNetworkSessionPrivateImpl::RunL()
 #endif
             if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
                 serviceConfig = QNetworkConfigurationManager()
-                    .configurationFromIdentifier(symbianConfig->serviceNetworkPtr->id);
+                    .configurationFromIdentifier(symbianConfig->id);
             }
             symbianConfig->mutex.unlock();
 
-- 
cgit v0.12


From 70dd6652b8f649871e6801cc9190543f43daa650 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Tue, 11 May 2010 10:58:15 +0200
Subject: qdoc: Yet another revision of the top doc page.

Still more to come.
---
 doc/src/files-and-resources/datastreamformat.qdoc  |  3 +-
 doc/src/files-and-resources/resources.qdoc         |  2 ++
 doc/src/frameworks-technologies/graphicsview.qdoc  |  2 +-
 .../model-view-programming.qdoc                    |  1 -
 doc/src/index.qdoc                                 | 10 +++---
 doc/src/network-programming/bearermanagement.qdoc  |  9 +++--
 doc/src/network-programming/qtnetwork.qdoc         |  1 +
 doc/src/network-programming/ssl.qdoc               |  6 ++--
 doc/src/overviews.qdoc                             | 13 ++++++-
 doc/src/painting-and-printing/coordsys.qdoc        |  2 +-
 doc/src/painting-and-printing/paintsystem.qdoc     |  3 +-
 doc/src/painting-and-printing/printing.qdoc        |  1 +
 tools/qdoc3/test/qt-defines.qdocconf               | 28 +++++++--------
 tools/qdoc3/test/qt.qdocconf                       | 42 +++++++++++-----------
 14 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/doc/src/files-and-resources/datastreamformat.qdoc b/doc/src/files-and-resources/datastreamformat.qdoc
index bab2c2c..c4be7bb 100644
--- a/doc/src/files-and-resources/datastreamformat.qdoc
+++ b/doc/src/files-and-resources/datastreamformat.qdoc
@@ -41,7 +41,8 @@
 
 /*!
     \page datastreamformat.html
-    \title Format of the QDataStream Operators
+    \title Serializing Qt Data Types
+    \ingroup qt-network
     \brief Representations of data types that can be serialized by QDataStream.
 
     The \l QDataStream allows you to serialize some of the Qt data types.
diff --git a/doc/src/files-and-resources/resources.qdoc b/doc/src/files-and-resources/resources.qdoc
index 00646ac..83d74a3 100644
--- a/doc/src/files-and-resources/resources.qdoc
+++ b/doc/src/files-and-resources/resources.qdoc
@@ -54,6 +54,8 @@
 /*!
     \page resources.html
     \title The Qt Resource System
+    \ingroup qt-network
+    \brief A platform-independent mechanism for storing binary files in an application.
 
     \keyword resource system
 
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 740fcac..1dd6c7c 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -46,7 +46,7 @@
 
 /*!
     \page graphicsview.html
-    \title The Graphics View Framework
+    \title Graphics View Framework
     \ingroup qt-graphics
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index e02f1eb..7568981 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -50,7 +50,6 @@
     \startpage index.html Qt Reference Documentation
 
     \title Model/View Programming
-    \ingroup qt-gui-concepts
     \brief A guide to the extensible model/view architecture used by Qt's
     item view classes.
 
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e6efe4d..c9b6929 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -82,17 +82,17 @@
                 
               
      
               
      
                 
               
      
             
      
diff --git a/doc/src/network-programming/bearermanagement.qdoc b/doc/src/network-programming/bearermanagement.qdoc
index 10d697a..b10481e 100644
--- a/doc/src/network-programming/bearermanagement.qdoc
+++ b/doc/src/network-programming/bearermanagement.qdoc
@@ -40,12 +40,11 @@
 ****************************************************************************/
 
 /*!
-\page bearer-management.html
+  \page bearer-management.html
 
-\title Bearer Management
-\brief An API to control the system's connectivity state.
-
-\ingroup network
+  \title Bearer Management
+  \ingroup qt-network
+  \brief An API to control the system's connectivity state.
 
 Bearer Management controls the connectivity state of the system so that
 the user can start or stop interfaces or roam transparently between
diff --git a/doc/src/network-programming/qtnetwork.qdoc b/doc/src/network-programming/qtnetwork.qdoc
index 36f48cf..9134809 100644
--- a/doc/src/network-programming/qtnetwork.qdoc
+++ b/doc/src/network-programming/qtnetwork.qdoc
@@ -50,6 +50,7 @@
 /*!
     \page network-programming.html
     \title Network Programming
+    \ingroup qt-network
     \brief An Introduction to Network Programming with Qt
 
     The QtNetwork module offers classes that allow you to write TCP/IP clients
diff --git a/doc/src/network-programming/ssl.qdoc b/doc/src/network-programming/ssl.qdoc
index 2feb7b6..7f365a9 100644
--- a/doc/src/network-programming/ssl.qdoc
+++ b/doc/src/network-programming/ssl.qdoc
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 /*!
-    \group ssl
+    \page ssl.html
     \title Secure Sockets Layer (SSL) Classes
-    \ingroup groups
-
     \brief Classes for secure communication over network sockets.
+    \ingroup qt-network
+
     \keyword SSL
 
     The classes below provide support for secure network communication using
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index cb6541d..cee1109 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -77,7 +77,7 @@
 
 /*!
     \group qt-graphics
-    \title Qt Graphics
+    \title Qt Graphics and Painting
 
     \brief The Qt components for doing graphics.
 
@@ -85,6 +85,17 @@
  */
 
 /*!
+    \group qt-network
+    \title Network programming with Qt
+
+    \brief The these pages are about Qt's support for network programming.
+
+    \generatelist {related}
+ */
+
+
+
+/*!
     \group frameworks-technologies
     \title Frameworks and Technologies
 
diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc
index b0ba093..b360d0b 100644
--- a/doc/src/painting-and-printing/coordsys.qdoc
+++ b/doc/src/painting-and-printing/coordsys.qdoc
@@ -41,7 +41,7 @@
 
 /*!
     \page coordsys.html
-    \title The Coordinate System
+    \title Coordinate System
     \ingroup qt-graphics
     \brief Information about the coordinate system used by the paint
     system.
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index b711b2f..44c84a2 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -60,7 +60,8 @@
 
 /*!
     \page paintsystem.html
-    \title The Paint System
+    \title Paint System
+    \brief A system for painting on the screen or on print devices using the same API
     \ingroup qt-graphics
     \ingroup frameworks-technologies
 
diff --git a/doc/src/painting-and-printing/printing.qdoc b/doc/src/painting-and-printing/printing.qdoc
index 3d6ade2..6dad097 100644
--- a/doc/src/painting-and-printing/printing.qdoc
+++ b/doc/src/painting-and-printing/printing.qdoc
@@ -49,6 +49,7 @@
 /*!
   \page printing.html
   \title Printing with Qt
+  \ingroup qt-graphics
 
   \previouspage Styling
   \contentspage The Paint System
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index dc81757..f3291df 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -20,20 +20,20 @@ codeindent              = 1
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
-						bg_l.png \
-                        bg_l_blank.png \
-                        bg_r.png \
-						box_bg.png \
-						breadcrumb.png \
-						bullet_gt.png \
-                        bullet_dn.png \
-						bullet_sq.png \
-                        bullet_up.png \
-                        feedbackground.png \
-                        horBar.png \
-						page.png \
-						page_bg.png \
-						sprites-combined.png \
+			  bg_l.png \
+                          bg_l_blank.png \
+                          bg_r.png \
+			  box_bg.png \
+			  breadcrumb.png \
+			  bullet_gt.png \
+                          bullet_dn.png \
+			  bullet_sq.png \
+                          bullet_up.png \
+                          feedbackground.png \
+                          horBar.png \
+			  page.png \
+			  page_bg.png \
+			  sprites-combined.png \
                           taskmenuextension-example.png \
                           coloreditorfactoryimage.png \
                           dynamiclayouts-example.png \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 59dd855..2f6983a 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -26,27 +26,27 @@ qhp.Qt.indexRoot           =
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-									images/bg_l.png \
-                             	    images/bg_l_blank.png \
-                             	    images/bg_r.png \
-									images/box_bg.png \
-									images/breadcrumb.png \
-									images/bullet_gt.png \
-                             	    images/bullet_dn.png \
-									images/bullet_sq.png \
-                             	    images/bullet_up.png \
-                             	    images/feedbackground.png \
-                             	    images/horBar.png \
-									images/page.png \
-									images/page_bg.png \
-									images/sprites-combined.png \
-                             	    images/stylesheet-coffee-plastique.png \
-                             	    images/taskmenuextension-example.png \
-                             	   images/coloreditorfactoryimage.png \
-                             	   images/dynamiclayouts-example.png \
-									scripts/functions.js \
-									scripts/jquery.js \
-                             	    style/style.css
+			     images/bg_l.png \
+			     images/bg_l_blank.png \
+                             images/bg_r.png \
+			     images/box_bg.png \
+			     images/breadcrumb.png \
+			     images/bullet_gt.png \
+			     images/bullet_dn.png \
+			     images/bullet_sq.png \
+			     images/bullet_up.png \
+			     images/feedbackground.png \
+			     images/horBar.png \
+			     images/page.png \
+			     images/page_bg.png \
+			     images/sprites-combined.png \
+			     images/stylesheet-coffee-plastique.png \
+			     images/taskmenuextension-example.png \
+			     images/coloreditorfactoryimage.png \
+			     images/dynamiclayouts-example.png \
+			     scripts/functions.js \
+			     scripts/jquery.js \
+			     style/style.css
 
 qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
 qhp.Qt.customFilters.Qt.name = Qt 4.7.0
-- 
cgit v0.12


From ad6dafee9be288bcef6b2c4b318b234d2995abff Mon Sep 17 00:00:00 2001
From: aavit 
Date: Mon, 10 May 2010 16:23:44 +0200
Subject: Optimize QPixmapIconEngine's pixmap() function

Replace needlessly expensive cache key generation

Task-number: QTBUG-9850
Reviewed-by: Trond
---
 src/gui/image/qicon.cpp | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 891b1db..5ef0ff9 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -261,21 +261,28 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    QString key = QLatin1String("$qt_icon_")
-                  + QString::number(pm.cacheKey())
-                  + QString::number(pe->mode)
-                  + QString::number(QApplication::palette().cacheKey())
-                  + QLatin1Char('_')
-                  + QString::number(actualSize.width())
-                  + QLatin1Char('_')
-                  + QString::number(actualSize.height())
-                  + QLatin1Char('_');
-
+    struct {
+        quint64 pmc;
+        qint32  w;
+        qint32  h;
+        quint64 pac;
+        qint32  m;     // Make struct size a multiple of 4, for safety's sake
+    } dill;
+
+    dill.pmc = pm.cacheKey();
+    dill.w = actualSize.width();
+    dill.h = actualSize.height();
+    dill.pac = QApplication::palette().cacheKey();
+    dill.m = pe->mode;
+
+    QString keyBase = QLatin1String("$qt_icon_")
+                      + QString::fromRawData((QChar *)&dill, sizeof(dill)/sizeof(QChar));
+    QString key = keyBase + QString::number(mode, 16);
 
     if (mode == QIcon::Active) {
-        if (QPixmapCache::find(key + QString::number(mode), pm))
+        if (QPixmapCache::find(key, pm))
             return pm; // horray
-        if (QPixmapCache::find(key + QString::number(QIcon::Normal), pm)) {
+        if (QPixmapCache::find(keyBase + QString::number(QIcon::Normal, 16), pm)) {
             QStyleOption opt(0);
             opt.palette = QApplication::palette();
             QPixmap active = QApplication::style()->generatedIconPixmap(QIcon::Active, pm, &opt);
@@ -284,7 +291,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
         }
     }
 
-    if (!QPixmapCache::find(key + QString::number(mode), pm)) {
+    if (!QPixmapCache::find(key, pm)) {
         if (pm.size() != actualSize)
             pm = pm.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         if (pe->mode != mode && mode != QIcon::Normal) {
@@ -294,7 +301,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
             if (!generated.isNull())
                 pm = generated;
         }
-        QPixmapCache::insert(key + QString::number(mode), pm);
+        QPixmapCache::insert(key, pm);
     }
     return pm;
 }
-- 
cgit v0.12


From 3eec5af3f07fdab9084f40d6955411a667b433c4 Mon Sep 17 00:00:00 2001
From: Simon Hausmann 
Date: Tue, 11 May 2010 12:26:30 +0200
Subject: Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444

Integrated changes:

||  || mingw-w64 and JIT support ||
||  || [Qt] QWebPage viewMode property ||
||  || [Qt] Fix infinite redirection loop in QNetworkReplyHandler ||
||  || [Qt] Enable YARR_JIT for X86 Mac for QtWebKit ||
||  || [Qt] Adapt DNS pre-fetching to Qt DNS cache code ||
||  || [Qt] Crash in QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate when animation were used ||
||  || [PATCH] [Qt] Compilation with Plugins disabled is broken ||
||  || Crash in handleTouchEvent: using dangling node ptrs in hashmap ||
||  || Potential crash in EventHandler::handleTouchEvent ||
||  || Spatial Navigation: create a getter for the "fudgeFactor" ||
||  || [Qt] QtWebKit has render bugs on Google Maps markers ||
||  || LayoutTests/fast/canvas/pointInPath.html passed, actually it failed ||
||  || [Qt] Expose HTMLTokenizer yielding parameters ||
---
 src/3rdparty/webkit/.tag                           |   2 +-
 src/3rdparty/webkit/JavaScriptCore/ChangeLog       |  23 +++
 src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h  |   6 +-
 src/3rdparty/webkit/VERSION                        |   2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              | 163 +++++++++++++++++++++
 src/3rdparty/webkit/WebCore/WebCore.gypi           |   2 +-
 src/3rdparty/webkit/WebCore/WebCore.pro            |   2 +-
 src/3rdparty/webkit/WebCore/page/EventHandler.cpp  |  13 +-
 .../webkit/WebCore/page/SpatialNavigation.cpp      |  13 +-
 .../webkit/WebCore/page/SpatialNavigation.h        |   5 +
 .../platform/graphics/qt/GraphicsContextQt.cpp     |  16 +-
 .../webkit/WebCore/platform/graphics/qt/PathQt.cpp |  29 ++++
 .../platform/network/qt/DnsPrefetchHelper.h        |  11 ++
 .../platform/network/qt/QNetworkReplyHandler.cpp   |  13 +-
 .../platform/network/qt/QNetworkReplyHandler.h     |   1 +
 .../WebCore/platform/qt/TemporaryLinkStubs.cpp     | 119 ---------------
 .../WebCore/platform/qt/TemporaryLinkStubsQt.cpp   | 119 +++++++++++++++
 .../webkit/WebKit/qt/Api/qgraphicswebview.cpp      |  22 ++-
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp     |  32 ++--
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h     |   2 +
 src/3rdparty/webkit/WebKit/qt/ChangeLog            |  58 ++++++++
 .../webkit/WebKit/qt/symbian/bwins/QtWebKitu.def   |   2 +-
 .../webkit/WebKit/qt/symbian/eabi/QtWebKitu.def    |   2 +-
 .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp      |  17 +++
 24 files changed, 505 insertions(+), 169 deletions(-)
 delete mode 100644 src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp
 create mode 100644 src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubsQt.cpp

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 75fc5e7..65cfdda 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-b4aa5e1ddc41edab895132aba3cc66d9d7129444
+dc5821c3df2ef60456d85263160852f5335cf946
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 1439ae0..97176ef 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-05-10  Laszlo Gombos  
+
+        Reviewed by Darin Adler.
+
+        [Qt] Disable JIT support for mingw-w64
+        https://bugs.webkit.org/show_bug.cgi?id=38747
+
+        Disale JIT for mingw-w64 as it is reportedly
+        unstable.
+
+        Thanks for Vanboxem Rruben for the investigation.
+
+        * wtf/Platform.h:
+
+2010-05-06  Laszlo Gombos  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Enable YARR_JIT for X86 Mac for QtWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=38668
+
+        * wtf/Platform.h:
+
 2010-05-02  Laszlo Gombos  
 
         Reviewed by Eric Seidel.
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index c582905..8d98765 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -927,8 +927,6 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #elif CPU(X86) && OS(WINDOWS) && COMPILER(MINGW) && GCC_VERSION >= 40100
     #define ENABLE_JIT 1
     #define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1
-#elif CPU(X86_64) && OS(WINDOWS) && COMPILER(MINGW64) && GCC_VERSION >= 40100
-    #define ENABLE_JIT 1
 #elif CPU(X86) && OS(WINDOWS) && COMPILER(MSVC)
     #define ENABLE_JIT 1
     #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
@@ -1011,7 +1009,9 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
     || (CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100) \
     || (CPU(ARM_TRADITIONAL) && OS(LINUX)) \
     || (CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT)) \
-    || (CPU(MIPS) && OS(LINUX))
+    || (CPU(MIPS) && OS(LINUX)) \
+    || (CPU(X86) && OS(DARWIN)) \
+    || (CPU(X86_64) && OS(DARWIN))
 #define ENABLE_YARR 1
 #define ENABLE_YARR_JIT 1
 #endif
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 98debf6..24f855b 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
 
-        07b60cf799680fcfb7785ee88e14f8030a5dbfa2
+        b4aa5e1ddc41edab895132aba3cc66d9d7129444
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 6617b66..ee42878 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,166 @@
+2010-05-03  Antonio Gomes  
+
+        Reviewed by Kenneth Christiansen.
+
+        Spatial Navigation: create a getter for the "fudgeFactor"
+        https://bugs.webkit.org/show_bug.cgi?id=38488
+
+        A couple of places in the Spatial Navigation code make use of a "fudge factor"
+        to improve precision by working around outline focus metrics and such. Patch adds
+        a helper method for unify getter operations of this value, instead of having it
+        declared locally in the various methods it is used.
+
+        No behaviour change.
+
+        * page/SpatialNavigation.cpp:
+        (WebCore::scrollIntoView):
+        (WebCore::deflateIfOverlapped):
+        * page/SpatialNavigation.h:
+        (WebCore::fudgeFactor):
+
+2010-05-10  Markus Goetz  
+
+        Reviewed by Simon Hausmann.
+
+        Qt after 4.6.3 has its integrated DNS cache. Therefore some
+        code is not necessary anymore.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38834
+
+        * platform/network/qt/DnsPrefetchHelper.h:
+        (WebCore::DnsPrefetchHelper::lookup):
+        (WebCore::DnsPrefetchHelper::lookedUp):
+
+2010-05-06  Laszlo Gombos  
+
+        Unreviewed, build fix WinCE for QtWebKit.
+
+        [Qt] Compilation with Plugins disabled is broken
+        https://bugs.webkit.org/show_bug.cgi?id=31407
+
+        Rename platform/qt/TemporaryLinkStubs.cpp to avoid name collition on
+        Windows.
+
+        Thanks for Ismail "cartman" Donmez for help.
+
+        No new tests, as there is no new functionality.
+
+        * WebCore.gypi:
+        * WebCore.pro:
+        * platform/qt/TemporaryLinkStubs.cpp: Removed.
+        * platform/qt/TemporaryLinkStubsQt.cpp: Copied from WebCore/platform/qt/TemporaryLinkStubs.cpp.
+
+2010-04-23  Qi Zhang  
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] LayoutTests/fast/canvas/pointInPath.html passed, actually it failed
+        https://bugs.webkit.org/show_bug.cgi?id=37276
+
+        QPainterPath::contains doesn't count the point on the bound.
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::isPointOnPathBorder):
+        (WebCore::Path::contains):
+
+2010-05-07  Tor Arne Vestbø  
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix rendering of -webkit-user-select: none
+
+        -webkit-user-select: none is implemented by filling
+        the area with an invalid default-constructed Color.
+        In most ports passing an invalid color down to the
+        graphics backend seems to produce transparent fills.
+
+        In Qt the behavior of painting with an invalid QColor
+        is undefined, and in practice it results in painting
+        black opaque areas.
+
+        One way to fix this would be to use Qt::transparent
+        when converting an undefined Color to a QColor, but
+        Qt does not have short circuits for fully transparent
+        painting, and we actually end up in slow code paths
+        due to the transparency. So, we're better of doing the
+        short circuit in WebKit.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38523
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+
+2010-04-05  Robert Hogan  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix infinite redirection loop in QNetworkReplyHandler
+
+        Put a maximum on consecutive redirections so we don't have to
+        worry about whether it's the same url or not.
+
+        Tolerate up to 10 consecutive redirections, anything beyond
+        that is considered a potentially infinite recursion in the
+        redirection requests. This is the same behaviour as Firefox.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37097
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+        * platform/network/qt/QNetworkReplyHandler.h:
+
+2010-04-05  Robert Hogan  
+
+        Reviewed by Kenneth Rohde-Christiansen.
+
+        [Qt] Fix infinite redirection loop in QNetworkReplyHandler
+
+        Qt enters an infinite loop if a redirect response redirects to itself.
+
+        Fixes http/tests/xmlhttprequest/connection-error-sync.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=37097
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
+2010-05-07  Ben Murdoch  
+
+        Reviewed by Darin Adler.
+
+        Potential crash in EventHandler::handleTouchEvent
+        https://bugs.webkit.org/show_bug.cgi?id=38646
+
+        Fix a ref counting bug that can cause a crash if the m_originatingouchPointTargets
+        hashmap holds the last ref to an EventTarget when the user lifts their finger.
+
+        This is very hard to reproduce in a consistent way and clearly a
+        simple logic error in the code, therefore no new tests.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleTouchEvent): Don't let the RefPtr we get back from
+            the hasmap go out of scope so soon as it could delete the wrapped ptr if the
+            hashmap held the last ref (and we use the raw ptr that the RefPtr
+            wraps later in the WebCore::Touch constructor).
+
+2010-05-04  Ben Murdoch  
+
+        Reviewed by Simon Hausmann.
+
+        Crash in handleTouchEvent: using dangling node ptrs in hashmap
+        https://bugs.webkit.org/show_bug.cgi?id=38514
+
+        When navigating away from a page, if you have your finger still
+        pressed and then lift it on the new page we see a crash if the
+        node got deleted as we still have a dangling pointer in the
+        m_originatingTouchPointTargets hashmap and try to use it as the
+        receiver to dispatch a touchend event.
+
+        Test: fast/events/touch/touch-stale-node-crash.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::clear): Clear the hashmap of touch targets.
+
 2010-05-04  Luiz Agostini  
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.gypi b/src/3rdparty/webkit/WebCore/WebCore.gypi
index caa79f2..701ad90 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.gypi
+++ b/src/3rdparty/webkit/WebCore/WebCore.gypi
@@ -2640,7 +2640,7 @@
             'platform/qt/SharedBufferQt.cpp',
             'platform/qt/SharedTimerQt.cpp',
             'platform/qt/SoundQt.cpp',
-            'platform/qt/TemporaryLinkStubs.cpp',
+            'platform/qt/TemporaryLinkStubsQt.cpp',
             'platform/qt/WheelEventQt.cpp',
             'platform/qt/WidgetQt.cpp',
             'platform/sql/SQLValue.cpp',
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index beeb529..e42cd8e 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2081,7 +2081,7 @@ SOURCES += \
     platform/qt/SoundQt.cpp \
     platform/qt/LoggingQt.cpp \
     platform/text/qt/StringQt.cpp \
-    platform/qt/TemporaryLinkStubs.cpp \
+    platform/qt/TemporaryLinkStubsQt.cpp \
     platform/text/qt/TextBoundariesQt.cpp \
     platform/text/qt/TextBreakIteratorQt.cpp \
     platform/text/qt/TextCodecQt.cpp \
diff --git a/src/3rdparty/webkit/WebCore/page/EventHandler.cpp b/src/3rdparty/webkit/WebCore/page/EventHandler.cpp
index 0a0e8c6..46dd7ae 100644
--- a/src/3rdparty/webkit/WebCore/page/EventHandler.cpp
+++ b/src/3rdparty/webkit/WebCore/page/EventHandler.cpp
@@ -230,6 +230,9 @@ void EventHandler::clear()
     m_capturingMouseEventsNode = 0;
     m_latchedWheelEventNode = 0;
     m_previousWheelScrolledNode = 0;
+#if ENABLE(TOUCH_EVENTS)
+    m_originatingTouchPointTargets.clear();
+#endif
 }
 
 void EventHandler::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result)
@@ -2714,21 +2717,21 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 
         // Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
         unsigned touchPointTargetKey = point.id() + 1;
-        EventTarget* touchTarget = 0;
+        RefPtr touchTarget;
         if (point.state() == PlatformTouchPoint::TouchPressed) {
             m_originatingTouchPointTargets.set(touchPointTargetKey, target);
             touchTarget = target;
         } else if (point.state() == PlatformTouchPoint::TouchReleased || point.state() == PlatformTouchPoint::TouchCancelled) {
             // The target should be the original target for this touch, so get it from the hashmap. As it's a release or cancel
             // we also remove it from the map.
-            touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey).get();
+            touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
         } else
-            touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey).get();
+            touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey);
 
-        if (!touchTarget)
+        if (!touchTarget.get())
             continue;
 
-        RefPtr touch = Touch::create(doc->frame(), touchTarget, point.id(),
+        RefPtr touch = Touch::create(doc->frame(), touchTarget.get(), point.id(),
                                             point.screenPos().x(), point.screenPos().y(),
                                             adjustedPageX, adjustedPageY);
 
diff --git a/src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp b/src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp
index 890eacd..d7eaf25 100644
--- a/src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp
+++ b/src/3rdparty/webkit/WebCore/page/SpatialNavigation.cpp
@@ -477,9 +477,8 @@ void scrollIntoView(Element* element)
     // it is preferable to inflate |element|'s bounding rect a bit before
     // scrolling it for accurate reason.
     // Element's scrollIntoView method does not provide this flexibility.
-    static const int fudgeFactor = 2;
     IntRect bounds = element->getRect();
-    bounds.inflate(fudgeFactor);
+    bounds.inflate(fudgeFactor());
     element->renderer()->enclosingLayer()->scrollRectToVisible(bounds);
 }
 
@@ -497,14 +496,14 @@ static void deflateIfOverlapped(IntRect& a, IntRect& b)
     if (!a.intersects(b) || a.contains(b) || b.contains(a))
         return;
 
-    static const int fudgeFactor = -2;
+    int deflateFactor = -fudgeFactor();
 
     // Avoid negative width or height values.
-    if ((a.width() + 2 * fudgeFactor > 0) && (a.height() + 2 * fudgeFactor > 0))
-        a.inflate(fudgeFactor);
+    if ((a.width() + 2 * deflateFactor > 0) && (a.height() + 2 * deflateFactor > 0))
+        a.inflate(deflateFactor);
 
-    if ((b.width() + 2 * fudgeFactor > 0) && (b.height() + 2 * fudgeFactor > 0))
-        b.inflate(fudgeFactor);
+    if ((b.width() + 2 * deflateFactor > 0) && (b.height() + 2 * deflateFactor > 0))
+        b.inflate(deflateFactor);
 }
 
 static bool checkNegativeCoordsForNode(Node* node, const IntRect& curRect)
diff --git a/src/3rdparty/webkit/WebCore/page/SpatialNavigation.h b/src/3rdparty/webkit/WebCore/page/SpatialNavigation.h
index 90ff1cf..309b095 100644
--- a/src/3rdparty/webkit/WebCore/page/SpatialNavigation.h
+++ b/src/3rdparty/webkit/WebCore/page/SpatialNavigation.h
@@ -40,6 +40,11 @@ inline long long maxDistance()
     return numeric_limits::max();
 }
 
+inline unsigned int fudgeFactor()
+{
+    return 2;
+}
+
 // Spatially speaking, two given elements in a web page can be:
 // 1) Fully aligned: There is a full intersection between the rects, either
 //    vertically or horizontally.
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index edac268..0100b72 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -641,12 +641,12 @@ void GraphicsContext::fillRect(const FloatRect& rect)
     }
 }
 
-void GraphicsContext::fillRect(const FloatRect& rect, const Color& c, ColorSpace colorSpace)
+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled())
+    if (paintingDisabled() || !color.isValid())
         return;
 
-    m_data->solidColor.setColor(c);
+    m_data->solidColor.setColor(color);
     QPainter* p = m_data->p();
     if (m_common->state.shadowColor.isValid())
         drawBorderlessRectShadow(this, p, rect);
@@ -655,7 +655,7 @@ void GraphicsContext::fillRect(const FloatRect& rect, const Color& c, ColorSpace
 
 void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled() || !color.alpha())
+    if (paintingDisabled() || !color.isValid() || !color.alpha())
         return;
 
     Path path = Path::createRoundedRectangle(rect, topLeft, topRight, bottomLeft, bottomRight);
@@ -717,7 +717,7 @@ void GraphicsContext::drawFocusRing(const Vector& paths, int width, int of
  */
 void GraphicsContext::drawFocusRing(const Vector& rects, int /* width */, int /* offset */, const Color& color)
 {
-    if (paintingDisabled())
+    if (paintingDisabled() || !color.isValid())
         return;
 
     unsigned rectCount = rects.size();
@@ -1141,8 +1141,9 @@ void GraphicsContext::setURLForRect(const KURL&, const IntRect&)
 
 void GraphicsContext::setPlatformStrokeColor(const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled())
+    if (paintingDisabled() || !color.isValid())
         return;
+
     QPainter* p = m_data->p();
     QPen newPen(p->pen());
     m_data->solidColor.setColor(color);
@@ -1172,8 +1173,9 @@ void GraphicsContext::setPlatformStrokeThickness(float thickness)
 
 void GraphicsContext::setPlatformFillColor(const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled())
+    if (paintingDisabled() || !color.isValid())
         return;
+
     m_data->solidColor.setColor(color);
     m_data->p()->setBrush(m_data->solidColor);
 }
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
index ee4af7f..4b0c21f 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
@@ -69,12 +69,41 @@ Path& Path::operator=(const Path& other)
     return *this;
 }
 
+// Check whether a point is on the border
+bool isPointOnPathBorder(const QPolygonF& border, const QPointF& p)
+{
+    QPointF p1 = border.at(0);
+    QPointF p2;
+
+    for (int i = 1; i < border.size(); ++i) {
+        p2 = border.at(i);
+        //  (x1<=x<=x2||x1=>x>=x2) && (y1<=y<=y2||y1=>y>=y2)  && (y2-y1)(x-x1) == (y-y1)(x2-x1)
+        //  In which, (y2-y1)(x-x1) == (y-y1)(x2-x1) is from (y2-y1)/(x2-x1) == (y-y1)/(x-x1)
+        //  it want to check the slope between p1 and p2 is same with slope between p and p1,
+        //  if so then the three points lie on the same line.
+        //  In which, (x1<=x<=x2||x1=>x>=x2) && (y1<=y<=y2||y1=>y>=y2) want to make sure p is
+        //  between p1 and p2, not outside.
+        if (((p.x() <= p1.x() && p.x() >= p2.x()) || (p.x() >= p1.x() && p.x() <= p2.x()))
+            && ((p.y() <= p1.y() && p.y() >= p2.y()) || (p.y() >= p1.y() && p.y() <= p2.y()))
+            && (p2.y() - p1.y()) * (p.x() - p1.x()) == (p.y() - p1.y()) * (p2.x() - p1.x())) {
+            return true;
+        }
+        p1 = p2;
+    }
+    return false;
+}
+
 bool Path::contains(const FloatPoint& point, WindRule rule) const
 {
     Qt::FillRule savedRule = m_path.fillRule();
     const_cast(&m_path)->setFillRule(rule == RULE_EVENODD ? Qt::OddEvenFill : Qt::WindingFill);
 
     bool contains = m_path.contains(point);
+    
+    if (!contains) {
+        // check whether the point is on the border
+        contains = isPointOnPathBorder(m_path.toFillPolygon(), point);
+    }
 
     const_cast(&m_path)->setFillRule(savedRule);
     return contains;
diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/DnsPrefetchHelper.h b/src/3rdparty/webkit/WebCore/platform/network/qt/DnsPrefetchHelper.h
index 0d98fcb..e355025 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/qt/DnsPrefetchHelper.h
+++ b/src/3rdparty/webkit/WebCore/platform/network/qt/DnsPrefetchHelper.h
@@ -42,6 +42,13 @@ namespace WebCore {
             if (currentLookups >= 10)
                 return; // do not launch more than 10 lookups at the same time
 
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 3)
+            currentLookups++;
+            QHostInfo::lookupHost(hostname, this, SLOT(lookedUp(QHostInfo)));
+#else
+            // This code is only needed for Qt versions that do not have
+            // the small Qt DNS cache yet.
+
             QTime* entryTime = lookupCache.object(hostname);
             if (entryTime && entryTime->elapsed() > 300*1000) {
                 // delete knowledge about lookup if it is already 300 seconds old
@@ -54,6 +61,7 @@ namespace WebCore {
                 currentLookups++;
                 QHostInfo::lookupHost(hostname, this, SLOT(lookedUp(QHostInfo)));
             }
+#endif
         }
 
         void lookedUp(const QHostInfo&)
@@ -61,11 +69,14 @@ namespace WebCore {
             // we do not cache the result, we throw it away.
             // we currently rely on the OS to cache the results. If it does not do that
             // then at least the ISP nameserver did it.
+            // Since Qt 4.6.3, Qt also has a small DNS cache.
             currentLookups--;
         }
 
     protected:
+#if QT_VERSION < QT_VERSION_CHECK(4, 6, 3)
         QCache lookupCache; // 100 entries
+#endif
         int currentLookups;
     };
 
diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 403718f..abeb895 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -49,6 +49,7 @@
 #define SIGNAL_CONN Qt::QueuedConnection
 #endif
 
+static const int gMaxRecursionLimit = 10;
 
 namespace WebCore {
 
@@ -139,6 +140,7 @@ QNetworkReplyHandler::QNetworkReplyHandler(ResourceHandle* handle, LoadMode load
     , m_shouldFinish(false)
     , m_shouldSendResponse(false)
     , m_shouldForwardData(false)
+    , m_redirectionTries(gMaxRecursionLimit)
 {
     const ResourceRequest &r = m_resourceHandle->request();
 
@@ -336,9 +338,18 @@ void QNetworkReplyHandler::sendResponseIfNeeded()
 
     QUrl redirection = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if (redirection.isValid()) {
+        QUrl newUrl = m_reply->url().resolved(redirection);
+
+        m_redirectionTries--;
+        if (m_redirectionTries == 0) { // 10 or more redirections to the same url is considered infinite recursion
+            ResourceError error(newUrl.host(), 400 /*bad request*/,
+                                newUrl.toString(),
+                                QCoreApplication::translate("QWebPage", "Redirection limit reached"));
+            client->didFail(m_resourceHandle, error);
+            return;
+        }
         m_redirected = true;
 
-        QUrl newUrl = m_reply->url().resolved(redirection);
         ResourceRequest newRequest = m_resourceHandle->request();
         newRequest.setURL(newUrl);
 
diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.h b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.h
index eb5ae3c..1abad4e 100644
--- a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.h
+++ b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.h
@@ -82,6 +82,7 @@ private:
     bool m_shouldFinish;
     bool m_shouldSendResponse;
     bool m_shouldForwardData;
+    int m_redirectionTries;
 };
 
 // Self destructing QIODevice for FormData
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp b/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp
deleted file mode 100644
index 814f961..0000000
--- a/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubs.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
- * Copyright (C) 2006 George Staikos 
- * Copyright (C) 2006 Dirk Mueller 
- * Copyright (C) 2006 Nikolas Zimmermann 
- * Copyright (C) 2008 Collabora, Ltd.
- *
- * All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "AXObjectCache.h"
-#include "DNS.h"
-#include "CString.h"
-#include "CachedResource.h"
-#include "CookieJar.h"
-#include "Cursor.h"
-#include "Font.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "FTPDirectoryDocument.h"
-#include "IntPoint.h"
-#include "Widget.h"
-#include "GraphicsContext.h"
-#include "Cursor.h"
-#include "loader.h"
-#include "FileSystem.h"
-#include "FrameView.h"
-#include "GraphicsContext.h"
-#include "IconLoader.h"
-#include "IntPoint.h"
-#include "KURL.h"
-#include "Language.h"
-#include "loader.h"
-#include "LocalizedStrings.h"
-#include "Node.h"
-#include "NotImplemented.h"
-#include "Path.h"
-#include "PlatformMouseEvent.h"
-#include "PluginDatabase.h"
-#include "PluginPackage.h"
-#include "PluginView.h"
-#include "RenderTheme.h"
-#include "SharedBuffer.h"
-#include "SystemTime.h"
-#include "TextBoundaries.h"
-#include "Widget.h"
-#include 
-#include 
-#include 
-
-using namespace WebCore;
-
-#if defined(Q_OS_WINCE)
-Vector PluginDatabase::defaultPluginDirectories()
-{
-    notImplemented();
-    return Vector();
-}
-
-void PluginDatabase::getPluginPathsInDirectories(HashSet& paths) const
-{
-    notImplemented();
-}
-
-bool PluginDatabase::isPreferredPluginDirectory(const String& directory)
-{
-    notImplemented();
-    return false;
-}
-#endif
-
-namespace WebCore {
-
-void getSupportedKeySizes(Vector&)
-{
-    notImplemented();
-}
-
-String signedPublicKeyAndChallengeString(unsigned, const String&, const KURL&)
-{
-    return String();
-}
-
-#if !defined(Q_OS_WIN)
-// defined in win/SystemTimeWin.cpp, which is compiled for the Qt/Windows port
-float userIdleTime()
-{
-    notImplemented();
-    return FLT_MAX; // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed
-}
-#endif
-
-}
-
-// vim: ts=4 sw=4 et
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubsQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubsQt.cpp
new file mode 100644
index 0000000..814f961
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/platform/qt/TemporaryLinkStubsQt.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
+ * Copyright (C) 2006 George Staikos 
+ * Copyright (C) 2006 Dirk Mueller 
+ * Copyright (C) 2006 Nikolas Zimmermann 
+ * Copyright (C) 2008 Collabora, Ltd.
+ *
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "AXObjectCache.h"
+#include "DNS.h"
+#include "CString.h"
+#include "CachedResource.h"
+#include "CookieJar.h"
+#include "Cursor.h"
+#include "Font.h"
+#include "Frame.h"
+#include "FrameLoader.h"
+#include "FTPDirectoryDocument.h"
+#include "IntPoint.h"
+#include "Widget.h"
+#include "GraphicsContext.h"
+#include "Cursor.h"
+#include "loader.h"
+#include "FileSystem.h"
+#include "FrameView.h"
+#include "GraphicsContext.h"
+#include "IconLoader.h"
+#include "IntPoint.h"
+#include "KURL.h"
+#include "Language.h"
+#include "loader.h"
+#include "LocalizedStrings.h"
+#include "Node.h"
+#include "NotImplemented.h"
+#include "Path.h"
+#include "PlatformMouseEvent.h"
+#include "PluginDatabase.h"
+#include "PluginPackage.h"
+#include "PluginView.h"
+#include "RenderTheme.h"
+#include "SharedBuffer.h"
+#include "SystemTime.h"
+#include "TextBoundaries.h"
+#include "Widget.h"
+#include 
+#include 
+#include 
+
+using namespace WebCore;
+
+#if defined(Q_OS_WINCE)
+Vector PluginDatabase::defaultPluginDirectories()
+{
+    notImplemented();
+    return Vector();
+}
+
+void PluginDatabase::getPluginPathsInDirectories(HashSet& paths) const
+{
+    notImplemented();
+}
+
+bool PluginDatabase::isPreferredPluginDirectory(const String& directory)
+{
+    notImplemented();
+    return false;
+}
+#endif
+
+namespace WebCore {
+
+void getSupportedKeySizes(Vector&)
+{
+    notImplemented();
+}
+
+String signedPublicKeyAndChallengeString(unsigned, const String&, const KURL&)
+{
+    return String();
+}
+
+#if !defined(Q_OS_WIN)
+// defined in win/SystemTimeWin.cpp, which is compiled for the Qt/Windows port
+float userIdleTime()
+{
+    notImplemented();
+    return FLT_MAX; // return an arbitrarily high userIdleTime so that releasing pages from the page cache isn't postponed
+}
+#endif
+
+}
+
+// vim: ts=4 sw=4 et
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
index 0c13e43..75a23d9 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
@@ -82,7 +82,6 @@ public:
         , page(0)
         , resizesToContents(false)
 #if USE(ACCELERATED_COMPOSITING)
-        , rootGraphicsLayer(0)
         , shouldSync(false)
 #endif
     {
@@ -158,7 +157,7 @@ public:
     enum { RootGraphicsLayerZValue, OverlayZValue };
 
 #if USE(ACCELERATED_COMPOSITING)
-    QGraphicsItem* rootGraphicsLayer;
+    QWeakPointer rootGraphicsLayer;
     // we need to sync the layers if we get a special call from the WebCore
     // compositor telling us to do so. We'll get that call from ChromeClientQt
     bool shouldSync;
@@ -171,12 +170,11 @@ public:
 QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate()
 {
 #if USE(ACCELERATED_COMPOSITING)
-    if (rootGraphicsLayer) {
-        // we don't need to delete the root graphics layer
-        // The lifecycle is managed in GraphicsLayerQt.cpp
-        rootGraphicsLayer->setParentItem(0);
-        q->scene()->removeItem(rootGraphicsLayer);
-    }
+    if (!rootGraphicsLayer)
+        return;
+    // we don't need to delete the root graphics layer. The lifecycle is managed in GraphicsLayerQt.cpp.
+    rootGraphicsLayer.data()->setParentItem(0);
+    q->scene()->removeItem(rootGraphicsLayer.data());
 #endif
 }
 
@@ -204,12 +202,12 @@ void QGraphicsWebViewPrivate::createOrDeleteOverlay()
 void QGraphicsWebViewPrivate::setRootGraphicsLayer(QGraphicsItem* layer)
 {
     if (rootGraphicsLayer) {
-        rootGraphicsLayer->setParentItem(0);
-        q->scene()->removeItem(rootGraphicsLayer);
+        rootGraphicsLayer.data()->setParentItem(0);
+        q->scene()->removeItem(rootGraphicsLayer.data());
         QWebFramePrivate::core(q->page()->mainFrame())->view()->syncCompositingStateRecursive();
     }
 
-    rootGraphicsLayer = layer;
+    rootGraphicsLayer = layer ? layer->toGraphicsObject() : 0;
 
     if (layer) {
         layer->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
@@ -231,7 +229,7 @@ void QGraphicsWebViewPrivate::updateCompositingScrollPosition()
 {
     if (rootGraphicsLayer && q->page() && q->page()->mainFrame()) {
         const QPoint scrollPosition = q->page()->mainFrame()->scrollPosition();
-        rootGraphicsLayer->setPos(-scrollPosition);
+        rootGraphicsLayer.data()->setPos(-scrollPosition);
     }
 }
 #endif
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index b8b50b7..e9ebce5 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -119,15 +119,6 @@
 
 using namespace WebCore;
 
-void QWEBKIT_EXPORT qt_wrt_setViewMode(QWebPage* page, const QString& mode)
-{
-    QWebPagePrivate::priv(page)->viewMode = mode;
-    WebCore::Frame* frame = QWebFramePrivate::core(page->mainFrame());
-    WebCore::FrameView* view = frame->view();
-    frame->document()->updateStyleSelector();
-    view->forceLayout();
-}
-
 void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories()
 {
     PluginDatabase* db = PluginDatabase::installedPlugins(/* populate */ false);
@@ -1361,6 +1352,26 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
     ev->accept();
 }
 
+void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* event)
+{
+    if (event->propertyName() == "_q_viewMode") {
+        QString mode = q->property("_q_viewMode").toString();
+        if (mode != viewMode) {
+            viewMode = mode;
+            WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+            WebCore::FrameView* view = frame->view();
+            frame->document()->updateStyleSelector();
+            view->forceLayout();
+        }
+    } else if (event->propertyName() == "_q_HTMLTokenizerChunkSize") {
+        int chunkSize = q->property("_q_HTMLTokenizerChunkSize").toInt();
+        q->handle()->page->setCustomHTMLTokenizerChunkSize(chunkSize);
+    } else if (event->propertyName() == "_q_HTMLTokenizerTimeDelay") {
+        double timeDelay = q->property("_q_HTMLTokenizerTimeDelay").toDouble();
+        q->handle()->page->setCustomHTMLTokenizerTimeDelay(timeDelay);
+    }
+}
+
 void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event)
 {
     WebCore::Frame* frame = page->focusController()->focusedOrMainFrame();
@@ -2708,6 +2719,9 @@ bool QWebPage::event(QEvent *ev)
         d->touchEvent(static_cast(ev));
         break;
 #endif
+    case QEvent::DynamicPropertyChange:
+        d->dynamicPropertyChangeEvent(static_cast(ev));
+        break;
     default:
         return QObject::event(ev);
     }
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h
index 0712d0c..5350cd9 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage_p.h
@@ -112,6 +112,8 @@ public:
 
     void inputMethodEvent(QInputMethodEvent*);
 
+    void dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent*);
+
     void shortcutOverrideEvent(QKeyEvent*);
     void leaveEvent(QEvent*);
     void handleClipboard(QEvent*, Qt::MouseButton);
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 555b14d..6ddaa2b 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,61 @@
+2010-05-09  Noam Rosenthal  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Crash in QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate when animation were used
+        https://bugs.webkit.org/show_bug.cgi?id=38574
+
+        The fix uses a QWeakPointer for rootGraphicsLayer, protecting from a crash in case the layer is deleted before the QGraphicsWebView.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::setRootGraphicsLayer):
+        (QGraphicsWebViewPrivate::updateCompositingScrollPosition):
+
+2010-05-03  Laszlo Gombos  
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Expose HTMLTokenizer yielding parameters
+        https://bugs.webkit.org/show_bug.cgi?id=37023
+
+        Enables to set TimeDelay and ChunkSize for 
+        HTMLTokenizer.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+
+2010-05-04  Laszlo Gombos  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QWebPage viewMode property
+        https://bugs.webkit.org/show_bug.cgi?id=38119
+
+        Rename the property from wrt_viewMode to _q_viewMode.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::viewModes):
+
+2010-04-28  Luiz Agostini  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QWebPage viewMode property
+        https://bugs.webkit.org/show_bug.cgi?id=38119
+
+        Replacing method qt_wrt_setViewMode by wrt_viewMode property.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::wrt_viewModes):
+
 2010-04-09  Tasuku Suzuki  
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
index a450f9e..910ba8f 100644
--- a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
+++ b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
@@ -642,7 +642,7 @@ EXPORTS
 	?qt_drt_webinspector_executeScript@@YAXPAVQWebPage@@JABVQString@@@Z @ 641 NONAME ; void qt_drt_webinspector_executeScript(class QWebPage *, long, class QString const &)
 	?qt_drt_webinspector_show@@YAXPAVQWebPage@@@Z @ 642 NONAME ; void qt_drt_webinspector_show(class QWebPage *)
 	?qt_drt_workerThreadCount@@YAHXZ @ 643 NONAME ; int qt_drt_workerThreadCount(void)
-	?qt_wrt_setViewMode@@YAXPAVQWebPage@@ABVQString@@@Z @ 644 NONAME ; void qt_wrt_setViewMode(class QWebPage *, class QString const &)
+	?qt_wrt_setViewMode@@YAXPAVQWebPage@@ABVQString@@@Z @ 644 NONAME ABSENT ; void qt_wrt_setViewMode(class QWebPage *, class QString const &)
 	?qtwebkit_webframe_scrollRecursively@@YAXPAVQWebFrame@@HHABVQPoint@@@Z @ 645 NONAME ; void qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int, class QPoint const &)
 	?resizesToContents@QGraphicsWebView@@QBE_NXZ @ 646 NONAME ; bool QGraphicsWebView::resizesToContents(void) const
 	?scrollToAnchor@QWebFrame@@QAEXABVQString@@@Z @ 647 NONAME ; void QWebFrame::scrollToAnchor(class QString const &)
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
index 145fe0b..ca462d0 100644
--- a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
+++ b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
@@ -716,7 +716,7 @@ EXPORTS
 	_ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME
 	_ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME
 	_ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME
-	_Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME
+	_Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME ABSENT
 	_Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME
 	_Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME
 	_ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index f7eddd5..834a394 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -110,6 +110,8 @@ private slots:
     void userAgentApplicationName();
     void userAgentLocaleChange();
 
+    void viewModes();
+
     void crashTests_LazyInitializationOfMainFrame();
 
     void screenshot_data();
@@ -357,6 +359,21 @@ void tst_QWebPage::userStyleSheet()
     QCOMPARE(networkManager->requestedUrls.at(0), QUrl("http://does.not/exist.png"));
 }
 
+void tst_QWebPage::viewModes()
+{
+    m_view->setHtml("");
+    m_page->setProperty("_q_viewMode", "minimized");
+
+    QVariant empty = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode)\")");
+    QVERIFY(empty.type() == QVariant::Bool && empty.toBool());
+
+    QVariant minimized = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode: minimized)\")");
+    QVERIFY(minimized.type() == QVariant::Bool && minimized.toBool());
+
+    QVariant maximized = m_page->mainFrame()->evaluateJavaScript("window.styleMedia.matchMedium(\"(-webkit-view-mode: maximized)\")");
+    QVERIFY(maximized.type() == QVariant::Bool && !maximized.toBool());
+}
+
 void tst_QWebPage::modified()
 {
     m_page->mainFrame()->setUrl(QUrl("data:text/html,blub"));
-- 
cgit v0.12


From 9b2038e41a9aa16df0595b812df0d414a8246f52 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen 
Date: Tue, 11 May 2010 13:35:32 +0300
Subject: Fix slider stepping when used with keypad navigation

QElapsedTimer usage was corrected

Task-number: QTBUG-9857
Reviewed-by: Alessandro Portale
---
 src/gui/widgets/qabstractslider.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp
index 6a01d68..f38bae7 100644
--- a/src/gui/widgets/qabstractslider.cpp
+++ b/src/gui/widgets/qabstractslider.cpp
@@ -219,8 +219,12 @@ QAbstractSliderPrivate::QAbstractSliderPrivate()
 #ifdef QT_KEYPAD_NAVIGATION
       , isAutoRepeating(false)
       , repeatMultiplier(1)
-#endif
 {
+    firstRepeat.invalidate();
+#else
+{
+#endif
+
 }
 
 QAbstractSliderPrivate::~QAbstractSliderPrivate()
@@ -787,7 +791,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
         }
 
     }
-    else if (!d->firstRepeat.isValid()) {
+    else if (d->firstRepeat.isValid()) {
         d->firstRepeat.invalidate();
         d->repeatMultiplier = 1;
     }
-- 
cgit v0.12


From 05399347ed467693d45009c6ba659746ea492231 Mon Sep 17 00:00:00 2001
From: Thomas Zander 
Date: Tue, 11 May 2010 14:04:24 +0200
Subject: Add license header

---
 config.tests/symbian/simple/main.cpp | 40 ++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/config.tests/symbian/simple/main.cpp b/config.tests/symbian/simple/main.cpp
index 41371da..9227c42 100644
--- a/config.tests/symbian/simple/main.cpp
+++ b/config.tests/symbian/simple/main.cpp
@@ -1,3 +1,43 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
 
 int main(int, char **) {
-- 
cgit v0.12


From fffb09adfd07eef5d2f296374b507032eec06cad Mon Sep 17 00:00:00 2001
From: Shane Kearns 
Date: Tue, 11 May 2010 13:34:37 +0100
Subject: Symbian/trk: Fix debugging output for the N8.

1. Fix hanging behaviour when we receive a message on the wrong mux in
framed mode
2. Treat messages on the trace mux (0102) as debug output
3. Separate timestamp from text in trace messages

Reviewed-by: Friedemann Kleint
---
 tools/runonphone/symbianutils/launcher.cpp | 18 ++++++++++++++++--
 tools/runonphone/symbianutils/trkutils.cpp | 22 +++++++++++++++++-----
 tools/runonphone/symbianutils/trkutils.h   |  8 ++++++++
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/tools/runonphone/symbianutils/launcher.cpp b/tools/runonphone/symbianutils/launcher.cpp
index fa509e7..ecb067e 100644
--- a/tools/runonphone/symbianutils/launcher.cpp
+++ b/tools/runonphone/symbianutils/launcher.cpp
@@ -365,8 +365,22 @@ void Launcher::handleResult(const TrkResult &result)
     QByteArray prefix = "READ BUF:                                       ";
     QByteArray str = result.toString().toUtf8();
     if (result.isDebugOutput) { // handle application output
-        logMessage("APPLICATION OUTPUT: " + result.data);
-        emit applicationOutputReceived(result.data);
+        QString msg;
+        if (result.multiplex == MuxTextTrace) {
+            if (result.data.length() > 8) {
+            quint64 timestamp = extractInt64(result.data) & 0x0FFFFFFFFFFFFFFFULL;
+            quint64 secs = timestamp / 1000000000;
+            quint64 ns = timestamp % 1000000000;
+            msg = QString("[%1.%2] %3").arg(secs).arg(ns).arg(QString(result.data.mid(8)));
+            logMessage("TEXT TRACE: " + msg);
+            }
+        } else {
+            logMessage("APPLICATION OUTPUT: " + result.data);
+            msg = result.data;
+        }
+        msg.replace("\r\n", "\n");
+        if(!msg.endsWith('\n')) msg.append('\n');
+        emit applicationOutputReceived(msg);
         return;
     }
     switch (result.code) {
diff --git a/tools/runonphone/symbianutils/trkutils.cpp b/tools/runonphone/symbianutils/trkutils.cpp
index 9b43c96..60e391e 100644
--- a/tools/runonphone/symbianutils/trkutils.cpp
+++ b/tools/runonphone/symbianutils/trkutils.cpp
@@ -276,14 +276,13 @@ QByteArray frameMessage(byte command, byte token, const QByteArray &data, bool s
 
 /* returns 0 if array doesn't represent a result,
 otherwise returns the length of the result data */
-ushort isValidTrkResult(const QByteArray &buffer, bool serialFrame)
+ushort isValidTrkResult(const QByteArray &buffer, bool serialFrame, ushort& mux)
 {
     if (serialFrame) {
         // Serial protocol with length info
         if (buffer.length() < 4)
             return 0;
-        if (buffer.at(0) != 0x01 || byte(buffer.at(1)) != 0x90)
-            return 0;
+        mux = extractShort(buffer.data());
         const ushort len = extractShort(buffer.data() + 2);
         return (buffer.size() >= len + 4) ? len : ushort(0);
     }
@@ -292,6 +291,7 @@ ushort isValidTrkResult(const QByteArray &buffer, bool serialFrame)
     const int firstDelimiterPos = buffer.indexOf(delimiter);
     // Regular message delimited by 0x7e..0x7e
     if (firstDelimiterPos == 0) {
+        mux = MuxTrk;
         const int endPos = buffer.indexOf(delimiter, firstDelimiterPos + 1);
         return endPos != -1 ? endPos + 1 - firstDelimiterPos : 0;
     }
@@ -304,7 +304,7 @@ bool extractResult(QByteArray *buffer, bool serialFrame, TrkResult *result, QByt
     result->clear();
     if(rawData)
         rawData->clear();
-    const ushort len = isValidTrkResult(*buffer, serialFrame);
+    const ushort len = isValidTrkResult(*buffer, serialFrame, result->multiplex);
     if (!len)
         return false;
     // handle receiving application output, which is not a regular command
@@ -312,7 +312,6 @@ bool extractResult(QByteArray *buffer, bool serialFrame, TrkResult *result, QByt
     if (buffer->at(delimiterPos) != 0x7e) {
         result->isDebugOutput = true;
         result->data = buffer->mid(delimiterPos, len);
-        result->data.replace("\r\n", "\n");
         *buffer->remove(0, delimiterPos + len);
         return true;
     }
@@ -353,6 +352,19 @@ SYMBIANUTILS_EXPORT uint extractInt(const char *data)
     return res;
 }
 
+SYMBIANUTILS_EXPORT quint64 extractInt64(const char *data)
+{
+    quint64 res = byte(data[0]);
+    res <<= 8; res += byte(data[1]);
+    res <<= 8; res += byte(data[2]);
+    res <<= 8; res += byte(data[3]);
+    res <<= 8; res += byte(data[4]);
+    res <<= 8; res += byte(data[5]);
+    res <<= 8; res += byte(data[6]);
+    res <<= 8; res += byte(data[7]);
+    return res;
+}
+
 SYMBIANUTILS_EXPORT QString quoteUnprintableLatin1(const QByteArray &ba)
 {
     QString res;
diff --git a/tools/runonphone/symbianutils/trkutils.h b/tools/runonphone/symbianutils/trkutils.h
index 553fc7d..e571028 100644
--- a/tools/runonphone/symbianutils/trkutils.h
+++ b/tools/runonphone/symbianutils/trkutils.h
@@ -135,9 +135,16 @@ enum Command {
     TrkDSPositionFile = 0xd4
 };
 
+enum SerialMultiplexor {
+    MuxRaw = 0,
+    MuxTextTrace = 0x0102,
+    MuxTrk = 0x0190
+};
+
 inline byte extractByte(const char *data) { return *data; }
 SYMBIANUTILS_EXPORT ushort extractShort(const char *data);
 SYMBIANUTILS_EXPORT uint extractInt(const char *data);
+SYMBIANUTILS_EXPORT quint64 extractInt64(const char *data);
 
 SYMBIANUTILS_EXPORT QString quoteUnprintableLatin1(const QByteArray &ba);
 
@@ -217,6 +224,7 @@ struct SYMBIANUTILS_EXPORT TrkResult
     int errorCode() const;
     QString errorString() const;
 
+    ushort multiplex;
     byte code;
     byte token;
     QByteArray data;
-- 
cgit v0.12


From 814f7d3d607edacca091273302297b6b2674424f Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Tue, 11 May 2010 12:49:32 +0200
Subject: Fix compiler warning in QT_REQUIRE_VERSION

 warning: format not a string literal and no format arguments

Task-number: QTBUG-8967
Reviewed-by: Gabriel
---
 src/gui/dialogs/qmessagebox.h              | 2 +-
 tests/auto/qmessagebox/tst_qmessagebox.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/dialogs/qmessagebox.h b/src/gui/dialogs/qmessagebox.h
index bc6170d..f1ff6cc 100644
--- a/src/gui/dialogs/qmessagebox.h
+++ b/src/gui/dialogs/qmessagebox.h
@@ -354,7 +354,7 @@ if (!qApp){ \
 QString s = QApplication::tr("Executable '%1' requires Qt "\
  "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\
 str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\
-"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal(s.toLatin1().data()); }}
+"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal("%s", s.toLatin1().data()); }}
 
 #endif // QT_NO_MESSAGEBOX
 
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp
index 2de1c52..d4ca064 100644
--- a/tests/auto/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp
@@ -140,6 +140,8 @@ private:
 
 tst_QMessageBox::tst_QMessageBox() : keyToSend(-1)
 {
+    int argc = qApp->argc();
+    QT_REQUIRE_VERSION(argc, qApp->argv(), "4.6.2")
 }
 
 int tst_QMessageBox::exec(QMessageBox *msgBox, int key)
-- 
cgit v0.12


From 949f49c9ea4dadfc6e7f3bf7d822830b7ef8a8e6 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Tue, 11 May 2010 15:30:12 +0200
Subject: Doc: Fixed tables and images for the new docs Added page.png to
 images dir. Fixed tables "generic"

---
 doc/src/getting-started/demos.qdoc    |   7 +++---
 doc/src/template/images/page.png      | Bin 0 -> 3102 bytes
 doc/src/template/scripts/functions.js |  14 +++++++++---
 doc/src/template/style/style.css      |  39 +++++++++++++++++++++-----------
 tools/qdoc3/htmlgenerator.cpp         |  41 ++++++++++++++++++----------------
 5 files changed, 62 insertions(+), 39 deletions(-)
 create mode 100644 doc/src/template/images/page.png

diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 6974634..f8c70fe 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -53,15 +53,14 @@
     \l{Qt Examples} and are used to highlight certain features of
     Qt.
 
-    \table 50%
+    \table 
     \header
     \o {2,1} Getting an Overview
     \row
     \o \inlineimage qtdemo-small.png
-    \o
-    If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
+    \o If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
     widgets in action.
-
+	
     The \l{Qt Widget Gallery} also provides overviews of selected Qt
     widgets in each of the styles used on various supported platforms.
     \endtable
diff --git a/doc/src/template/images/page.png b/doc/src/template/images/page.png
new file mode 100644
index 0000000..1db151b
Binary files /dev/null and b/doc/src/template/images/page.png differ
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 2362bc4..09b7de3 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -50,7 +50,6 @@ function processNokiaData(response){
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
 			lookupCount++;
 			//$('.live001').css('display','block');
-			$('#ul001 .defaultLink').css('display','none');
 
 			
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -58,13 +57,14 @@ function processNokiaData(response){
 				full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
 					
 				$('#ul001').append(full_li_element);
+			$('#ul001 .defaultLink').css('display','none');
+
 		   		}
 			}
 	 
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
 			articleCount++;
 	 		//$('.live002').css('display','block');
-			$('#ul002 .defaultLink').css('display','none');
 
 				 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -72,12 +72,13 @@ function processNokiaData(response){
 				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
 					
 				$('#ul002').append(full_li_element);
+			$('#ul002 .defaultLink').css('display','none');
+
 	   		}
 		}
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
 			exampleCount++;
 	 		//$('.live003').css('display','block');
-			$('#ul003 .defaultLink').css('display','none');
 
 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -85,6 +86,8 @@ function processNokiaData(response){
 				full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
 					
 				$('#ul003').append(full_li_element);
+			$('#ul003 .defaultLink').css('display','none');
+
 	   		}
 		} 
 	}	
@@ -122,6 +125,11 @@ function CheckEmptyAndLoadList()
 	$(document).ready(function () {
 	var pageTitle = $('title').html();
 		$('#feedform').append('');
+          var currentString = $('#pageType').val() ;
+		  if(currentString.length < 1){
+			$('.defaultLink').css('display','block');
+      	   		CheckEmptyAndLoadList();			
+		  }
 
         $('#pageType').keyup(function () {
           var searchString = $('#pageType').val() ;
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 2e01af6..d87b11f 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -302,6 +302,9 @@
     .sidebar .box .list
     {
         display: block;
+		max-height:200px;
+		overflow-y:auto;
+		overflow-x:none;
     }
     .sidebar .box .live
     {
@@ -315,7 +318,7 @@
     }
     .sidebar .box ul
     {
-	padding:10px 0 0 10px;
+	padding:10px;
     }
     .sidebar .box ul li
     {
@@ -488,8 +491,13 @@
     .wrap .content p
     {
         line-height: 20px;
-        padding: 5px 5px 5px 5px;
+        padding: 5px;
     }
+    .wrap .content table p
+    {
+        line-height: 20px;
+        padding: 0px;
+    }	
     .wrap .content ul
     {
         padding-left: 25px;
@@ -743,20 +751,21 @@
     thead
     {
         margin-top: 5px;
+		font:600 12px/1.2 Arial;
     }
     th
     {
         padding: 5px 15px 5px 15px;
         background-color: #E1E1E1;
-        border-bottom: 1px solid #E6E6E6;
+      /*  border-bottom: 1px solid #E6E6E6;*/
         border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;
+      /*  border-right: 1px solid #E6E6E6;*/
     }
     td
     {
         padding: 3px 15px 3px 20px;
-        border-left: 1px solid #E6E6E6;
-        border-right: 1px solid #E6E6E6;
+  /*      border-left: 1px solid #E6E6E6;
+        border-right: 1px solid #E6E6E6;*/
     }
     tr.odd td:hover,  tr.even td:hover
     {
@@ -780,15 +789,11 @@
         background-color: #ffffff;
         color: #66666E;
     }
-    table tr.odd:hover
-    {
-        background-color: #E6E6E6;
-    }
-    table tr.even:hover
+    table tr.odd td:hover, table tr.even td:hover
     {
         background-color: #E6E6E6;
     }
-		
+    		
     span.comment
     {
         color: #8B0000;
@@ -892,12 +897,20 @@
     }
 
 	.generic{
-		max-width:100%;
+		max-width:75%;
 	}
 	.generic td{
 		padding:0;
 	}
 	
+	.generic .odd .alphaChar{
+        background-color: #F6F6F6;
+	}
+	
+	.generic .even .alphaChar{
+        background-color: #FFFFFF;
+	}
+
 	.alignedsummary{}
 	.propsummary{}
 	.memItemLeft{}
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 638ae94..5e33463 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1149,7 +1149,10 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                     out() << " colspan=\"" << spans.at(0) << "\"";
                 if (spans.at(1) != "1")
                     out() << " rowspan=\"" << spans.at(1) << "\"";
+            if (inTableHeader)
                 out() << ">";
+            else
+                out() << ">
      "; 
             }
             if (matchAhead(atom, Atom::ParaLeft))
                 skipAhead = 1;
@@ -1159,7 +1162,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         if (inTableHeader)
             out() << "";
         else
-            out() << "";
+            out() << "
      ";
         if (matchAhead(atom, Atom::ParaLeft))
             skipAhead = 1;
         break;
@@ -2276,22 +2279,22 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
             out() << "
      ";
         else
             out() << "";
-        out() << "";
+        out() << "
      ";
 
         if (!(node->type() == Node::Fake)) {
             Text brief = node->doc().trimmedBriefText(name);
             if (!brief.isEmpty()) {
-                out() << "";
+                out() << "
      ";
             }
         }
         else {
-            out() << "";
+            out() << "
      ";
         }
         out() << "\n";
     }
@@ -2473,7 +2476,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         for (i = 0; i < NumColumns; i++) {
             if (currentOffset[i] >= firstOffset[i + 1]) {
                 // this column is finished
-                out() << "\n";
+                out() << "\n"; // check why?
             }
             else {
                 while ((currentParagraphNo[i] < NumParagraphs) &&
@@ -2488,7 +2491,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     currentParagraphNo[i] = NumParagraphs - 1;
                 }
 #endif
-                out() << "\n";
 
-                out() << "\n";
+                out() << "
      \n";
 
                 currentOffset[i]++;
                 currentOffsetInParagraph[i]++;
@@ -4438,7 +4441,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
 				else
 					out() << "";
 				
-				out() << "";
+                out() << "
      ";
                 if (qpgn->isDefault()) {
                     out() << "
      ";
+        //out() << "
      ";
         out() << "";
         generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
         out() << "
      , not .

---
 tools/qdoc3/htmlgenerator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 6560b68..67aa6c6 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2275,9 +2275,9 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
             out() << "
      ";
+        out() << "";
         generateFullName(node, relative, marker);
-        out() << "";
+        out() << "
      ";
+        out() << "
      ";
         generateFullName(node, relative, marker);
-        out() << "
      		";
+                out() << "
      ";
                 generateText(brief, node, marker);
-                out() << "
      		";
+            out() << "
      ";
             out() << protectEnc(node->doc().briefText().toString());
-            out() << "
      \n\n";
+                out() << "
      ";
                 if (currentOffsetInParagraph[i] == 0) {
                     // start a new paragraph
                     if (includeAlphabet) {
@@ -2499,9 +2502,9 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                           << paragraphName[currentParagraphNo[i]]
                           << "";
                 }
-                out() << "\n";
+                out() << "
      		";
+                out() << "
      ";
                 if ((currentParagraphNo[i] < NumParagraphs) &&
                     !paragraphName[currentParagraphNo[i]].isEmpty()) {
                     NodeMap::Iterator it;
@@ -2527,7 +2530,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                         out() << ")";
                     }
                 }
-                out() << "
      ";
+				out() << "
      ";
                 //out() << "
      "; // old
                 out() << "";
                 if (!qpn->isWritable())
@@ -4446,14 +4449,14 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
                 if (qpgn->isDefault())
                     out() << "default";
                 generateQmlItem(qpn, relative, marker, false);
-                out() << "
      "
                           << "
      "
                           << "
      "
                           << "
      "
                           << ""
-                          << "";
+                          << "";
                 }
             }
             ++p;
@@ -4470,11 +4473,11 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
 			out() << "";
 		else
 			out() << "";
-        out() << "";
+        out() << "
      ";
         out() << "
      default
      default
      ";
+        out() << "
      ";
         out() << "";
         generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
         //generateQmlItem(qsn,relative,marker,false);
-        out() << "
      ";
         out() << "
      ";
     }
@@ -4487,10 +4490,10 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
 			out() << "
      ";
+        out() << "
      ";
         out() << "";
         generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
-        out() << "
      ";
         out() << "
      ";
     }
-- 
cgit v0.12


From a1cda97c4002195f98c18c460d1f30682bb5a82e Mon Sep 17 00:00:00 2001
From: Jason Hollingsworth 
Date: Tue, 11 May 2010 16:26:42 +0200
Subject: Added QDateTime::msecsTo()

This adds a QDateTime::msecsTo() function which is similar to
QDateTime::secsTo().
This refers to QTBUG-8790 and task 147685. According to the task this
functionality should have been added in version 4.5.0 but it never was.

Task-number: 147685
Task-number: QTBUG-8790

Merge-request: 501
Reviewed-by: Benjamin Poulain 
Reviewed-by: Andreas Kling 
---
 src/corelib/tools/qdatetime.cpp        | 44 +++++++++++++++++++++++++++-------
 src/corelib/tools/qdatetime.h          |  1 +
 tests/auto/qdatetime/tst_qdatetime.cpp | 26 ++++++++++++++++++++
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 9afcd80..9f5d8c6 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1705,7 +1705,7 @@ int QTime::secsTo(const QTime &t) const
     Note that the time will wrap if it passes midnight. See addSecs()
     for an example.
 
-    \sa addSecs(), msecsTo()
+    \sa addSecs(), msecsTo(), QDateTime::addMSecs()
 */
 
 QTime QTime::addMSecs(int ms) const
@@ -1734,7 +1734,7 @@ QTime QTime::addMSecs(int ms) const
     seconds in a day, the result is always between -86400000 and
     86400000 ms.
 
-    \sa secsTo(), addMSecs()
+    \sa secsTo(), addMSecs(), QDateTime::msecsTo()
 */
 
 int QTime::msecsTo(const QTime &t) const
@@ -2042,10 +2042,11 @@ int QTime::elapsed() const
     later.
 
     You can increment (or decrement) a datetime by a given number of
-    seconds using addSecs(), or days using addDays(). Similarly you can
-    use addMonths() and addYears(). The daysTo() function returns the
-    number of days between two datetimes, and secsTo() returns the
-    number of seconds between two datetimes.
+    milliseconds using addMSecs(), seconds using addSecs(), or days
+    using addDays(). Similarly you can use addMonths() and addYears().
+    The daysTo() function returns the number of days between two datetimes,
+    secsTo() returns the number of seconds between two datetimes, and
+    msecsTo() returns the number of milliseconds between two datetimes.
 
     QDateTime can store datetimes as \l{Qt::LocalTime}{local time} or
     as \l{Qt::UTC}{UTC}. QDateTime::currentDateTime() returns a
@@ -2719,7 +2720,7 @@ QDateTime QDateTime::addSecs(int s) const
     later than the datetime of this object (or earlier if \a msecs is
     negative).
 
-    \sa addSecs(), secsTo(), addDays(), addMonths(), addYears()
+    \sa addSecs(), msecsTo(), addDays(), addMonths(), addYears()
 */
 QDateTime QDateTime::addMSecs(qint64 msecs) const
 {
@@ -2731,7 +2732,7 @@ QDateTime QDateTime::addMSecs(qint64 msecs) const
     datetime. If the \a other datetime is earlier than this datetime,
     the value returned is negative.
 
-    \sa addDays(), secsTo()
+    \sa addDays(), secsTo(), msecsTo()
 */
 
 int QDateTime::daysTo(const QDateTime &other) const
@@ -2766,6 +2767,33 @@ int QDateTime::secsTo(const QDateTime &other) const
 }
 
 /*!
+    Returns the number of milliseconds from this datetime to the \a other
+    datetime. If the \a other datetime is earlier than this datetime,
+    the value returned is negative.
+
+    Before performing the comparison, the two datetimes are converted
+    to Qt::UTC to ensure that the result is correct if one of the two
+    datetimes has daylight saving time (DST) and the other doesn't.
+
+    \sa addMSecs(), daysTo(), QTime::msecsTo()
+*/
+
+qint64 QDateTime::msecsTo(const QDateTime &other) const
+{
+    QDate selfDate;
+    QDate otherDate;
+    QTime selfTime;
+    QTime otherTime;
+
+    d->getUTC(selfDate, selfTime);
+    other.d->getUTC(otherDate, otherTime);
+
+    return (static_cast(selfDate.daysTo(otherDate)) * static_cast(MSECS_PER_DAY))
+           + static_cast(selfTime.msecsTo(otherTime));
+}
+
+
+/*!
     \fn QDateTime QDateTime::toTimeSpec(Qt::TimeSpec specification) const
 
     Returns a copy of this datetime configured to use the given time
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index f445f1c..2466aeb 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -251,6 +251,7 @@ public:
     inline QDateTime toUTC() const { return toTimeSpec(Qt::UTC); }
     int daysTo(const QDateTime &) const;
     int secsTo(const QDateTime &) const;
+    qint64 msecsTo(const QDateTime &) const;
 
     bool operator==(const QDateTime &other) const;
     inline bool operator!=(const QDateTime &other) const { return !(*this == other); }
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index 6aca996..47c54a5 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -106,6 +106,8 @@ private slots:
     void daysTo();
     void secsTo_data();
     void secsTo();
+    void msecsTo_data();
+    void msecsTo();
     void operator_eqeq();
     void currentDateTime();
     void currentDateTimeUtc();
@@ -910,6 +912,30 @@ void tst_QDateTime::secsTo()
     QVERIFY((dt >= result) == (0 >= nsecs));
 }
 
+void tst_QDateTime::msecsTo_data()
+{
+    addMSecs_data();
+}
+
+void tst_QDateTime::msecsTo()
+{
+    QFETCH(QDateTime, dt);
+    QFETCH(int, nsecs);
+    QFETCH(QDateTime, result);
+
+#ifdef Q_OS_IRIX
+    QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort);
+#endif
+    QCOMPARE(dt.msecsTo(result), qint64(nsecs) * 1000);
+    QCOMPARE(result.msecsTo(dt), -qint64(nsecs) * 1000);
+    QVERIFY((dt == result) == (0 == (qint64(nsecs) * 1000)));
+    QVERIFY((dt != result) == (0 != (qint64(nsecs) * 1000)));
+    QVERIFY((dt < result) == (0 < (qint64(nsecs) * 1000)));
+    QVERIFY((dt <= result) == (0 <= (qint64(nsecs) * 1000)));
+    QVERIFY((dt > result) == (0 > (qint64(nsecs) * 1000)));
+    QVERIFY((dt >= result) == (0 >= (qint64(nsecs) * 1000)));
+}
+
 void tst_QDateTime::currentDateTime()
 {
 #if defined(Q_OS_WINCE)
-- 
cgit v0.12


From b4b4cb3248b987dd6c15908f0b46e131dc2b7cde Mon Sep 17 00:00:00 2001
From: Shane Kearns 
Date: Tue, 11 May 2010 16:54:41 +0100
Subject: Update DEF files for Qt 4.7

Task-Number: QTBUG-10251
Reviewed-by: Trust Me
---
 src/s60installs/bwins/QtCoreu.def        |  2 +
 src/s60installs/bwins/QtDeclarativeu.def | 71 ++++++++++++++++++++------
 src/s60installs/bwins/QtGuiu.def         |  4 +-
 src/s60installs/eabi/QtCoreu.def         |  2 +
 src/s60installs/eabi/QtDeclarativeu.def  | 88 +++++++++++++++++++++++---------
 src/s60installs/eabi/QtGuiu.def          |  3 +-
 6 files changed, 129 insertions(+), 41 deletions(-)

diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index e309e25..13b8157 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -4463,4 +4463,6 @@ EXPORTS
 	?parentChanged@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@1@ZA @ 4462 NONAME ; void (*QAbstractDeclarativeData::parentChanged)(class QAbstractDeclarativeData *, class QObject *, class QObject *)
 	?destroyed@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4463 NONAME ; void (*QAbstractDeclarativeData::destroyed)(class QAbstractDeclarativeData *, class QObject *)
 	?selectThread@QEventDispatcherSymbian@@AAEAAVQSelectThread@@XZ @ 4464 NONAME ; class QSelectThread & QEventDispatcherSymbian::selectThread(void)
+	?setRawData@QByteArray@@QAEAAV1@PBDI@Z @ 4465 NONAME ; class QByteArray & QByteArray::setRawData(char const *, unsigned int)
+	?setRawData@QString@@QAEAAV1@PBVQChar@@H@Z @ 4466 NONAME ; class QString & QString::setRawData(class QChar const *, int)
 
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 5f05f08..18372a4 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -581,7 +581,7 @@ EXPORTS
 	?advance@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@H@Z @ 580 NONAME ABSENT ; void QDeclarativeParticleMotionWander::advance(class QDeclarativeParticle &, int)
 	?alert@QDeclarativeWebView@@IAEXABVQString@@@Z @ 581 NONAME ABSENT ; void QDeclarativeWebView::alert(class QString const &)
 	?alternateBase@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 582 NONAME ; class QColor QDeclarativeSystemPalette::alternateBase(void) const
-	?anchors@QDeclarativeItem@@QAEPAVQDeclarativeAnchors@@XZ @ 583 NONAME ; class QDeclarativeAnchors * QDeclarativeItem::anchors(void)
+	?anchors@QDeclarativeItem@@QAEPAVQDeclarativeAnchors@@XZ @ 583 NONAME ABSENT ; class QDeclarativeAnchors * QDeclarativeItem::anchors(void)
 	?angle@QDeclarativeParticles@@QBEMXZ @ 584 NONAME ABSENT ; float QDeclarativeParticles::angle(void) const
 	?angleChanged@QDeclarativeParticles@@IAEXXZ @ 585 NONAME ABSENT ; void QDeclarativeParticles::angleChanged(void)
 	?angleDeviation@QDeclarativeParticles@@QBEMXZ @ 586 NONAME ABSENT ; float QDeclarativeParticles::angleDeviation(void) const
@@ -647,7 +647,7 @@ EXPORTS
 	?buildObject@QDeclarativeCompiler@@AAE_NPAVObject@QDeclarativeParser@@ABUBindingContext@1@@Z @ 646 NONAME ; bool QDeclarativeCompiler::buildObject(class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildProperty@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@ABUBindingContext@1@@Z @ 647 NONAME ; bool QDeclarativeCompiler::buildProperty(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildPropertyAssignment@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@ABUBindingContext@1@@Z @ 648 NONAME ; bool QDeclarativeCompiler::buildPropertyAssignment(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
-	?buildPropertyInNamespace@QDeclarativeCompiler@@AAE_NPAUImportedNamespace@QDeclarativeEnginePrivate@@PAVProperty@QDeclarativeParser@@PAVObject@5@ABUBindingContext@1@@Z @ 649 NONAME ; bool QDeclarativeCompiler::buildPropertyInNamespace(struct QDeclarativeEnginePrivate::ImportedNamespace *, class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
+	?buildPropertyInNamespace@QDeclarativeCompiler@@AAE_NPAUImportedNamespace@QDeclarativeEnginePrivate@@PAVProperty@QDeclarativeParser@@PAVObject@5@ABUBindingContext@1@@Z @ 649 NONAME ABSENT ; bool QDeclarativeCompiler::buildPropertyInNamespace(struct QDeclarativeEnginePrivate::ImportedNamespace *, class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildPropertyLiteralAssignment@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@PAVValue@3@ABUBindingContext@1@@Z @ 650 NONAME ; bool QDeclarativeCompiler::buildPropertyLiteralAssignment(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, class QDeclarativeParser::Value *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildPropertyObjectAssignment@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@PAVValue@3@ABUBindingContext@1@@Z @ 651 NONAME ; bool QDeclarativeCompiler::buildPropertyObjectAssignment(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, class QDeclarativeParser::Value *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildScript@QDeclarativeCompiler@@AAE_NPAVObject@QDeclarativeParser@@0@Z @ 652 NONAME ABSENT ; bool QDeclarativeCompiler::buildScript(class QDeclarativeParser::Object *, class QDeclarativeParser::Object *)
@@ -693,7 +693,7 @@ EXPORTS
 	?classBegin@QDeclarativeDateTimeFormatter@@UAEXXZ @ 692 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::classBegin(void)
 	?classBegin@QDeclarativeItem@@MAEXXZ @ 693 NONAME ; void QDeclarativeItem::classBegin(void)
 	?classBegin@QDeclarativeNumberFormatter@@UAEXXZ @ 694 NONAME ABSENT ; void QDeclarativeNumberFormatter::classBegin(void)
-	?classBegin@QDeclarativeParserStatus@@UAEXXZ @ 695 NONAME ; void QDeclarativeParserStatus::classBegin(void)
+	?classBegin@QDeclarativeParserStatus@@UAEXXZ @ 695 NONAME ABSENT ; void QDeclarativeParserStatus::classBegin(void)
 	?classBegin@QDeclarativeStateGroup@@UAEXXZ @ 696 NONAME ; void QDeclarativeStateGroup::classBegin(void)
 	?classBegin@QDeclarativeTimer@@MAEXXZ @ 697 NONAME ; void QDeclarativeTimer::classBegin(void)
 	?classBegin@QDeclarativeXmlListModel@@UAEXXZ @ 698 NONAME ; void QDeclarativeXmlListModel::classBegin(void)
@@ -754,7 +754,7 @@ EXPORTS
 	?componentComplete@QDeclarativeItem@@MAEXXZ @ 753 NONAME ; void QDeclarativeItem::componentComplete(void)
 	?componentComplete@QDeclarativeListView@@MAEXXZ @ 754 NONAME ; void QDeclarativeListView::componentComplete(void)
 	?componentComplete@QDeclarativeNumberFormatter@@UAEXXZ @ 755 NONAME ABSENT ; void QDeclarativeNumberFormatter::componentComplete(void)
-	?componentComplete@QDeclarativeParserStatus@@UAEXXZ @ 756 NONAME ; void QDeclarativeParserStatus::componentComplete(void)
+	?componentComplete@QDeclarativeParserStatus@@UAEXXZ @ 756 NONAME ABSENT ; void QDeclarativeParserStatus::componentComplete(void)
 	?componentComplete@QDeclarativeParticles@@MAEXXZ @ 757 NONAME ABSENT ; void QDeclarativeParticles::componentComplete(void)
 	?componentComplete@QDeclarativePath@@MAEXXZ @ 758 NONAME ; void QDeclarativePath::componentComplete(void)
 	?componentComplete@QDeclarativePathView@@MAEXXZ @ 759 NONAME ; void QDeclarativePathView::componentComplete(void)
@@ -1369,7 +1369,7 @@ EXPORTS
 	?indexOfSignal@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1368 NONAME ; int QMetaObjectBuilder::indexOfSignal(class QByteArray const &)
 	?indexOfSlot@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1369 NONAME ; int QMetaObjectBuilder::indexOfSlot(class QByteArray const &)
 	?init@QDeclarativeContextPrivate@@QAEXXZ @ 1370 NONAME ABSENT ; void QDeclarativeContextPrivate::init(void)
-	?init@QDeclarativePaintedItem@@AAEXXZ @ 1371 NONAME ; void QDeclarativePaintedItem::init(void)
+	?init@QDeclarativePaintedItem@@AAEXXZ @ 1371 NONAME ABSENT ; void QDeclarativePaintedItem::init(void)
 	?init@QDeclarativeWebView@@AAEXXZ @ 1372 NONAME ABSENT ; void QDeclarativeWebView::init(void)
 	?initialLayout@QDeclarativeWebView@@AAEXXZ @ 1373 NONAME ABSENT ; void QDeclarativeWebView::initialLayout(void)
 	?initialValue@QDeclarativeOpenMetaObject@@UAE?AVQVariant@@H@Z @ 1374 NONAME ; class QVariant QDeclarativeOpenMetaObject::initialValue(int)
@@ -2214,9 +2214,9 @@ EXPORTS
 	?resetVerticalCenter@QDeclarativeAnchors@@QAEXXZ @ 2213 NONAME ; void QDeclarativeAnchors::resetVerticalCenter(void)
 	?resetWidth@QDeclarativeItem@@QAEXXZ @ 2214 NONAME ; void QDeclarativeItem::resetWidth(void)
 	?resizeEvent@QDeclarativeView@@MAEXPAVQResizeEvent@@@Z @ 2215 NONAME ; void QDeclarativeView::resizeEvent(class QResizeEvent *)
-	?resizeMode@QDeclarativeLoader@@QBE?AW4ResizeMode@1@XZ @ 2216 NONAME ; enum QDeclarativeLoader::ResizeMode QDeclarativeLoader::resizeMode(void) const
+	?resizeMode@QDeclarativeLoader@@QBE?AW4ResizeMode@1@XZ @ 2216 NONAME ABSENT ; enum QDeclarativeLoader::ResizeMode QDeclarativeLoader::resizeMode(void) const
 	?resizeMode@QDeclarativeView@@QBE?AW4ResizeMode@1@XZ @ 2217 NONAME ; enum QDeclarativeView::ResizeMode QDeclarativeView::resizeMode(void) const
-	?resizeModeChanged@QDeclarativeLoader@@IAEXXZ @ 2218 NONAME ; void QDeclarativeLoader::resizeModeChanged(void)
+	?resizeModeChanged@QDeclarativeLoader@@IAEXXZ @ 2218 NONAME ABSENT ; void QDeclarativeLoader::resizeModeChanged(void)
 	?resolvedUrl@QDeclarativeContext@@QAE?AVQUrl@@ABV2@@Z @ 2219 NONAME ; class QUrl QDeclarativeContext::resolvedUrl(class QUrl const &)
 	?resources@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 2220 NONAME ABSENT ; struct QDeclarativeListProperty QDeclarativeItem::resources(void)
 	?restart@QDeclarativeTimer@@QAEXXZ @ 2221 NONAME ; void QDeclarativeTimer::restart(void)
@@ -2542,7 +2542,7 @@ EXPORTS
 	?setRepeating@QDeclarativeTimer@@QAEX_N@Z @ 2541 NONAME ; void QDeclarativeTimer::setRepeating(bool)
 	?setReset@QDeclarativeAnchorChanges@@QAEXABVQString@@@Z @ 2542 NONAME ABSENT ; void QDeclarativeAnchorChanges::setReset(class QString const &)
 	?setResettable@QMetaPropertyBuilder@@QAEX_N@Z @ 2543 NONAME ; void QMetaPropertyBuilder::setResettable(bool)
-	?setResizeMode@QDeclarativeLoader@@QAEXW4ResizeMode@1@@Z @ 2544 NONAME ; void QDeclarativeLoader::setResizeMode(enum QDeclarativeLoader::ResizeMode)
+	?setResizeMode@QDeclarativeLoader@@QAEXW4ResizeMode@1@@Z @ 2544 NONAME ABSENT ; void QDeclarativeLoader::setResizeMode(enum QDeclarativeLoader::ResizeMode)
 	?setResizeMode@QDeclarativeView@@QAEXW4ResizeMode@1@@Z @ 2545 NONAME ; void QDeclarativeView::setResizeMode(enum QDeclarativeView::ResizeMode)
 	?setRestoreEntryValues@QDeclarativePropertyChanges@@QAEX_N@Z @ 2546 NONAME ; void QDeclarativePropertyChanges::setRestoreEntryValues(bool)
 	?setReturnType@QMetaMethodBuilder@@QAEXABVQByteArray@@@Z @ 2547 NONAME ; void QMetaMethodBuilder::setReturnType(class QByteArray const &)
@@ -2595,7 +2595,7 @@ EXPORTS
 	?setStartY@QDeclarativePath@@QAEXM@Z @ 2594 NONAME ; void QDeclarativePath::setStartY(float)
 	?setState@QDeclarativeDebugQuery@@AAEXW4State@1@@Z @ 2595 NONAME ; void QDeclarativeDebugQuery::setState(enum QDeclarativeDebugQuery::State)
 	?setState@QDeclarativeDebugWatch@@AAEXW4State@1@@Z @ 2596 NONAME ; void QDeclarativeDebugWatch::setState(enum QDeclarativeDebugWatch::State)
-	?setState@QDeclarativeItem@@QAEXABVQString@@@Z @ 2597 NONAME ; void QDeclarativeItem::setState(class QString const &)
+	?setState@QDeclarativeItem@@QAEXABVQString@@@Z @ 2597 NONAME ABSENT ; void QDeclarativeItem::setState(class QString const &)
 	?setState@QDeclarativeStateGroup@@QAEXABVQString@@@Z @ 2598 NONAME ; void QDeclarativeStateGroup::setState(class QString const &)
 	?setStateGroup@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@@Z @ 2599 NONAME ; void QDeclarativeState::setStateGroup(class QDeclarativeStateGroup *)
 	?setStaticMetacallFunction@QMetaObjectBuilder@@QAEXP6AHW4Call@QMetaObject@@HPAPAX@Z@Z @ 2600 NONAME ; void QMetaObjectBuilder::setStaticMetacallFunction(int (*)(enum QMetaObject::Call, int, void * *))
@@ -2714,7 +2714,7 @@ EXPORTS
 	?startY@QDeclarativePath@@QBEMXZ @ 2713 NONAME ; float QDeclarativePath::startY(void) const
 	?state@QDeclarativeDebugQuery@@QBE?AW4State@1@XZ @ 2714 NONAME ; enum QDeclarativeDebugQuery::State QDeclarativeDebugQuery::state(void) const
 	?state@QDeclarativeDebugWatch@@QBE?AW4State@1@XZ @ 2715 NONAME ; enum QDeclarativeDebugWatch::State QDeclarativeDebugWatch::state(void) const
-	?state@QDeclarativeItem@@QBE?AVQString@@XZ @ 2716 NONAME ; class QString QDeclarativeItem::state(void) const
+	?state@QDeclarativeItem@@QBE?AVQString@@XZ @ 2716 NONAME ABSENT ; class QString QDeclarativeItem::state(void) const
 	?state@QDeclarativeStateGroup@@QBE?AVQString@@XZ @ 2717 NONAME ; class QString QDeclarativeStateGroup::state(void) const
 	?stateChanged@QDeclarativeDebugQuery@@IAEXW4State@1@@Z @ 2718 NONAME ; void QDeclarativeDebugQuery::stateChanged(enum QDeclarativeDebugQuery::State)
 	?stateChanged@QDeclarativeDebugWatch@@IAEXW4State@1@@Z @ 2719 NONAME ; void QDeclarativeDebugWatch::stateChanged(enum QDeclarativeDebugWatch::State)
@@ -3576,7 +3576,7 @@ EXPORTS
 	?d_func@QDeclarativeSmoothedAnimation@@ABEPBVQDeclarativeSmoothedAnimationPrivate@@XZ @ 3575 NONAME ; class QDeclarativeSmoothedAnimationPrivate const * QDeclarativeSmoothedAnimation::d_func(void) const
 	?d_func@QDeclarativeTranslate@@AAEPAVQDeclarativeTranslatePrivate@@XZ @ 3576 NONAME ; class QDeclarativeTranslatePrivate * QDeclarativeTranslate::d_func(void)
 	?d_func@QDeclarativeTranslate@@ABEPBVQDeclarativeTranslatePrivate@@XZ @ 3577 NONAME ; class QDeclarativeTranslatePrivate const * QDeclarativeTranslate::d_func(void) const
-	?data@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3578 NONAME ; class QDeclarativeListProperty QDeclarativeItem::data(void)
+	?data@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3578 NONAME ABSENT ; class QDeclarativeListProperty QDeclarativeItem::data(void)
 	?dataCleared@QDeclarativeXmlListModel@@AAEXXZ @ 3579 NONAME ; void QDeclarativeXmlListModel::dataCleared(void)
 	?data_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 3580 NONAME ; void QDeclarativeItemPrivate::data_append(class QDeclarativeListProperty *, class QObject *)
 	?delegateChanged@QDeclarativeGridView@@IAEXXZ @ 3581 NONAME ; void QDeclarativeGridView::delegateChanged(void)
@@ -3707,7 +3707,7 @@ EXPORTS
 	?request@QDeclarativePixmapCache@@SAPAVQDeclarativePixmapReply@@PAVQDeclarativeEngine@@ABVQUrl@@HH@Z @ 3706 NONAME ; class QDeclarativePixmapReply * QDeclarativePixmapCache::request(class QDeclarativeEngine *, class QUrl const &, int, int)
 	?resetHeight@QDeclarativeItemPrivate@@UAEXXZ @ 3707 NONAME ; void QDeclarativeItemPrivate::resetHeight(void)
 	?resetWidth@QDeclarativeItemPrivate@@UAEXXZ @ 3708 NONAME ; void QDeclarativeItemPrivate::resetWidth(void)
-	?resources@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3709 NONAME ; class QDeclarativeListProperty QDeclarativeItem::resources(void)
+	?resources@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3709 NONAME ABSENT ; class QDeclarativeListProperty QDeclarativeItem::resources(void)
 	?resources_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 3710 NONAME ; void QDeclarativeItemPrivate::resources_append(class QDeclarativeListProperty *, class QObject *)
 	?resources_at@QDeclarativeItemPrivate@@SAPAVQObject@@PAV?$QDeclarativeListProperty@VQObject@@@@H@Z @ 3711 NONAME ; class QObject * QDeclarativeItemPrivate::resources_at(class QDeclarativeListProperty *, int)
 	?resources_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 3712 NONAME ; int QDeclarativeItemPrivate::resources_count(class QDeclarativeListProperty *)
@@ -3771,8 +3771,8 @@ EXPORTS
 	?start@QDeclarativeItemPrivate@@SAXAAVQTime@@@Z @ 3770 NONAME ; void QDeclarativeItemPrivate::start(class QTime &)
 	?startXChanged@QDeclarativePath@@IAEXXZ @ 3771 NONAME ; void QDeclarativePath::startXChanged(void)
 	?startYChanged@QDeclarativePath@@IAEXXZ @ 3772 NONAME ; void QDeclarativePath::startYChanged(void)
-	?states@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3773 NONAME ; class QDeclarativeListProperty QDeclarativeItem::states(void)
-	?states@QDeclarativeItemPrivate@@QAEPAVQDeclarativeStateGroup@@XZ @ 3774 NONAME ; class QDeclarativeStateGroup * QDeclarativeItemPrivate::states(void)
+	?states@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3773 NONAME ABSENT ; class QDeclarativeListProperty QDeclarativeItem::states(void)
+	?states@QDeclarativeItemPrivate@@QAEPAVQDeclarativeStateGroup@@XZ @ 3774 NONAME ABSENT ; class QDeclarativeStateGroup * QDeclarativeItemPrivate::states(void)
 	?statesProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3775 NONAME ; class QDeclarativeListProperty QDeclarativeStateGroup::statesProperty(void)
 	?stops@QDeclarativeGradient@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeGradientStop@@@@XZ @ 3776 NONAME ; class QDeclarativeListProperty QDeclarativeGradient::stops(void)
 	?subFocusItemChange@QDeclarativeItemPrivate@@UAEXXZ @ 3777 NONAME ; void QDeclarativeItemPrivate::subFocusItemChange(void)
@@ -3799,7 +3799,7 @@ EXPORTS
 	?transform_clear@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@@Z @ 3798 NONAME ; void QDeclarativeItemPrivate::transform_clear(class QDeclarativeListProperty *)
 	?transform_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@@Z @ 3799 NONAME ; int QDeclarativeItemPrivate::transform_count(class QDeclarativeListProperty *)
 	?transition@QDeclarativeSmoothedAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@QDeclarativeAbstractAnimation@@@Z @ 3800 NONAME ; void QDeclarativeSmoothedAnimation::transition(class QList &, class QList &, enum QDeclarativeAbstractAnimation::TransitionDirection)
-	?transitions@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3801 NONAME ; class QDeclarativeListProperty QDeclarativeItem::transitions(void)
+	?transitions@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3801 NONAME ABSENT ; class QDeclarativeListProperty QDeclarativeItem::transitions(void)
 	?transitionsProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3802 NONAME ; class QDeclarativeListProperty QDeclarativeStateGroup::transitionsProperty(void)
 	?triggeredOnStartChanged@QDeclarativeTimer@@IAEXXZ @ 3803 NONAME ; void QDeclarativeTimer::triggeredOnStartChanged(void)
 	?type@Variant@QDeclarativeParser@@QBE?AW4Type@12@XZ @ 3804 NONAME ; enum QDeclarativeParser::Variant::Type QDeclarativeParser::Variant::type(void) const
@@ -3920,7 +3920,7 @@ EXPORTS
 	?execute@QDeclarativeParentChange@@UAEXW4Reason@QDeclarativeActionEvent@@@Z @ 3919 NONAME ; void QDeclarativeParentChange::execute(enum QDeclarativeActionEvent::Reason)
 	?resetSourceComponent@QDeclarativeLoader@@QAEXXZ @ 3920 NONAME ; void QDeclarativeLoader::resetSourceComponent(void)
 	?rootIndex@QDeclarativeVisualDataModel@@QBE?AVQVariant@@XZ @ 3921 NONAME ; class QVariant QDeclarativeVisualDataModel::rootIndex(void) const
-	?createObject@QDeclarativeComponent@@IAE?AVQScriptValue@@XZ @ 3922 NONAME ; class QScriptValue QDeclarativeComponent::createObject(void)
+	?createObject@QDeclarativeComponent@@IAE?AVQScriptValue@@XZ @ 3922 NONAME ABSENT ; class QScriptValue QDeclarativeComponent::createObject(void)
 	?execute@QDeclarativeStateChangeScript@@UAEXW4Reason@QDeclarativeActionEvent@@@Z @ 3923 NONAME ; void QDeclarativeStateChangeScript::execute(enum QDeclarativeActionEvent::Reason)
 	?active@QDeclarativeDrag@@QBE_NXZ @ 3924 NONAME ; bool QDeclarativeDrag::active(void) const
 	?retransformBack@QDeclarativeFlipable@@AAEXXZ @ 3925 NONAME ; void QDeclarativeFlipable::retransformBack(void)
@@ -3955,4 +3955,43 @@ EXPORTS
 	?parentModelIndex@QDeclarativeVisualDataModel@@QBE?AVQVariant@@XZ @ 3954 NONAME ; class QVariant QDeclarativeVisualDataModel::parentModelIndex(void) const
 	?usedAnchors@QDeclarativeAnchors@@QBE?AV?$QFlags@W4Anchor@QDeclarativeAnchors@@@@XZ @ 3955 NONAME ; class QFlags QDeclarativeAnchors::usedAnchors(void) const
 	?eventFilter@QDeclarativeView@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 3956 NONAME ; bool QDeclarativeView::eventFilter(class QObject *, class QEvent *)
+	??0QDeclarativeInfo@@AAE@PAVQDeclarativeInfoPrivate@@@Z @ 3957 NONAME ; QDeclarativeInfo::QDeclarativeInfo(class QDeclarativeInfoPrivate *)
+	?_states@QDeclarativeItemPrivate@@QAEPAVQDeclarativeStateGroup@@XZ @ 3958 NONAME ; class QDeclarativeStateGroup * QDeclarativeItemPrivate::_states(void)
+	?baseline@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3959 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline(void) const
+	?bottom@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3960 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::bottom(void) const
+	?buildPropertyInNamespace@QDeclarativeCompiler@@AAE_NPAVQDeclarativeImportedNamespace@@PAVProperty@QDeclarativeParser@@PAVObject@4@ABUBindingContext@1@@Z @ 3961 NONAME ; bool QDeclarativeCompiler::buildPropertyInNamespace(class QDeclarativeImportedNamespace *, class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
+	?canceled@QDeclarativeMouseArea@@IAEXXZ @ 3962 NONAME ; void QDeclarativeMouseArea::canceled(void)
+	?classBegin@QDeclarativeBind@@MAEXXZ @ 3963 NONAME ; void QDeclarativeBind::classBegin(void)
+	?classBegin@QDeclarativeConnections@@EAEXXZ @ 3964 NONAME ; void QDeclarativeConnections::classBegin(void)
+	?classBegin@QDeclarativePath@@MAEXXZ @ 3965 NONAME ; void QDeclarativePath::classBegin(void)
+	?classBegin@QDeclarativeWorkerScript@@MAEXXZ @ 3966 NONAME ; void QDeclarativeWorkerScript::classBegin(void)
+	?completePending@QDeclarativeVisualDataModel@@UBE_NXZ @ 3967 NONAME ; bool QDeclarativeVisualDataModel::completePending(void) const
+	?completePending@QDeclarativeVisualItemModel@@UBE_NXZ @ 3968 NONAME ; bool QDeclarativeVisualItemModel::completePending(void) const
+	?componentFinalized@QDeclarativeBehavior@@AAEXXZ @ 3969 NONAME ; void QDeclarativeBehavior::componentFinalized(void)
+	?createObject@QDeclarativeComponent@@IAE?AVQScriptValue@@PAVQObject@@@Z @ 3970 NONAME ; class QScriptValue QDeclarativeComponent::createObject(class QObject *)
+	?data@QDeclarativeItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3971 NONAME ; class QDeclarativeListProperty QDeclarativeItemPrivate::data(void)
+	?engine@QDeclarativeWorkerScript@@AAEPAVQDeclarativeWorkerScriptEngine@@XZ @ 3972 NONAME ; class QDeclarativeWorkerScriptEngine * QDeclarativeWorkerScript::engine(void)
+	?geometryChanged@QDeclarativePaintedItem@@MAEXABVQRectF@@0@Z @ 3973 NONAME ; void QDeclarativePaintedItem::geometryChanged(class QRectF const &, class QRectF const &)
+	?get@QDeclarativeItemPrivate@@SAPAV1@PAVQDeclarativeItem@@@Z @ 3974 NONAME ; class QDeclarativeItemPrivate * QDeclarativeItemPrivate::get(class QDeclarativeItem *)
+	?horizontalCenter@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3975 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::horizontalCenter(void) const
+	?hoverEnabled@QDeclarativeMouseArea@@QBE_NXZ @ 3976 NONAME ; bool QDeclarativeMouseArea::hoverEnabled(void) const
+	?hoverEnabledChanged@QDeclarativeMouseArea@@IAEXXZ @ 3977 NONAME ; void QDeclarativeMouseArea::hoverEnabledChanged(void)
+	?ignoreUnknownSignals@QDeclarativeConnections@@QBE_NXZ @ 3978 NONAME ; bool QDeclarativeConnections::ignoreUnknownSignals(void) const
+	?itemChange@QDeclarativeMouseArea@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 3979 NONAME ; class QVariant QDeclarativeMouseArea::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &)
+	?itemChange@QDeclarativePaintedItem@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 3980 NONAME ; class QVariant QDeclarativePaintedItem::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &)
+	?left@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3981 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::left(void) const
+	?reportConflictingAnchors@QDeclarativeColumn@@MAEXXZ @ 3982 NONAME ; void QDeclarativeColumn::reportConflictingAnchors(void)
+	?reportConflictingAnchors@QDeclarativeFlow@@MAEXXZ @ 3983 NONAME ; void QDeclarativeFlow::reportConflictingAnchors(void)
+	?reportConflictingAnchors@QDeclarativeGrid@@MAEXXZ @ 3984 NONAME ; void QDeclarativeGrid::reportConflictingAnchors(void)
+	?reportConflictingAnchors@QDeclarativeRow@@MAEXXZ @ 3985 NONAME ; void QDeclarativeRow::reportConflictingAnchors(void)
+	?resources@QDeclarativeItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3986 NONAME ; class QDeclarativeListProperty QDeclarativeItemPrivate::resources(void)
+	?right@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3987 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::right(void) const
+	?setHoverEnabled@QDeclarativeMouseArea@@QAEX_N@Z @ 3988 NONAME ; void QDeclarativeMouseArea::setHoverEnabled(bool)
+	?setIgnoreUnknownSignals@QDeclarativeConnections@@QAEX_N@Z @ 3989 NONAME ; void QDeclarativeConnections::setIgnoreUnknownSignals(bool)
+	?setState@QDeclarativeItemPrivate@@QAEXABVQString@@@Z @ 3990 NONAME ; void QDeclarativeItemPrivate::setState(class QString const &)
+	?state@QDeclarativeItemPrivate@@QBE?AVQString@@XZ @ 3991 NONAME ; class QString QDeclarativeItemPrivate::state(void) const
+	?states@QDeclarativeItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3992 NONAME ; class QDeclarativeListProperty QDeclarativeItemPrivate::states(void)
+	?top@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3993 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::top(void) const
+	?transitions@QDeclarativeItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3994 NONAME ; class QDeclarativeListProperty QDeclarativeItemPrivate::transitions(void)
+	?verticalCenter@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3995 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::verticalCenter(void) const
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index c3a3a08..e574c31 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12717,7 +12717,7 @@ EXPORTS
 	?updateInputMethodSensitivity@QGraphicsViewPrivate@@QAEXXZ @ 12716 NONAME ; void QGraphicsViewPrivate::updateInputMethodSensitivity(void)
 	?updateLastCenterPoint@QGraphicsViewPrivate@@QAEXXZ @ 12717 NONAME ; void QGraphicsViewPrivate::updateLastCenterPoint(void)
 	?updateRect@QGraphicsViewPrivate@@QAE_NABVQRect@@@Z @ 12718 NONAME ; bool QGraphicsViewPrivate::updateRect(class QRect const &)
-	?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRegion@@@Z @ 12719 NONAME ; bool QGraphicsViewPrivate::updateRegion(class QRegion const &)
+	?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRegion@@@Z @ 12719 NONAME ABSENT ; bool QGraphicsViewPrivate::updateRegion(class QRegion const &)
 	?updateScroll@QGraphicsViewPrivate@@QAEXXZ @ 12720 NONAME ; void QGraphicsViewPrivate::updateScroll(void)
 	?verticalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12721 NONAME ; long long QGraphicsViewPrivate::verticalScroll(void) const
 	?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12722 NONAME ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *)
@@ -12798,4 +12798,6 @@ EXPORTS
 	?hasPartialUpdateSupport@QWindowSurface@@QBE_NXZ @ 12797 NONAME ; bool QWindowSurface::hasPartialUpdateSupport(void) const
 	?name@QIcon@@QBE?AVQString@@XZ @ 12798 NONAME ; class QString QIcon::name(void) const
 	?iconName@QIconEngineV2@@QAE?AVQString@@XZ @ 12799 NONAME ; class QString QIconEngineV2::iconName(void)
+	?updateRectF@QGraphicsViewPrivate@@QAE_NABVQRectF@@@Z @ 12800 NONAME ; bool QGraphicsViewPrivate::updateRectF(class QRectF const &)
+	?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRectF@@ABVQTransform@@@Z @ 12801 NONAME ; bool QGraphicsViewPrivate::updateRegion(class QRectF const &, class QTransform const &)
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 92a4020..dc9431b 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3698,4 +3698,6 @@ EXPORTS
 	_ZN24QAbstractDeclarativeData13parentChangedE @ 3697 NONAME DATA 4
 	_ZN24QAbstractDeclarativeData9destroyedE @ 3698 NONAME DATA 4
 	_ZN23QEventDispatcherSymbian12selectThreadEv @ 3699 NONAME
+	_ZN10QByteArray10setRawDataEPKcj @ 3700 NONAME
+	_ZN7QString10setRawDataEPK5QChari @ 3701 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index ad12166..e1d8e96 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -111,7 +111,7 @@ EXPORTS
 	_ZN16QDeclarativeItem11qt_metacallEN11QMetaObject4CallEiPPv @ 110 NONAME
 	_ZN16QDeclarativeItem11qt_metacastEPKc @ 111 NONAME
 	_ZN16QDeclarativeItem11resetHeightEv @ 112 NONAME
-	_ZN16QDeclarativeItem11transitionsEv @ 113 NONAME
+	_ZN16QDeclarativeItem11transitionsEv @ 113 NONAME ABSENT
 	_ZN16QDeclarativeItem12childrenRectEv @ 114 NONAME
 	_ZN16QDeclarativeItem12focusChangedEb @ 115 NONAME
 	_ZN16QDeclarativeItem12stateChangedERK7QString @ 116 NONAME
@@ -135,17 +135,17 @@ EXPORTS
 	_ZN16QDeclarativeItem19getStaticMetaObjectEv @ 134 NONAME
 	_ZN16QDeclarativeItem21baselineOffsetChangedEf @ 135 NONAME
 	_ZN16QDeclarativeItem22transformOriginChangedENS_15TransformOriginE @ 136 NONAME
-	_ZN16QDeclarativeItem4dataEv @ 137 NONAME
+	_ZN16QDeclarativeItem4dataEv @ 137 NONAME ABSENT
 	_ZN16QDeclarativeItem5eventEP6QEvent @ 138 NONAME
 	_ZN16QDeclarativeItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 139 NONAME
-	_ZN16QDeclarativeItem6statesEv @ 140 NONAME
-	_ZN16QDeclarativeItem7anchorsEv @ 141 NONAME
+	_ZN16QDeclarativeItem6statesEv @ 140 NONAME ABSENT
+	_ZN16QDeclarativeItem7anchorsEv @ 141 NONAME ABSENT
 	_ZN16QDeclarativeItem7setClipEb @ 142 NONAME
 	_ZN16QDeclarativeItem7setSizeERK6QSizeF @ 143 NONAME
 	_ZN16QDeclarativeItem8setFocusEb @ 144 NONAME
-	_ZN16QDeclarativeItem8setStateERK7QString @ 145 NONAME
+	_ZN16QDeclarativeItem8setStateERK7QString @ 145 NONAME ABSENT
 	_ZN16QDeclarativeItem8setWidthEf @ 146 NONAME
-	_ZN16QDeclarativeItem9resourcesEv @ 147 NONAME
+	_ZN16QDeclarativeItem9resourcesEv @ 147 NONAME ABSENT
 	_ZN16QDeclarativeItem9setHeightEf @ 148 NONAME
 	_ZN16QDeclarativeItem9setSmoothEb @ 149 NONAME
 	_ZN16QDeclarativeItem9transformEv @ 150 NONAME
@@ -361,13 +361,13 @@ EXPORTS
 	_ZN18QDeclarativeLoader11itemChangedEv @ 360 NONAME
 	_ZN18QDeclarativeLoader11qt_metacallEN11QMetaObject4CallEiPPv @ 361 NONAME
 	_ZN18QDeclarativeLoader11qt_metacastEPKc @ 362 NONAME
-	_ZN18QDeclarativeLoader13setResizeModeENS_10ResizeModeE @ 363 NONAME
+	_ZN18QDeclarativeLoader13setResizeModeENS_10ResizeModeE @ 363 NONAME ABSENT
 	_ZN18QDeclarativeLoader13sourceChangedEv @ 364 NONAME
 	_ZN18QDeclarativeLoader13statusChangedEv @ 365 NONAME
 	_ZN18QDeclarativeLoader15geometryChangedERK6QRectFS2_ @ 366 NONAME
 	_ZN18QDeclarativeLoader15progressChangedEv @ 367 NONAME
 	_ZN18QDeclarativeLoader16staticMetaObjectE @ 368 NONAME DATA 16
-	_ZN18QDeclarativeLoader17resizeModeChangedEv @ 369 NONAME
+	_ZN18QDeclarativeLoader17resizeModeChangedEv @ 369 NONAME ABSENT
 	_ZN18QDeclarativeLoader18setSourceComponentEP21QDeclarativeComponent @ 370 NONAME
 	_ZN18QDeclarativeLoader19getStaticMetaObjectEv @ 371 NONAME
 	_ZN18QDeclarativeLoader9setSourceERK4QUrl @ 372 NONAME
@@ -586,7 +586,7 @@ EXPORTS
 	_ZN20QDeclarativeCompiler22completeComponentBuildEv @ 585 NONAME
 	_ZN20QDeclarativeCompiler22isAttachedPropertyNameERK10QByteArray @ 586 NONAME
 	_ZN20QDeclarativeCompiler23buildPropertyAssignmentEPN18QDeclarativeParser8PropertyEPNS0_6ObjectERKNS_14BindingContextE @ 587 NONAME
-	_ZN20QDeclarativeCompiler24buildPropertyInNamespaceEPN25QDeclarativeEnginePrivate17ImportedNamespaceEPN18QDeclarativeParser8PropertyEPNS3_6ObjectERKNS_14BindingContextE @ 588 NONAME
+	_ZN20QDeclarativeCompiler24buildPropertyInNamespaceEPN25QDeclarativeEnginePrivate17ImportedNamespaceEPN18QDeclarativeParser8PropertyEPNS3_6ObjectERKNS_14BindingContextE @ 588 NONAME ABSENT
 	_ZN20QDeclarativeCompiler25buildPropertyOnAssignmentEPN18QDeclarativeParser8PropertyEPNS0_6ObjectES4_PNS0_5ValueERKNS_14BindingContextE @ 589 NONAME
 	_ZN20QDeclarativeCompiler25buildScriptStringPropertyEPN18QDeclarativeParser8PropertyEPNS0_6ObjectERKNS_14BindingContextE @ 590 NONAME
 	_ZN20QDeclarativeCompiler26mergeDynamicMetaPropertiesEPN18QDeclarativeParser6ObjectE @ 591 NONAME
@@ -969,7 +969,7 @@ EXPORTS
 	_ZN21QDeclarativeComponent11beginCreateEP19QDeclarativeContext @ 968 NONAME
 	_ZN21QDeclarativeComponent11qt_metacallEN11QMetaObject4CallEiPPv @ 969 NONAME
 	_ZN21QDeclarativeComponent11qt_metacastEPKc @ 970 NONAME
-	_ZN21QDeclarativeComponent12createObjectEv @ 971 NONAME
+	_ZN21QDeclarativeComponent12createObjectEv @ 971 NONAME ABSENT
 	_ZN21QDeclarativeComponent13statusChangedENS_6StatusE @ 972 NONAME
 	_ZN21QDeclarativeComponent14completeCreateEv @ 973 NONAME
 	_ZN21QDeclarativeComponent15progressChangedEf @ 974 NONAME
@@ -1493,7 +1493,7 @@ EXPORTS
 	_ZN23QDeclarativePaintedItem19contentsSizeChangedEv @ 1492 NONAME
 	_ZN23QDeclarativePaintedItem19getStaticMetaObjectEv @ 1493 NONAME
 	_ZN23QDeclarativePaintedItem20contentsScaleChangedEv @ 1494 NONAME
-	_ZN23QDeclarativePaintedItem4initEv @ 1495 NONAME
+	_ZN23QDeclarativePaintedItem4initEv @ 1495 NONAME ABSENT
 	_ZN23QDeclarativePaintedItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 1496 NONAME
 	_ZN23QDeclarativePaintedItemC2EP16QDeclarativeItem @ 1497 NONAME
 	_ZN23QDeclarativePaintedItemC2ER30QDeclarativePaintedItemPrivateP16QDeclarativeItem @ 1498 NONAME
@@ -1624,9 +1624,9 @@ EXPORTS
 	_ZN24QDeclarativeParentChangeD0Ev @ 1623 NONAME
 	_ZN24QDeclarativeParentChangeD1Ev @ 1624 NONAME
 	_ZN24QDeclarativeParentChangeD2Ev @ 1625 NONAME
-	_ZN24QDeclarativeParserStatus10classBeginEv @ 1626 NONAME
-	_ZN24QDeclarativeParserStatus17componentCompleteEv @ 1627 NONAME
-	_ZN24QDeclarativeParserStatusC1Ev @ 1628 NONAME
+	_ZN24QDeclarativeParserStatus10classBeginEv @ 1626 NONAME ABSENT
+	_ZN24QDeclarativeParserStatus17componentCompleteEv @ 1627 NONAME ABSENT
+	_ZN24QDeclarativeParserStatusC1Ev @ 1628 NONAME ABSENT
 	_ZN24QDeclarativeParserStatusC2Ev @ 1629 NONAME
 	_ZN24QDeclarativeParserStatusD0Ev @ 1630 NONAME
 	_ZN24QDeclarativeParserStatusD1Ev @ 1631 NONAME
@@ -2203,21 +2203,21 @@ EXPORTS
 	_ZNK16QDeclarativeItem13keepMouseGrabEv @ 2202 NONAME
 	_ZNK16QDeclarativeItem14baselineOffsetEv @ 2203 NONAME
 	_ZNK16QDeclarativeItem14implicitHeightEv @ 2204 NONAME
-	_ZNK16QDeclarativeItem14verticalCenterEv @ 2205 NONAME
+	_ZNK16QDeclarativeItem14verticalCenterEv @ 2205 NONAME ABSENT
 	_ZNK16QDeclarativeItem15transformOriginEv @ 2206 NONAME
-	_ZNK16QDeclarativeItem16horizontalCenterEv @ 2207 NONAME
+	_ZNK16QDeclarativeItem16horizontalCenterEv @ 2207 NONAME ABSENT
 	_ZNK16QDeclarativeItem16inputMethodQueryEN2Qt16InputMethodQueryE @ 2208 NONAME
 	_ZNK16QDeclarativeItem19isComponentCompleteEv @ 2209 NONAME
-	_ZNK16QDeclarativeItem3topEv @ 2210 NONAME
+	_ZNK16QDeclarativeItem3topEv @ 2210 NONAME ABSENT
 	_ZNK16QDeclarativeItem4clipEv @ 2211 NONAME
-	_ZNK16QDeclarativeItem4leftEv @ 2212 NONAME
-	_ZNK16QDeclarativeItem5rightEv @ 2213 NONAME
-	_ZNK16QDeclarativeItem5stateEv @ 2214 NONAME
+	_ZNK16QDeclarativeItem4leftEv @ 2212 NONAME ABSENT
+	_ZNK16QDeclarativeItem5rightEv @ 2213 NONAME ABSENT
+	_ZNK16QDeclarativeItem5stateEv @ 2214 NONAME ABSENT
 	_ZNK16QDeclarativeItem5widthEv @ 2215 NONAME
-	_ZNK16QDeclarativeItem6bottomEv @ 2216 NONAME
+	_ZNK16QDeclarativeItem6bottomEv @ 2216 NONAME ABSENT
 	_ZNK16QDeclarativeItem6heightEv @ 2217 NONAME
 	_ZNK16QDeclarativeItem6smoothEv @ 2218 NONAME
-	_ZNK16QDeclarativeItem8baselineEv @ 2219 NONAME
+	_ZNK16QDeclarativeItem8baselineEv @ 2219 NONAME ABSENT
 	_ZNK16QDeclarativeItem8hasFocusEv @ 2220 NONAME
 	_ZNK16QDeclarativeItem9mapToItemERK12QScriptValueff @ 2221 NONAME
 	_ZNK16QDeclarativePath10attributesEv @ 2222 NONAME
@@ -2310,7 +2310,7 @@ EXPORTS
 	_ZNK18QDeclarativeEngine27networkAccessManagerFactoryEv @ 2309 NONAME
 	_ZNK18QDeclarativeEngine7baseUrlEv @ 2310 NONAME
 	_ZNK18QDeclarativeLoader10metaObjectEv @ 2311 NONAME
-	_ZNK18QDeclarativeLoader10resizeModeEv @ 2312 NONAME
+	_ZNK18QDeclarativeLoader10resizeModeEv @ 2312 NONAME ABSENT
 	_ZNK18QDeclarativeLoader15sourceComponentEv @ 2313 NONAME
 	_ZNK18QDeclarativeLoader4itemEv @ 2314 NONAME
 	_ZNK18QDeclarativeLoader6sourceEv @ 2315 NONAME
@@ -3536,4 +3536,46 @@ EXPORTS
 	_ZThn8_N25QDeclarativeAnchorChanges7executeEN23QDeclarativeActionEvent6ReasonE @ 3535 NONAME
 	_ZThn8_N25QDeclarativeAnchorChanges7reverseEN23QDeclarativeActionEvent6ReasonE @ 3536 NONAME
 	_ZThn8_N29QDeclarativeStateChangeScript7executeEN23QDeclarativeActionEvent6ReasonE @ 3537 NONAME
+	_ZN15QDeclarativeRow24reportConflictingAnchorsEv @ 3538 NONAME
+	_ZN16QDeclarativeBind10classBeginEv @ 3539 NONAME
+	_ZN16QDeclarativeFlow24reportConflictingAnchorsEv @ 3540 NONAME
+	_ZN16QDeclarativeGrid24reportConflictingAnchorsEv @ 3541 NONAME
+	_ZN16QDeclarativePath10classBeginEv @ 3542 NONAME
+	_ZN18QDeclarativeColumn24reportConflictingAnchorsEv @ 3543 NONAME
+	_ZN20QDeclarativeBehavior18componentFinalizedEv @ 3544 NONAME
+	_ZN20QDeclarativeCompiler24buildPropertyInNamespaceEP29QDeclarativeImportedNamespacePN18QDeclarativeParser8PropertyEPNS2_6ObjectERKNS_14BindingContextE @ 3545 NONAME
+	_ZN21QDeclarativeComponent12createObjectEP7QObject @ 3546 NONAME
+	_ZN21QDeclarativeMouseArea10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3547 NONAME
+	_ZN21QDeclarativeMouseArea15setHoverEnabledEb @ 3548 NONAME
+	_ZN21QDeclarativeMouseArea19hoverEnabledChangedEv @ 3549 NONAME
+	_ZN21QDeclarativeMouseArea8canceledEv @ 3550 NONAME
+	_ZN23QDeclarativeConnections10classBeginEv @ 3551 NONAME
+	_ZN23QDeclarativeConnections23setIgnoreUnknownSignalsEb @ 3552 NONAME
+	_ZN23QDeclarativeItemPrivate11transitionsEv @ 3553 NONAME
+	_ZN23QDeclarativeItemPrivate4dataEv @ 3554 NONAME
+	_ZN23QDeclarativeItemPrivate7_statesEv @ 3555 NONAME
+	_ZN23QDeclarativeItemPrivate8setStateERK7QString @ 3556 NONAME
+	_ZN23QDeclarativeItemPrivate9resourcesEv @ 3557 NONAME
+	_ZN23QDeclarativePaintedItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3558 NONAME
+	_ZN23QDeclarativePaintedItem15geometryChangedERK6QRectFS2_ @ 3559 NONAME
+	_ZN24QDeclarativeWorkerScript10classBeginEv @ 3560 NONAME
+	_ZN24QDeclarativeWorkerScript6engineEv @ 3561 NONAME
+	_ZNK21QDeclarativeMouseArea12hoverEnabledEv @ 3562 NONAME
+	_ZNK23QDeclarativeConnections20ignoreUnknownSignalsEv @ 3563 NONAME
+	_ZNK23QDeclarativeItemPrivate14verticalCenterEv @ 3564 NONAME
+	_ZNK23QDeclarativeItemPrivate16horizontalCenterEv @ 3565 NONAME
+	_ZNK23QDeclarativeItemPrivate3topEv @ 3566 NONAME
+	_ZNK23QDeclarativeItemPrivate4leftEv @ 3567 NONAME
+	_ZNK23QDeclarativeItemPrivate5rightEv @ 3568 NONAME
+	_ZNK23QDeclarativeItemPrivate5stateEv @ 3569 NONAME
+	_ZNK23QDeclarativeItemPrivate6bottomEv @ 3570 NONAME
+	_ZNK23QDeclarativeItemPrivate8baselineEv @ 3571 NONAME
+	_ZNK27QDeclarativeVisualDataModel15completePendingEv @ 3572 NONAME
+	_ZNK27QDeclarativeVisualItemModel15completePendingEv @ 3573 NONAME
+	_ZThn8_N16QDeclarativeBind10classBeginEv @ 3574 NONAME
+	_ZThn8_N16QDeclarativePath10classBeginEv @ 3575 NONAME
+	_ZThn8_N21QDeclarativeMouseArea10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3576 NONAME
+	_ZThn8_N23QDeclarativeConnections10classBeginEv @ 3577 NONAME
+	_ZThn8_N23QDeclarativePaintedItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 3578 NONAME
+	_ZThn8_N24QDeclarativeWorkerScript10classBeginEv @ 3579 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index b1166c5..8987470 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -11849,7 +11849,7 @@ EXPORTS
 	_ZN19QApplicationPrivate15getPixmapCursorEN2Qt11CursorShapeE @ 11848 NONAME
 	_ZN20QGraphicsViewPrivate10centerViewEN13QGraphicsView14ViewportAnchorE @ 11849 NONAME
 	_ZN20QGraphicsViewPrivate10updateRectERK5QRect @ 11850 NONAME
-	_ZN20QGraphicsViewPrivate12updateRegionERK7QRegion @ 11851 NONAME
+	_ZN20QGraphicsViewPrivate12updateRegionERK7QRegion @ 11851 NONAME ABSENT
 	_ZN20QGraphicsViewPrivate12updateScrollEv @ 11852 NONAME
 	_ZN20QGraphicsViewPrivate15storeMouseEventEP11QMouseEvent @ 11853 NONAME
 	_ZN20QGraphicsViewPrivate18storeDragDropEventEPK27QGraphicsSceneDragDropEvent @ 11854 NONAME
@@ -11998,4 +11998,5 @@ EXPORTS
 	_ZN14QWindowSurface23setPartialUpdateSupportEb @ 11997 NONAME
 	_ZNK14QWindowSurface23hasPartialUpdateSupportEv @ 11998 NONAME
 	_ZNK5QIcon4nameEv @ 11999 NONAME
+	_ZN20QGraphicsViewPrivate12updateRegionERK6QRectFRK10QTransform @ 12000 NONAME
 
-- 
cgit v0.12


From c316e141fa511a6f0549630153e3502cca42f592 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Tue, 11 May 2010 22:57:29 +0200
Subject: Doc: Update on web template Updated Form action

---
 tools/qdoc3/test/qt-html-templates.qdocconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index e5d73c7..31fc414 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -31,7 +31,7 @@ HTML.postheader         = " 
      \n" \
 			  "        
      \n" \
 			  "          Search index:
      \n" \
 			  "        
      \n" \
-			  "          
      \n" \
+			  "          \n" \
 			  "            
      \n" \
 			  "              \n" \
 			  "            
      \n" \
-- 
cgit v0.12


From dae547d26f8c7d4c75b02045e23213c798a2fa3e Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 12 May 2010 08:13:41 +1000
Subject: Clarify ListModel population via JS.

Task-number: QTBUG-10457
---
 doc/src/declarative/qdeclarativemodels.qdoc | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 9b706a1..788d417 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -143,6 +143,28 @@ ListView {
 }
 \endcode
 
+It is also possible to manipulate the ListModel directly via JavaScript.
+In this case, the first item inserted will determine the roles available
+to any views using the model.  For example, if an empty ListModel is
+created and populated via JavaScript the roles provided by the first
+insertion are the only roles that will be shown in the view:
+
+\code
+Item {
+    ListModel {
+        id: fruitModel
+    }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: fruitModel.append({"cost": 5.95, "name":"Pizza"})
+    }
+}
+\endcode
+
+When the MouseArea is clicked fruitModel will have two roles, "cost" and "name".
+Even if subsequent roles are added, only the first two will be handled by views
+using the model.
+
 
 \section2 XmlListModel
 
-- 
cgit v0.12


From c4bb04a6154931570dee72b3a1ed34af31814d17 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 12 May 2010 08:28:55 +1000
Subject: Don't store the role-property map for each individual item. C++
 models share a single metaobject type, so we don't need to create
 role-property mappings for each individual item.

Also warn on attempt to modify a role that the model is unaware of
(part of QTBUG-10457)
---
 .../graphicsitems/qdeclarativegridview.cpp         |  2 +-
 .../graphicsitems/qdeclarativelistview.cpp         |  3 +-
 .../graphicsitems/qdeclarativerepeater.cpp         |  2 +-
 .../graphicsitems/qdeclarativevisualitemmodel.cpp  | 63 ++++++++++++++--------
 .../graphicsitems/qdeclarativevisualitemmodel_p.h  |  6 +--
 5 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 7b413fb..305d55c 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1027,7 +1027,7 @@ void QDeclarativeGridView::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this), this);
             d->ownModel = true;
         }
         if (QDeclarativeVisualDataModel *dataModel = qobject_cast(d->model))
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 416e0a8..65edb03 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1461,7 +1462,7 @@ void QDeclarativeListView::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this), this);
             d->ownModel = true;
         }
         if (QDeclarativeVisualDataModel *dataModel = qobject_cast(d->model))
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index ca0b8c6..04076f8 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -193,7 +193,7 @@ void QDeclarativeRepeater::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this), this);
             d->ownModel = true;
         }
         if (QDeclarativeVisualDataModel *dataModel = qobject_cast(d->model))
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 1038c83..0e4217e 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -138,8 +138,8 @@ public:
     }
     \endcode
 */
-QDeclarativeVisualItemModel::QDeclarativeVisualItemModel()
-    : QDeclarativeVisualModel(*(new QDeclarativeVisualItemModelPrivate))
+QDeclarativeVisualItemModel::QDeclarativeVisualItemModel(QObject *parent)
+    : QDeclarativeVisualModel(*(new QDeclarativeVisualItemModelPrivate), parent)
 {
 }
 
@@ -269,7 +269,8 @@ public:
                 }
                 if (m_roles.count() == 1)
                     m_roleNames.insert("modelData", m_roles.at(0));
-                m_roleNames.insert("hasModelChildren", 0);
+                if (m_roles.count())
+                    m_roleNames.insert("hasModelChildren", 0);
             } else if (m_listAccessor) {
                 m_roleNames.insert("modelData", 0);
                 if (m_listAccessor->type() == QDeclarativeListAccessor::Instance) {
@@ -285,15 +286,19 @@ public:
         }
     }
 
+    QHash roleToPropId;
     void createMetaData() {
         if (!m_metaDataCreated) {
             ensureRoles();
-            QHash::const_iterator it = m_roleNames.begin();
-            while (it != m_roleNames.end()) {
-                m_delegateDataType->createProperty(it.key());
-                ++it;
+            if (m_roleNames.count()) {
+                QHash::const_iterator it = m_roleNames.begin();
+                while (it != m_roleNames.end()) {
+                    int propId = m_delegateDataType->createProperty(it.key()) - m_delegateDataType->propertyOffset();
+                    roleToPropId.insert(*it, propId);
+                    ++it;
+                }
+                m_metaDataCreated = true;
             }
-            m_metaDataCreated = true;
         }
     }
 
@@ -383,7 +388,6 @@ public:
 
 private:
     friend class QDeclarativeVisualDataModelData;
-    QHash roleToProp;
 };
 
 class QDeclarativeVisualDataModelData : public QObject
@@ -400,6 +404,8 @@ public:
     int propForRole(int) const;
     void setValue(int, const QVariant &);
 
+    void ensureProperties();
+
 Q_SIGNALS:
     void indexChanged();
 
@@ -412,9 +418,11 @@ private:
 
 int QDeclarativeVisualDataModelData::propForRole(int id) const
 {
-    QHash::const_iterator it = m_meta->roleToProp.find(id);
-    if (it != m_meta->roleToProp.end())
-        return m_meta->roleToProp[id];
+    QDeclarativeVisualDataModelPrivate *model = QDeclarativeVisualDataModelPrivate::get(m_model);
+    QHash::const_iterator it = model->roleToPropId.find(id);
+    if (it != model->roleToPropId.end())
+        return *it;
+
     return -1;
 }
 
@@ -470,12 +478,10 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
         model->ensureRoles();
         QHash::const_iterator it = model->m_roleNames.find(propName);
         if (it != model->m_roleNames.end()) {
-            roleToProp.insert(*it, propId);
             QVariant value = model->m_listModelInterface->data(data->m_index, *it);
             return value;
         } else if (model->m_roles.count() == 1 && propName == "modelData") {
             //for compatability with other lists, assign modelData if there is only a single role
-            roleToProp.insert(model->m_roles.first(), propId);
             QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first());
             return value;
         }
@@ -487,7 +493,6 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
         } else {
             QHash::const_iterator it = model->m_roleNames.find(propName);
             if (it != model->m_roleNames.end()) {
-                roleToProp.insert(*it, propId);
                 QModelIndex index = model->m_abstractItemModel->index(data->m_index, 0, model->m_root);
                 return model->m_abstractItemModel->data(index, *it);
             }
@@ -502,18 +507,23 @@ QDeclarativeVisualDataModelData::QDeclarativeVisualDataModelData(int index,
 : m_index(index), m_model(model),
 m_meta(new QDeclarativeVisualDataModelDataMetaObject(this, QDeclarativeVisualDataModelPrivate::get(model)->m_delegateDataType))
 {
-    QDeclarativeVisualDataModelPrivate *modelPriv = QDeclarativeVisualDataModelPrivate::get(model);
-    if (modelPriv->m_metaDataCacheable) {
-        if (!modelPriv->m_metaDataCreated)
-            modelPriv->createMetaData();
-        m_meta->setCached(true);
-    }
+    ensureProperties();
 }
 
 QDeclarativeVisualDataModelData::~QDeclarativeVisualDataModelData()
 {
 }
 
+void QDeclarativeVisualDataModelData::ensureProperties()
+{
+    QDeclarativeVisualDataModelPrivate *modelPriv = QDeclarativeVisualDataModelPrivate::get(m_model);
+    if (modelPriv->m_metaDataCacheable && !modelPriv->m_metaDataCreated) {
+        modelPriv->createMetaData();
+        if (modelPriv->m_metaDataCreated)
+            m_meta->setCached(true);
+    }
+}
+
 int QDeclarativeVisualDataModelData::index() const
 {
     return m_index;
@@ -626,8 +636,8 @@ QDeclarativeVisualDataModel::QDeclarativeVisualDataModel()
 {
 }
 
-QDeclarativeVisualDataModel::QDeclarativeVisualDataModel(QDeclarativeContext *ctxt)
-: QDeclarativeVisualModel(*(new QDeclarativeVisualDataModelPrivate(ctxt)))
+QDeclarativeVisualDataModel::QDeclarativeVisualDataModel(QDeclarativeContext *ctxt, QObject *parent)
+: QDeclarativeVisualModel(*(new QDeclarativeVisualDataModelPrivate(ctxt)), parent)
 {
 }
 
@@ -1212,6 +1222,13 @@ void QDeclarativeVisualDataModel::_q_itemsChanged(int index, int count,
                         QModelIndex index = d->m_abstractItemModel->index(idx, 0, d->m_root);
                         data->setValue(propId, d->m_abstractItemModel->data(index, role));
                     }
+                } else {
+                    QString roleName;
+                    if (d->m_listModelInterface)
+                        roleName = d->m_listModelInterface->toString(role);
+                    else if (d->m_abstractItemModel)
+                        roleName = d->m_abstractItemModel->roleNames().value(role);
+                    qmlInfo(this) << "Changing role not present in item: " << roleName;
                 }
             }
         }
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
index edfd387..0bdbbcf 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -72,7 +72,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeVisualModel : public QObject
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
-    QDeclarativeVisualModel() {}
+    QDeclarativeVisualModel(QObject *parent=0) : QObject(parent) {}
     virtual ~QDeclarativeVisualModel() {}
 
     enum ReleaseFlag { Referenced = 0x01, Destroyed = 0x02 };
@@ -117,7 +117,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeVisualItemModel : public QDeclarativeVisu
     Q_CLASSINFO("DefaultProperty", "children")
 
 public:
-    QDeclarativeVisualItemModel();
+    QDeclarativeVisualItemModel(QObject *parent=0);
     virtual ~QDeclarativeVisualItemModel() {}
 
     virtual int count() const;
@@ -156,7 +156,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeVisualDataModel : public QDeclarativeVisu
     Q_CLASSINFO("DefaultProperty", "delegate")
 public:
     QDeclarativeVisualDataModel();
-    QDeclarativeVisualDataModel(QDeclarativeContext *);
+    QDeclarativeVisualDataModel(QDeclarativeContext *, QObject *parent=0);
     virtual ~QDeclarativeVisualDataModel();
 
     QVariant model() const;
-- 
cgit v0.12


From 1809eb091cb47c914713ecef6e514e912a4e113b Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Mon, 10 May 2010 15:38:12 +1000
Subject: Expand if available space changes.

Task-number: QT-3175
---
 demos/declarative/webbrowser/content/FlickableWebView.qml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 2862cc4..7efbaa3 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -20,6 +20,12 @@ Flickable {
     anchors.right: parent.right
     pressDelay: 200
 
+    onWidthChanged : {
+        // Expand (but not above 1:1) if otherwise would be smaller that available width.
+        if (width > webView.width*webView.contentsScale && webView.contentsScale < 1.0)
+            webView.contentsScale = width / webView.width * webView.contentsScale;
+    }
+
     WebView {
         id: webView
         pixelCacheSize: 4000000
-- 
cgit v0.12


From 797d44e7415e8f9d582dd2838957cf309cea9449 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Tue, 11 May 2010 09:01:51 +1000
Subject: Temporary work-around for QTBUG-9849. May allow better
 experimentation and bug fixing.

---
 tools/qml/main.cpp       |  6 ++++++
 tools/qml/qmlruntime.cpp | 11 +++++++++++
 tools/qml/qmlruntime.h   |  2 ++
 3 files changed, 19 insertions(+)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index fb687ac..116ca71 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -231,6 +231,7 @@ int main(int argc, char ** argv)
     bool stayOnTop = false;
     bool maximized = false;
     bool useNativeFileBrowser = true;
+    bool experimentalGestures = false;
 
     WarningsConfig warningsConfig = DefaultWarnings;
     bool sizeToView = true;
@@ -334,6 +335,8 @@ int main(int argc, char ** argv)
             sizeToView = false;
         } else if (arg == "-sizerootobjecttoview") {
             sizeToView = true;
+        } else if (arg == "-experimentalgestures") {
+            experimentalGestures = true;
         } else if (arg[0] != '-') {
             fileName = arg;
         } else if (1 || arg == "-help") {
@@ -403,6 +406,9 @@ int main(int argc, char ** argv)
     }
 #endif
 
+    if (experimentalGestures)
+        viewer->enableExperimentalGestures();
+
     foreach (QString lib, imports)
         viewer->addLibraryPath(lib);
 
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 06fa004..16b0ffb 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -501,6 +501,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
     }
 
     canvas = new QDeclarativeView(this);
+
     canvas->setAttribute(Qt::WA_OpaquePaintEvent);
     canvas->setAttribute(Qt::WA_NoSystemBackground);
 
@@ -550,6 +551,16 @@ QDeclarativeViewer::~QDeclarativeViewer()
     delete namFactory;
 }
 
+void QDeclarativeViewer::enableExperimentalGestures()
+{
+    canvas->viewport()->grabGesture(Qt::TapGesture,Qt::DontStartGestureOnChildren|Qt::ReceivePartialGestures|Qt::IgnoredGesturesPropagateToParent);
+    canvas->viewport()->grabGesture(Qt::TapAndHoldGesture,Qt::DontStartGestureOnChildren|Qt::ReceivePartialGestures|Qt::IgnoredGesturesPropagateToParent);
+    canvas->viewport()->grabGesture(Qt::PanGesture,Qt::DontStartGestureOnChildren|Qt::ReceivePartialGestures|Qt::IgnoredGesturesPropagateToParent);
+    canvas->viewport()->grabGesture(Qt::PinchGesture,Qt::DontStartGestureOnChildren|Qt::ReceivePartialGestures|Qt::IgnoredGesturesPropagateToParent);
+    canvas->viewport()->grabGesture(Qt::SwipeGesture,Qt::DontStartGestureOnChildren|Qt::ReceivePartialGestures|Qt::IgnoredGesturesPropagateToParent);
+    canvas->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
+}
+
 int QDeclarativeViewer::menuBarHeight() const
 {
     if (!(windowFlags() & Qt::FramelessWindowHint))
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 9551090..b021d0d 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -112,6 +112,8 @@ public:
     QDeclarativeView *view() const;
     LoggerWidget *warningsWidget() const;
 
+    void enableExperimentalGestures();
+
 public slots:
     void sceneResized(QSize size);
     bool open(const QString&);
-- 
cgit v0.12


From 355bacaa767f48014478d91e3d79f19f966c9756 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Tue, 11 May 2010 16:50:24 +1000
Subject: Ensure QPixmapCache does not flush pixmaps that are still in use.

Task-number: QTBUG-10576
Reviewed-by: Alexis Menard
---
 src/gui/image/qpixmapcache.cpp               | 43 ++++++++++++++++++++++++++--
 src/gui/image/qpixmapcache.h                 | 10 +++++++
 src/gui/image/qpixmapcache_p.h               |  2 ++
 tests/auto/qpixmapcache/tst_qpixmapcache.cpp | 34 +++++++++++++++-------
 4 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 5fc605a..7a6a73f 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#define Q_TEST_QPIXMAPCACHE
 #include "qpixmapcache.h"
 #include "qobject.h"
 #include "qdebug.h"
@@ -194,6 +195,9 @@ public:
 
     static QPixmapCache::KeyData* getKeyData(QPixmapCache::Key *key);
 
+    QList< QPair > allPixmaps() const;
+    void flushDetachedPixmaps(bool nt);
+
 private:
     int *keyArray;
     int theid;
@@ -235,10 +239,9 @@ QPMCache::~QPMCache()
   When the last pixmap has been deleted from the cache, kill the
   timer so Qt won't keep the CPU from going into sleep mode.
 */
-void QPMCache::timerEvent(QTimerEvent *)
+void QPMCache::flushDetachedPixmaps(bool nt)
 {
     int mc = maxCost();
-    bool nt = totalCost() == ps;
     setMaxCost(nt ? totalCost() * 3 / 4 : totalCost() -1);
     setMaxCost(mc);
     ps = totalCost();
@@ -252,6 +255,12 @@ void QPMCache::timerEvent(QTimerEvent *)
             ++it;
         }
     }
+}
+
+void QPMCache::timerEvent(QTimerEvent *)
+{
+    bool nt = totalCost() == ps;
+    flushDetachedPixmaps(nt);
 
     if (!size()) {
         killTimer(theid);
@@ -263,6 +272,7 @@ void QPMCache::timerEvent(QTimerEvent *)
     }
 }
 
+
 QPixmap *QPMCache::object(const QString &key) const
 {
     QPixmapCache::Key cacheKey = cacheKeys.value(key);
@@ -422,6 +432,20 @@ QPixmapCache::KeyData* QPMCache::getKeyData(QPixmapCache::Key *key)
     return key->d;
 }
 
+QList< QPair > QPMCache::allPixmaps() const
+{
+    QList< QPair > r;
+    QHash::const_iterator it = cacheKeys.begin();
+    while (it != cacheKeys.end()) {
+        QPixmap *ptr = QCache::object(it.value());
+        if (ptr)
+            r.append(QPair(it.key(),*ptr));
+        ++it;
+    }
+    return r;
+}
+
+
 Q_GLOBAL_STATIC(QPMCache, pm_cache)
 
 int Q_AUTOTEST_EXPORT q_QPixmapCache_keyHashSize()
@@ -633,4 +657,19 @@ void QPixmapCache::clear()
     }
 }
 
+void QPixmapCache::flushDetachedPixmaps()
+{
+    pm_cache()->flushDetachedPixmaps(true);
+}
+
+int QPixmapCache::totalUsed()
+{
+    return (pm_cache()->totalCost()+1023) / 1024;
+}
+
+QList< QPair > QPixmapCache::allPixmaps()
+{
+    return pm_cache()->allPixmaps();
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index 50a9369..e9c8c15 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -44,6 +44,10 @@
 
 #include 
 
+#ifdef Q_TEST_QPIXMAPCACHE
+#include 
+#endif
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -83,6 +87,12 @@ public:
     static void remove(const QString &key);
     static void remove(const Key &key);
     static void clear();
+
+#ifdef Q_TEST_QPIXMAPCACHE
+    static void flushDetachedPixmaps();
+    static int totalUsed();
+    static QList< QPair > allPixmaps();
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 86a1b78..825f272 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -95,6 +95,8 @@ public:
     QPixmapCache::Key key;
 };
 
+inline bool qIsDetached(QPixmapCacheEntry &t) { return t.isDetached(); }
+
 QT_END_NAMESPACE
 
 #endif // QPIXMAPCACHE_P_H
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
index f8951f5..70f2ac3 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#define Q_TEST_QPIXMAPCACHE
 
 #include 
 
@@ -152,6 +153,7 @@ void tst_QPixmapCache::setCacheLimit()
     p1 = new QPixmap(2, 3);
     key = QPixmapCache::insert(*p1);
     QVERIFY(QPixmapCache::find(key, p1) != 0);
+    p1->detach(); // dectach so that the cache thinks no-one is using it.
     QPixmapCache::setCacheLimit(0);
     QVERIFY(QPixmapCache::find(key, p1) == 0);
     QPixmapCache::setCacheLimit(1000);
@@ -169,6 +171,8 @@ void tst_QPixmapCache::setCacheLimit()
     key = QPixmapCache::insert(*p1);
     QVERIFY(QPixmapCache::find(key, &p2) != 0);
     //we flush the cache
+    p1->detach();
+    p2.detach();
     QPixmapCache::setCacheLimit(0);
     QPixmapCache::setCacheLimit(1000);
     QPixmapCache::Key key2 = QPixmapCache::insert(*p1);
@@ -180,21 +184,25 @@ void tst_QPixmapCache::setCacheLimit()
     delete p1;
 
     //Here we simulate the flushing when the app is idle
-    /*QPixmapCache::clear();
+    QPixmapCache::clear();
     QPixmapCache::setCacheLimit(originalCacheLimit);
     p1 = new QPixmap(300, 300);
     key = QPixmapCache::insert(*p1);
+    p1->detach();
     QCOMPARE(getPrivate(key)->key, 1);
     key2 = QPixmapCache::insert(*p1);
+    p1->detach();
     key2 = QPixmapCache::insert(*p1);
+    p1->detach();
     QPixmapCache::Key key3 = QPixmapCache::insert(*p1);
-    QTest::qWait(32000);
+    p1->detach();
+    QPixmapCache::flushDetachedPixmaps();
     key2 = QPixmapCache::insert(*p1);
     QCOMPARE(getPrivate(key2)->key, 1);
     //This old key is not valid anymore after the flush
     QCOMPARE(getPrivate(key)->isValid, false);
     QVERIFY(QPixmapCache::find(key, &p2) == 0);
-    delete p1;*/
+    delete p1;
 }
 
 void tst_QPixmapCache::find()
@@ -225,12 +233,14 @@ void tst_QPixmapCache::find()
     QPixmapCache::clear();
     QPixmapCache::setCacheLimit(128);
 
-    key = QPixmapCache::insert(p1);
+    QPixmap p4(10,10);
+    key = QPixmapCache::insert(p4);
+    p4.detach();
 
-    //The int part of the API
+    QPixmap p5(10,10);
     QList keys;
     for (int i = 0; i < 4000; ++i)
-        QPixmapCache::insert(p1);
+        QPixmapCache::insert(p5);
 
     //at that time the first key has been erase because no more place in the cache
     QVERIFY(QPixmapCache::find(key, &p1) == 0);
@@ -257,8 +267,10 @@ void tst_QPixmapCache::insert()
         QPixmapCache::insert("0", p1);
 
     // ditto
-    for (int j = 0; j < numberOfKeys; ++j)
-        QPixmapCache::insert(QString::number(j), p1);
+    for (int j = 0; j < numberOfKeys; ++j) {
+        QPixmap p3(10, 10);
+        QPixmapCache::insert(QString::number(j), p3);
+    }
 
     int num = 0;
     for (int k = 0; k < numberOfKeys; ++k) {
@@ -286,8 +298,10 @@ void tst_QPixmapCache::insert()
     //The int part of the API
     // make sure it doesn't explode
     QList keys;
-    for (int i = 0; i < numberOfKeys; ++i)
-        keys.append(QPixmapCache::insert(p1));
+    for (int i = 0; i < numberOfKeys; ++i) {
+        QPixmap p3(10,10);
+        keys.append(QPixmapCache::insert(p3));
+    }
 
     num = 0;
     for (int k = 0; k < numberOfKeys; ++k) {
-- 
cgit v0.12


From 0f9f07c52310c33433dcdf5db3e9d02c695b85af Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 12 May 2010 08:45:12 +1000
Subject: Document Component::createObject() parent argument.

Task-number: QTBUG-10617
---
 src/declarative/QmlChanges.txt                | 4 ++--
 src/declarative/qml/qdeclarativecomponent.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index dfc4244..9f618d8 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -7,7 +7,7 @@ Component: isReady, isLoading, isError and isNull properties removed, use
 QList models no longer provide properties in model object.  The
 properties are now updated when the object changes.  An object's property
 "foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo"
-
+component.createObject has gained a mandatory "parent" argument
 
 C++ API
 -------
@@ -15,7 +15,7 @@ QDeclarativeExpression::value() has been renamed to
 QDeclarativeExpression::evaluate()
 
 =============================================================================
-The changes below are pre Qt 4.7.0 beta
+The changes below are pre Qt 4.7.0 beta 1
 
 TextEdit: wrap property is replaced by wrapMode enumeration.
 Text: wrap property is replaced by wrapMode enumeration.
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index afdaee8..e757675 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -545,7 +545,7 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
 }
 
 /*!
-    \qmlmethod object Component::createObject()
+    \qmlmethod object Component::createObject(parent)
     Returns an object instance from this component, or null if object creation fails.
 
     The object will be created in the same context as the one in which the component
-- 
cgit v0.12


From 6527735ff53a8ec593f5f85b037de46059e1207e Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Wed, 12 May 2010 09:24:30 +1000
Subject: Ensure PathView "attribute" attached properties are created correctly
 If an item was created spontaneously (i.e. delegate is a package and some
 other view created the item), ensure its attached properties are correctly
 initialized.

Task-number: QTBUG-10527
---
 src/declarative/graphicsitems/qdeclarativepath.cpp | 11 +++
 .../graphicsitems/qdeclarativepathview.cpp         | 42 ++++++++---
 .../graphicsitems/qdeclarativepathview_p.h         |  1 +
 .../qdeclarativepathview/data/pathview_package.qml | 88 ++++++++++++++++++++++
 .../tst_qdeclarativepathview.cpp                   | 17 +++++
 5 files changed, 147 insertions(+), 12 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml

diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index 4d8b619..3d0df87 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -322,6 +322,17 @@ QPainterPath QDeclarativePath::path() const
 QStringList QDeclarativePath::attributes() const
 {
     Q_D(const QDeclarativePath);
+    if (!d->componentComplete) {
+        QSet attrs;
+
+        // First gather up all the attributes
+        foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
+            if (QDeclarativePathAttribute *attribute =
+                qobject_cast(pathElement))
+                attrs.insert(attribute->name());
+        }
+        return attrs.toList();
+    }
     return d->_attributes;
 }
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 040fc98..503d096 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -98,9 +98,8 @@ QDeclarativeItem *QDeclarativePathViewPrivate::getItem(int modelIndex)
         if (!attType) {
             // pre-create one metatype to share with all attached objects
             attType = new QDeclarativeOpenMetaObjectType(&QDeclarativePathViewAttached::staticMetaObject, qmlEngine(q));
-            foreach(const QString &attr, path->attributes()) {
+            foreach(const QString &attr, path->attributes())
                 attType->createProperty(attr.toUtf8());
-            }
         }
         qPathViewAttachedType = attType;
         QDeclarativePathViewAttached *att = static_cast(qmlAttachedPropertiesObject(item));
@@ -418,7 +417,7 @@ void QDeclarativePathView::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this), this);
             d->ownModel = true;
         }
         if (QDeclarativeVisualDataModel *dataModel = qobject_cast(d->model))
@@ -471,12 +470,14 @@ void QDeclarativePathView::setPath(QDeclarativePath *path)
         disconnect(d->path, SIGNAL(changed()), this, SLOT(refill()));
     d->path = path;
     connect(d->path, SIGNAL(changed()), this, SLOT(refill()));
-    d->clear();
-    if (d->attType) {
-        d->attType->release();
-        d->attType = 0;
+    if (d->isValid() && isComponentComplete()) {
+        d->clear();
+        if (d->attType) {
+            d->attType->release();
+            d->attType = 0;
+        }
+        d->regenerate();
     }
-    d->regenerate();
     emit pathChanged();
 }
 
@@ -1119,7 +1120,8 @@ void QDeclarativePathView::refill()
         while ((pos > startPos || !d->items.count()) && d->items.count() < count) {
 //            qDebug() << "append" << idx;
             QDeclarativeItem *item = d->getItem(idx);
-            item->setZValue(idx+1);
+            if (d->model->completePending())
+                item->setZValue(idx+1);
             if (d->currentIndex == idx) {
                 item->setFocus(true);
                 if (QDeclarativePathViewAttached *att = d->attached(item))
@@ -1132,7 +1134,8 @@ void QDeclarativePathView::refill()
                 d->firstIndex = idx;
             d->items.append(item);
             d->updateItem(item, pos);
-            d->model->completeItem();
+            if (d->model->completePending())
+                d->model->completeItem();
             ++idx;
             if (idx >= d->model->count())
                 idx = 0;
@@ -1146,7 +1149,8 @@ void QDeclarativePathView::refill()
         while (pos >= 0.0 && pos < startPos) {
 //            qDebug() << "prepend" << idx;
             QDeclarativeItem *item = d->getItem(idx);
-            item->setZValue(idx+1);
+            if (d->model->completePending())
+                item->setZValue(idx+1);
             if (d->currentIndex == idx) {
                 item->setFocus(true);
                 if (QDeclarativePathViewAttached *att = d->attached(item))
@@ -1157,7 +1161,8 @@ void QDeclarativePathView::refill()
             }
             d->items.prepend(item);
             d->updateItem(item, pos);
-            d->model->completeItem();
+            if (d->model->completePending())
+                d->model->completeItem();
             d->firstIndex = idx;
             idx = d->firstIndex - 1;
             if (idx < 0)
@@ -1269,6 +1274,19 @@ void QDeclarativePathView::createdItem(int index, QDeclarativeItem *item)
 {
     Q_D(QDeclarativePathView);
     if (d->requestedIndex != index) {
+        if (!d->attType) {
+            // pre-create one metatype to share with all attached objects
+            d->attType = new QDeclarativeOpenMetaObjectType(&QDeclarativePathViewAttached::staticMetaObject, qmlEngine(this));
+            foreach(const QString &attr, d->path->attributes())
+                d->attType->createProperty(attr.toUtf8());
+        }
+        qPathViewAttachedType = d->attType;
+        QDeclarativePathViewAttached *att = static_cast(qmlAttachedPropertiesObject(item));
+        qPathViewAttachedType = 0;
+        if (att) {
+            att->m_view = this;
+            att->setOnPath(false);
+        }
         item->setParentItem(this);
         d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
     }
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index 7240578..85f47fd 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -215,6 +215,7 @@ Q_SIGNALS:
 
 private:
     friend class QDeclarativePathViewPrivate;
+    friend class QDeclarativePathView;
     QDeclarativePathView *m_view;
     QDeclarativeOpenMetaObject *m_metaobject;
     bool m_onPath : 1;
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
new file mode 100644
index 0000000..082da13
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
@@ -0,0 +1,88 @@
+import Qt 4.7
+
+Item {
+    width: 800; height: 600
+    Component {
+        id: photoDelegate
+        Package {
+            Item { id: pathItem; objectName: "pathItem"; Package.name: 'path'; width: 85; height: 85; scale: pathItem.PathView.scale }
+            Item { id: linearItem; Package.name: 'linear'; width: 85; height: 85 }
+            Rectangle {
+                id: wrapper
+                width: 85; height: 85; color: lColor
+
+                transform: Rotation {
+                    id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
+                    axis.y: 1; axis.z: 0
+                }
+                state: 'path'
+                states: [
+                    State {
+                        name: 'path'
+                        ParentChange { target: wrapper; parent: pathItem; x: 0; y: 0 }
+                        PropertyChanges { target: wrapper; opacity: pathItem.PathView.onPath ? 1.0 : 0 }
+                    }
+                ]
+            }
+        }
+    }
+    ListModel {
+        id: rssModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "thistle" }
+    }
+    VisualDataModel { id: visualModel; model: rssModel; delegate: photoDelegate }
+
+    PathView {
+        id: photoPathView
+        objectName: "photoPathView"
+        width: 800; height: 330; pathItemCount: 4; offset: 1
+        dragMargin: 24
+        preferredHighlightBegin: 0.50
+        preferredHighlightEnd: 0.50
+
+        path: Path {
+            startX: -50; startY: 40;
+
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: -45 }
+
+            PathCubic {
+                x: 400; y: 220
+                control1X: 140; control1Y: 40
+                control2X: 210; control2Y: 220
+            }
+
+            PathAttribute { name: "scale"; value: 1.2  }
+            PathAttribute { name: "angle"; value: 0 }
+
+            PathCubic {
+                x: 850; y: 40
+                control2X: 660; control2Y: 40
+                control1X: 590; control1Y: 220
+            }
+
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: 45 }
+        }
+
+        model: visualModel.parts.path
+    }
+
+    PathView {
+        y: 400; width: 800; height: 330; pathItemCount: 8
+
+        path: Path {
+            startX: 0; startY: 40;
+            PathLine { x: 800; y: 40 }
+        }
+
+        model: visualModel.parts.linear
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index c32e9cc..62d0b89 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -78,6 +78,7 @@ private slots:
     void componentChanges();
     void modelChanges();
     void pathUpdateOnStartChanged();
+    void package();
 
 
 private:
@@ -695,6 +696,22 @@ void tst_QDeclarativePathView::pathUpdateOnStartChanged()
     delete canvas;
 }
 
+void tst_QDeclarativePathView::package()
+{
+    QDeclarativeView *canvas = createView();
+    QVERIFY(canvas);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview_package.qml"));
+
+    QDeclarativePathView *pathView = canvas->rootObject()->findChild("photoPathView");
+    QVERIFY(pathView);
+
+    QDeclarativeItem *item = findItem(pathView, "pathItem");
+    QVERIFY(item);
+    QVERIFY(item->scale() != 1.0);
+
+    delete canvas;
+}
+
 QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
-- 
cgit v0.12


From 6a3bbb128046942b169a3f7e6c0cf14397662d83 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Fri, 7 May 2010 15:58:10 +1000
Subject: Clean up

---
 doc/src/declarative/qdeclarativeintro.qdoc      | 5 ++++-
 examples/declarative/xmldata/daringfireball.qml | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index a98c9e1..acf4ec9 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -60,10 +60,13 @@ technologies like HTML and CSS, but it's not required.
 QML looks like this:
 
 \code
+import Qt 4.7
+
 Rectangle {
     width: 200
     height: 200
-    color: "white"
+    color: "blue"
+
     Image {
         source: "pics/logo.png"
         anchors.centerIn: parent
diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml
index a1df809..480b13c 100644
--- a/examples/declarative/xmldata/daringfireball.qml
+++ b/examples/declarative/xmldata/daringfireball.qml
@@ -1,7 +1,6 @@
 import Qt 4.7
 
 Rectangle {
-    color: "white"
     width: 600; height: 600
 
     XmlListModel {
-- 
cgit v0.12


From ef23de2b16f3eaf6621c9407f7d921d55e380982 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Tue, 11 May 2010 11:53:25 +1000
Subject: QDeclarativeViewPrivate should subclass QGraphicsViewPrivate

Task-number: QTBUG-10528
---
 src/declarative/util/qdeclarativeview.cpp | 45 ++++++++++++++++++++++---------
 src/declarative/util/qdeclarativeview.h   |  3 +--
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 833e284..e68ef94 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -128,19 +128,18 @@ void FrameBreakAnimation::updateCurrentTime(int msecs)
     server->frameBreak();
 }
 
-class QDeclarativeViewPrivate : public QDeclarativeItemChangeListener
+class QDeclarativeViewPrivate : public QGraphicsViewPrivate, public QDeclarativeItemChangeListener
 {
+    Q_DECLARE_PUBLIC(QDeclarativeView)
 public:
-    QDeclarativeViewPrivate(QDeclarativeView *view)
-        : q(view), root(0), declarativeItemRoot(0), graphicsWidgetRoot(0), component(0), resizeMode(QDeclarativeView::SizeViewToRootObject) {}
+    QDeclarativeViewPrivate()
+        : root(0), declarativeItemRoot(0), graphicsWidgetRoot(0), component(0), resizeMode(QDeclarativeView::SizeViewToRootObject) {}
     ~QDeclarativeViewPrivate() { delete root; }
     void execute();
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     void initResize();
     void updateSize();
-    inline QSize rootObjectSize();
-
-    QDeclarativeView *q;
+    inline QSize rootObjectSize() const;
 
     QDeclarativeGuard root;
     QDeclarativeGuard declarativeItemRoot;
@@ -162,6 +161,7 @@ public:
 
 void QDeclarativeViewPrivate::execute()
 {
+    Q_Q(QDeclarativeView);
     if (root) {
         delete root;
         root = 0;
@@ -182,6 +182,7 @@ void QDeclarativeViewPrivate::execute()
 
 void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
+    Q_Q(QDeclarativeView);
     if (resizeItem == root && resizeMode == QDeclarativeView::SizeViewToRootObject) {
         // wait for both width and height to be changed
         resizetimer.start(0,q);
@@ -250,8 +251,9 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
   Constructs a QDeclarativeView with the given \a parent.
 */
 QDeclarativeView::QDeclarativeView(QWidget *parent)
-: QGraphicsView(parent), d(new QDeclarativeViewPrivate(this))
+    : QGraphicsView(*(new QDeclarativeViewPrivate), parent)
 {
+    Q_D(QDeclarativeView);
     setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
     d->init();
 }
@@ -262,8 +264,9 @@ QDeclarativeView::QDeclarativeView(QWidget *parent)
   Constructs a QDeclarativeView with the given QML \a source and \a parent.
 */
 QDeclarativeView::QDeclarativeView(const QUrl &source, QWidget *parent)
-: QGraphicsView(parent), d(new QDeclarativeViewPrivate(this))
+    : QGraphicsView(*(new QDeclarativeViewPrivate), parent)
 {
+    Q_D(QDeclarativeView);
     setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
     d->init();
     setSource(source);
@@ -271,6 +274,7 @@ QDeclarativeView::QDeclarativeView(const QUrl &source, QWidget *parent)
 
 void QDeclarativeViewPrivate::init()
 {
+    Q_Q(QDeclarativeView);
     q->setScene(&scene);
 
     q->setOptimizationFlags(QGraphicsView::DontSavePainterState);
@@ -288,12 +292,10 @@ void QDeclarativeViewPrivate::init()
 }
 
 /*!
-  The destructor clears the view's \l {QGraphicsObject} {items} and
-  deletes the internal representation.
+    Destroys the view.
  */
 QDeclarativeView::~QDeclarativeView()
 {
-    delete d;
 }
 
 /*! \property QDeclarativeView::source
@@ -316,6 +318,7 @@ QDeclarativeView::~QDeclarativeView()
  */
 void QDeclarativeView::setSource(const QUrl& url)
 {
+    Q_D(QDeclarativeView);
     d->source = url;
     d->execute();
 }
@@ -327,6 +330,7 @@ void QDeclarativeView::setSource(const QUrl& url)
  */
 QUrl QDeclarativeView::source() const
 {
+    Q_D(const QDeclarativeView);
     return d->source;
 }
 
@@ -336,6 +340,7 @@ QUrl QDeclarativeView::source() const
  */
 QDeclarativeEngine* QDeclarativeView::engine()
 {
+    Q_D(QDeclarativeView);
     return &d->engine;
 }
 
@@ -348,6 +353,7 @@ QDeclarativeEngine* QDeclarativeView::engine()
  */
 QDeclarativeContext* QDeclarativeView::rootContext()
 {
+    Q_D(QDeclarativeView);
     return d->engine.rootContext();
 }
 
@@ -376,6 +382,7 @@ QDeclarativeContext* QDeclarativeView::rootContext()
 
 QDeclarativeView::Status QDeclarativeView::status() const
 {
+    Q_D(const QDeclarativeView);
     if (!d->component)
         return QDeclarativeView::Null;
 
@@ -388,6 +395,7 @@ QDeclarativeView::Status QDeclarativeView::status() const
 */
 QList QDeclarativeView::errors() const
 {
+    Q_D(const QDeclarativeView);
     if (d->component)
         return d->component->errors();
     return QList();
@@ -410,6 +418,7 @@ QList QDeclarativeView::errors() const
 
 void QDeclarativeView::setResizeMode(ResizeMode mode)
 {
+    Q_D(QDeclarativeView);
     if (d->resizeMode == mode)
         return;
 
@@ -433,6 +442,7 @@ void QDeclarativeView::setResizeMode(ResizeMode mode)
 
 void QDeclarativeViewPrivate::initResize()
 {
+    Q_Q(QDeclarativeView);
     if (declarativeItemRoot) {
         if (resizeMode == QDeclarativeView::SizeViewToRootObject) {
             QDeclarativeItemPrivate *p =
@@ -449,6 +459,7 @@ void QDeclarativeViewPrivate::initResize()
 
 void QDeclarativeViewPrivate::updateSize()
 {
+    Q_Q(QDeclarativeView);
     if (!root)
         return;
     if (declarativeItemRoot) {
@@ -479,7 +490,7 @@ void QDeclarativeViewPrivate::updateSize()
     q->updateGeometry();
 }
 
-QSize QDeclarativeViewPrivate::rootObjectSize()
+QSize QDeclarativeViewPrivate::rootObjectSize() const
 {
     QSize rootObjectSize(0,0);
     int widthCandidate = -1;
@@ -500,6 +511,7 @@ QSize QDeclarativeViewPrivate::rootObjectSize()
 
 QDeclarativeView::ResizeMode QDeclarativeView::resizeMode() const
 {
+    Q_D(const QDeclarativeView);
     return d->resizeMode;
 }
 
@@ -508,7 +520,7 @@ QDeclarativeView::ResizeMode QDeclarativeView::resizeMode() const
  */
 void QDeclarativeView::continueExecute()
 {
-
+    Q_D(QDeclarativeView);
     disconnect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
 
     if (d->component->isError()) {
@@ -541,6 +553,7 @@ void QDeclarativeView::continueExecute()
 */
 void QDeclarativeView::setRootObject(QObject *obj)
 {
+    Q_D(QDeclarativeView);
     if (d->root == obj)
         return;
     if (QDeclarativeItem *declarativeItem = qobject_cast(obj)) {
@@ -590,6 +603,7 @@ void QDeclarativeView::setRootObject(QObject *obj)
  */
 void QDeclarativeView::timerEvent(QTimerEvent* e)
 {
+    Q_D(QDeclarativeView);
     if (!e || e->timerId() == d->resizetimer.timerId()) {
         d->updateSize();
         d->resizetimer.stop();
@@ -599,6 +613,7 @@ void QDeclarativeView::timerEvent(QTimerEvent* e)
 /*! \reimp */
 bool QDeclarativeView::eventFilter(QObject *watched, QEvent *e)
 {
+    Q_D(QDeclarativeView);
     if (watched == d->root && d->resizeMode == SizeViewToRootObject) {
         if (d->graphicsWidgetRoot) {
             if (e->type() == QEvent::GraphicsSceneResize) {
@@ -615,6 +630,7 @@ bool QDeclarativeView::eventFilter(QObject *watched, QEvent *e)
 */
 QSize QDeclarativeView::sizeHint() const
 {
+    Q_D(const QDeclarativeView);
     QSize rootObjectSize = d->rootObjectSize();
     if (rootObjectSize.isEmpty()) {
         return size();
@@ -628,6 +644,7 @@ QSize QDeclarativeView::sizeHint() const
  */
 QGraphicsObject *QDeclarativeView::rootObject() const
 {
+    Q_D(const QDeclarativeView);
     return d->root;
 }
 
@@ -638,6 +655,7 @@ QGraphicsObject *QDeclarativeView::rootObject() const
  */
 void QDeclarativeView::resizeEvent(QResizeEvent *e)
 {
+    Q_D(QDeclarativeView);
     if (d->resizeMode == SizeRootObjectToView) {
         d->updateSize();
     }
@@ -657,6 +675,7 @@ void QDeclarativeView::resizeEvent(QResizeEvent *e)
 */
 void QDeclarativeView::paintEvent(QPaintEvent *event)
 {
+    Q_D(QDeclarativeView);
     int time = 0;
     if (frameRateDebug() || QDeclarativeViewDebugServer::isDebuggingEnabled())
         time = d->frameTimer.restart();
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index 3513c04..e9cff32 100644
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -106,9 +106,8 @@ protected:
     virtual bool eventFilter(QObject *watched, QEvent *e);
 
 private:
-    friend class QDeclarativeViewPrivate;
-    QDeclarativeViewPrivate *d;
     Q_DISABLE_COPY(QDeclarativeView)
+    Q_DECLARE_PRIVATE(QDeclarativeView)
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 0b715811609b86f9332ffd49aea08f4a4b634d21 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Tue, 11 May 2010 13:47:08 +1000
Subject: Improve XmlListModel::namespaceDeclarations() docs

Task-number: QTBUG-10522
---
 src/declarative/util/qdeclarativexmllistmodel.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index ae3b5d7..b9afa1f 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -479,7 +479,6 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty
Date: Tue, 11 May 2010 17:23:11 +1000
Subject: Doc improvements

---
 doc/src/declarative/advtutorial.qdoc              |  2 +-
 doc/src/declarative/codingconventions.qdoc        |  1 -
 doc/src/declarative/extending-examples.qdoc       |  8 +--
 doc/src/declarative/qmlruntime.qdoc               |  2 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp | 68 +++++++++++++++++------
 5 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 8f95190..47504ae 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -105,7 +105,7 @@ is the \l SystemPalette item. This provides access to the Qt system palette
 and is used to give the button a more native look-and-feel.
 
 Notice the anchors for the \c Item, \c Button and \c Text elements are set using
-\l {codingconventions.html#Grouped-properties}{group notation} for readability.
+\l {qdeclarativeintroduction.html#dot-properties}{group notation} for readability.
 
 \section2 Adding \c Button and \c Block components
 
diff --git a/doc/src/declarative/codingconventions.qdoc b/doc/src/declarative/codingconventions.qdoc
index d0f873d..4fa7d0c 100644
--- a/doc/src/declarative/codingconventions.qdoc
+++ b/doc/src/declarative/codingconventions.qdoc
@@ -72,7 +72,6 @@ For example, a hypothetical \e photo QML object would look like this:
 \snippet doc/src/snippets/declarative/codingconventions/photo.qml 0
 
 
-\target Grouped properties
 \section1 Grouped properties
 
 If using multiple properties from a group of properties,
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/declarative/extending-examples.qdoc
index 307162e..611dac1 100644
--- a/doc/src/declarative/extending-examples.qdoc
+++ b/doc/src/declarative/extending-examples.qdoc
@@ -64,8 +64,8 @@ element, the C++ class can be named differently, or appear in a namespace.
 The Person class implementation is quite basic.  The property accessors simply
 return members of the object instance.
 
-The implementation must also be registered using the QML_REGISTER_TYPE() macro.  This macro
-registers the Person class with QML as a type in the People library version 1.0,
+The \c main.cpp file also calls the \c qmlRegisterType() function to
+register the \c Person type with QML as a type in the People library version 1.0,
 and defines the mapping between the C++ and QML class names.
 
 \section1 Running the example
@@ -159,9 +159,7 @@ directly - an explicit Boy or Girl should be instantiated instead.
 
 While we want to disallow instantiating Person from within QML, it still needs
 to be registered with the QML engine, so that it can be used as a property type
-and other types can be coerced to it.  To register a type, without defining a
-named mapping into QML, we call the QML_REGISTER_NOCREATE_TYPE() macro instead of
-the QML_REGISTER_TYPE() macro used previously.
+and other types can be coerced to it.
 
 \section2 Define Boy and Girl
 
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index 23c5c32..10aeac0 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -123,7 +123,7 @@
 
     Such files can be created using \l{Qt Linguist}.
 
-    See \l{scripting.html#internationalization} for information about how to make
+    See the \l{scripting.html#internationalization}{Qt Internationalization} documentation for information about how to make
     the JavaScript in QML files use translatable strings.
 
     Additionally, the QML runtime will load translation files specified on the
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index b9afa1f..f02ed16 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -472,39 +472,71 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty
+    
+        ...
+        
+            
+                Item A
+                Sat, 07 Sep 2010 10:00:01 GMT
+            
+            
+                Item B
+                Sat, 07 Sep 2010 15:35:01 GMT
+            
+        
+    
+    \endcode
+
+    Then it could be used to create the following model:
 
-    Here is an example of a model containing news from a Yahoo RSS feed:
     \qml
     XmlListModel {
-        source: "http://rss.news.yahoo.com/rss/oceania"
+        source: "http://www.mysite.com/feed.xml"
         query: "/rss/channel/item"
         XmlRole { name: "title"; query: "title/string()" }
         XmlRole { name: "pubDate"; query: "pubDate/string()" }
-        XmlRole { name: "description"; query: "description/string()" }
     }
     \endqml
 
-    You can also define certain roles as "keys" so that the model only adds data
-    that contains new values for these keys when reload() is called.
+    The \l {XmlListModel::query}{query} value of "/rss/channel/item" specifies that the XmlListModel should generate
+    a model item for each \c  in the XML document. The XmlRole objects define the
+    model item attributes; here, each model item will have \c title and \c pubDate 
+    attributes that match the \c title and \c pubDate values of its corresponding \c .
 
-    For example, if the roles above were defined like this:
+
+    \section2 Using key XML roles
+
+    You can define certain roles as "keys" so that when reload() is called,
+    the model will only add and refresh data that contains new values for
+    these keys.
+
+    For example, if above role for "pubDate" was defined like this instead:
 
     \qml
-        XmlRole { name: "title"; query: "title/string()"; isKey: true }
         XmlRole { name: "pubDate"; query: "pubDate/string()"; isKey: true }
     \endqml
 
-    Then when reload() is called, the model will only add new items with a
-    "title" and "pubDate" value combination that is not already present in
-    the model.
+    Then when reload() is called, the model will only add and reload
+    items with a "pubDate" value that is not already 
+    present in the model. 
 
-    This is useful to provide incremental updates and avoid repainting an
-    entire model in a view.
+    This is useful when displaying the contents of XML documents that
+    are incrementally updated (such as RSS feeds) to avoid repainting the
+    entire contents of a model in a view.
 
-    \sa {QtDeclarative}
+    If multiple key roles are specified, the model only adds and reload items
+    with a combined value of all key roles that is not already present in
+    the model.
+
+    \sa {declarative/xmldata}{XML data example}
 */
 
 QDeclarativeXmlListModel::QDeclarativeXmlListModel(QObject *parent)
@@ -625,8 +657,8 @@ void QDeclarativeXmlListModel::setXml(const QString &xml)
 
 /*!
     \qmlproperty string XmlListModel::query
-    An absolute XPath query representing the base query for the model items. The query should start with
-    '/' or '//'.
+    An absolute XPath query representing the base query for creating model items
+    from this model's XmlRole objects. The query should start with '/' or '//'.
 */
 QString QDeclarativeXmlListModel::query() const
 {
@@ -747,7 +779,7 @@ void QDeclarativeXmlListModel::componentComplete()
     Otherwise, items are only added if the model does not already
     contain items with matching key role values.
     
-    \sa XmlRole::isKey
+    \sa {Using key XML roles}, XmlRole::isKey
 */
 void QDeclarativeXmlListModel::reload()
 {
-- 
cgit v0.12


From 1b2b9ba6b4cea31d679aeae915e590ddbf1da945 Mon Sep 17 00:00:00 2001
From: Alexis Menard 
Date: Tue, 11 May 2010 03:23:21 +0200
Subject: Don't use Q_UNUSED if you use parameters.

That's many "use" in the sentence.

Task-number:QT-1652
Reviewed-by:TrustMe
---
 src/gui/graphicsview/qgraphicsview.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 0bba7e9..9519ca0 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -1819,8 +1819,6 @@ void QGraphicsView::centerOn(const QGraphicsItem *item)
 void QGraphicsView::ensureVisible(const QRectF &rect, int xmargin, int ymargin)
 {
     Q_D(QGraphicsView);
-    Q_UNUSED(xmargin);
-    Q_UNUSED(ymargin);
     qreal width = viewport()->width();
     qreal height = viewport()->height();
     QRectF viewRect = d->matrix.mapRect(rect);
-- 
cgit v0.12


From 855368e447a1db8f72c1ad135b9edfb9c373a01d Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 12 May 2010 11:33:56 +1000
Subject: Qt.widgets was removed, point to graphics layouts example

---
 doc/src/declarative/integrating.qdoc               | 50 ++----------------
 .../declarative/graphicswidgets/bluecircle.h       | 55 -------------------
 .../graphicswidgets/graphicswidgets.pro            | 13 -----
 .../snippets/declarative/graphicswidgets/main.qml  | 32 ------------
 .../snippets/declarative/graphicswidgets/qmldir    |  1 -
 .../declarative/graphicswidgets/redsquare.h        | 54 -------------------
 .../declarative/graphicswidgets/shapesplugin.cpp   | 61 ----------------------
 7 files changed, 5 insertions(+), 261 deletions(-)
 delete mode 100644 doc/src/snippets/declarative/graphicswidgets/bluecircle.h
 delete mode 100644 doc/src/snippets/declarative/graphicswidgets/graphicswidgets.pro
 delete mode 100644 doc/src/snippets/declarative/graphicswidgets/main.qml
 delete mode 100644 doc/src/snippets/declarative/graphicswidgets/qmldir
 delete mode 100644 doc/src/snippets/declarative/graphicswidgets/redsquare.h
 delete mode 100644 doc/src/snippets/declarative/graphicswidgets/shapesplugin.cpp

diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 1c07f8e..972976f 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -110,51 +110,11 @@ of QML UIs:
 \section2 Loading QGraphicsWidget objects in QML
 
 An alternative approach is to expose your existing QGraphicsWidget objects to 
-QML and construct your scene in QML instead. To do this, you need to register
-any custom C++ types and create a plugin that registers the custom types
-so that they can be used from your QML file.
+QML and construct your scene in QML instead. See the \l {declarative/layouts/graphicsLayouts}{graphics layouts example}
+which shows how to expose Qt's graphics layout classes to QML in order
+to use QGraphicsWidget with classes like QGraphicsLinearLayout and QGraphicsGridLayout.
 
-Here is an example. Suppose you have two classes, \c RedSquare and \c BlueCircle,
-that both inherit from QGraphicsWidget:
-
-\c [graphicswidgets/redsquare.h]
-\snippet doc/src/snippets/declarative/graphicswidgets/redsquare.h 0
-
-\c [graphicswidgets/bluecircle.h]
-\snippet doc/src/snippets/declarative/graphicswidgets/bluecircle.h 0
-
-Then, create a plugin by subclassing QDeclarativeExtensionPlugin, and register the
-types by calling qmlRegisterType(). Also export the plugin with Q_EXPORT_PLUGIN2.
-
-\c [graphicswidgets/shapesplugin.cpp]
-\snippet doc/src/snippets/declarative/graphicswidgets/shapesplugin.cpp 0
-
-Now write a project file that creates the plugin:
-
-\c [graphicswidgets/graphicswidgets.pro]
-\quotefile doc/src/snippets/declarative/graphicswidgets/graphicswidgets.pro
-
-And add a \c qmldir file that includes the \c graphicswidgets plugin from the \c lib
-subdirectory (as defined in the project file):
-
-\c [graphicswidgets/qmldir]
-\quotefile doc/src/snippets/declarative/graphicswidgets/qmldir
-
-Now, we can write a QML file that uses the \c RedSquare and \c BlueCircle widgets.
-(As an example, we can also create \c QGraphicsWidget items if we import the \c Qt.widgets
-module.)
-
-\c [main.qml]
-\quotefile doc/src/snippets/declarative/graphicswidgets/main.qml
-
-Here is a screenshot of the result:
-
-\image declarative-integrating-graphicswidgets.png 
-
-
-Note this approach of creating your graphics objects from QML does not work
-with QGraphicsItems that are not QGraphicsObject-based, since they are not QObjects.
-
-See \l{Extending QML in C++} for further information on using C++ types.
+To expose your existing QGraphicsWidget classes to QML, use \l {qmlRegisterType()}.
+See \l{Extending QML in C++} for further information on using C++ types in QML.
 
 */
diff --git a/doc/src/snippets/declarative/graphicswidgets/bluecircle.h b/doc/src/snippets/declarative/graphicswidgets/bluecircle.h
deleted file mode 100644
index 73d66b7..0000000
--- a/doc/src/snippets/declarative/graphicswidgets/bluecircle.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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$
-**
-****************************************************************************/
-//![0]
-#include 
-#include 
-
-class BlueCircle : public QGraphicsWidget
-{
-    Q_OBJECT
-public:
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-    {
-        painter->setPen(QColor(Qt::blue));
-        painter->drawEllipse(0, 0, size().width(), size().height());
-    }
-};
-//![0]
diff --git a/doc/src/snippets/declarative/graphicswidgets/graphicswidgets.pro b/doc/src/snippets/declarative/graphicswidgets/graphicswidgets.pro
deleted file mode 100644
index 21c8a37..0000000
--- a/doc/src/snippets/declarative/graphicswidgets/graphicswidgets.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative
-
-HEADERS += redsquare.h \
-           bluecircle.h
-
-SOURCES += shapesplugin.cpp
-
-DESTDIR = lib
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
-
diff --git a/doc/src/snippets/declarative/graphicswidgets/main.qml b/doc/src/snippets/declarative/graphicswidgets/main.qml
deleted file mode 100644
index ffcf79d..0000000
--- a/doc/src/snippets/declarative/graphicswidgets/main.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-import Qt 4.7
-import Qt.widgets 4.7
-
-Rectangle {
-    width: 200
-    height: 200
-
-    RedSquare { 
-        id: square
-        width: 80
-        height: 80
-    }
-
-    BlueCircle {
-        anchors.left: square.right
-        width: 80
-        height: 80
-    }
-
-    QGraphicsWidget {
-        anchors.top: square.bottom
-        size.width: 80
-        size.height: 80
-        layout: QGraphicsLinearLayout {
-            LayoutItem {
-                preferredSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-        }
-    }
-}
-
diff --git a/doc/src/snippets/declarative/graphicswidgets/qmldir b/doc/src/snippets/declarative/graphicswidgets/qmldir
deleted file mode 100644
index f94dad2..0000000
--- a/doc/src/snippets/declarative/graphicswidgets/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin graphicswidgets lib
diff --git a/doc/src/snippets/declarative/graphicswidgets/redsquare.h b/doc/src/snippets/declarative/graphicswidgets/redsquare.h
deleted file mode 100644
index 3050662..0000000
--- a/doc/src/snippets/declarative/graphicswidgets/redsquare.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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$
-**
-****************************************************************************/
-//![0]
-#include 
-#include 
-
-class RedSquare : public QGraphicsWidget
-{
-    Q_OBJECT
-public:
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-    {
-        painter->fillRect(0, 0, size().width(), size().height(), QColor(Qt::red));
-    }
-};
-//![0]
diff --git a/doc/src/snippets/declarative/graphicswidgets/shapesplugin.cpp b/doc/src/snippets/declarative/graphicswidgets/shapesplugin.cpp
deleted file mode 100644
index 4c18ef3..0000000
--- a/doc/src/snippets/declarative/graphicswidgets/shapesplugin.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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$
-**
-****************************************************************************/
-//![0]
-#include "redsquare.h"
-#include "bluecircle.h"
-
-#include 
-#include 
-
-class ShapesPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    void registerTypes(const char *uri) {
-        qmlRegisterType(uri, 1, 0, "RedSquare");
-        qmlRegisterType(uri, 1, 0, "BlueCircle");
-    }
-};
-
-#include "shapesplugin.moc"
-
-Q_EXPORT_PLUGIN2(shapesplugin, ShapesPlugin);
-//![0]
-- 
cgit v0.12


From 34f9f08dd290710512fb7dc8a4d473b6e08c84b4 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 12 May 2010 11:40:23 +1000
Subject: Remove unused image

---
 .../images/declarative-integrating-graphicswidgets.png   | Bin 1061 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 doc/src/images/declarative-integrating-graphicswidgets.png

diff --git a/doc/src/images/declarative-integrating-graphicswidgets.png b/doc/src/images/declarative-integrating-graphicswidgets.png
deleted file mode 100644
index d57f4b9..0000000
Binary files a/doc/src/images/declarative-integrating-graphicswidgets.png and /dev/null differ
-- 
cgit v0.12


From f303375383ff405afbbe78ec2c951f2e24a121be Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 12 May 2010 10:36:34 +1000
Subject: Apply signal handler changes immediately. Fix regression in
 bindinganimation visual test introduced in
 129940723d9145a4380f7e44c06cbaa88ee4053b.

---
 src/declarative/util/qdeclarativepropertychanges.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 94780c4..a22c756 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -161,20 +161,15 @@ public:
     QDeclarativeExpression *rewindExpression;
     QDeclarativeGuard ownedExpression;
 
-    virtual bool changesBindings() { return true; }
-    virtual void clearBindings() {
-        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, 0);
-    }
-
     virtual void execute(Reason) {
-        QDeclarativePropertyPrivate::setSignalExpression(property, expression);
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression);
         if (ownedExpression == expression)
             ownedExpression = 0;
     }
 
     virtual bool isReversable() { return true; }
     virtual void reverse(Reason) {
-        QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression);
         if (ownedExpression == reverseExpression)
             ownedExpression = 0;
     }
@@ -198,7 +193,7 @@ public:
     }
 
     virtual void rewind() {
-        QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
+        ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
         if (ownedExpression == rewindExpression)
             ownedExpression = 0;
     }
-- 
cgit v0.12


From 43db14d83279566cdd5626321251efc5da8acc1d Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 12 May 2010 11:06:55 +1000
Subject: Correctly resize TextInput in the presence of preedit text.

Task-number: QTBUG-10466
Reviewed-by: alexis
---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 604f508..4d89887 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1233,9 +1233,7 @@ void QDeclarativeTextInput::updateSize(bool needsRedraw)
     int cursorWidth = d->control->cursorWidth();
     if(d->cursorItem)
         cursorWidth = d->cursorItem->width();
-    //### Is QFontMetrics too slow?
-    QFontMetricsF fm(d->font);
-    setImplicitWidth(fm.width(d->control->displayText())+cursorWidth);
+    setImplicitWidth(d->control->naturalTextWidth() + cursorWidth);
     setContentsSize(QSize(width(), height()));//Repaints if changed
     if(w==width() && h==height() && needsRedraw){
         clearCache();
-- 
cgit v0.12


From 7827b791828c3efa96143ed7a9af354883c8d926 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 12 May 2010 11:14:39 +1000
Subject: Correctly position any input method popups for TextInput.

Reviewed-by: alexis
---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 4d89887..8f86aa0 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1018,6 +1018,8 @@ QVariant QDeclarativeTextInput::inputMethodQuery(Qt::InputMethodQuery property)
 {
     Q_D(const QDeclarativeTextInput);
     switch(property) {
+    case Qt::ImMicroFocus:
+        return d->control->cursorRect();
     case Qt::ImFont:
         return font();
     case Qt::ImCursorPosition:
-- 
cgit v0.12


From 5e843ec092e2d236bd51f015b136db3fca5c10ba Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 12 May 2010 11:46:15 +1000
Subject: Bail out early if the same target value is reassigned to a Behavior.

Task-number: QTBUG-10586
Reviewed-by: leo
---
 src/declarative/util/qdeclarativebehavior.cpp      |    6 +
 .../animation/qtbug10586/data/qtbug10586.0.png     |  Bin 0 -> 1149 bytes
 .../animation/qtbug10586/data/qtbug10586.1.png     |  Bin 0 -> 1173 bytes
 .../animation/qtbug10586/data/qtbug10586.2.png     |  Bin 0 -> 1173 bytes
 .../animation/qtbug10586/data/qtbug10586.3.png     |  Bin 0 -> 1149 bytes
 .../animation/qtbug10586/data/qtbug10586.qml       | 1151 ++++++++++++++++++++
 .../qmlvisual/animation/qtbug10586/qtbug10586.qml  |   27 +
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |    5 +-
 8 files changed, 1187 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml
 create mode 100644 tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml

diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index ba90007..90e0ca3 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -62,6 +62,7 @@ public:
 
     QDeclarativeProperty property;
     QVariant currentValue;
+    QVariant targetValue;
     QDeclarativeGuard animation;
     bool enabled;
     bool finalized;
@@ -162,10 +163,15 @@ void QDeclarativeBehavior::write(const QVariant &value)
     qmlExecuteDeferred(this);
     if (!d->animation || !d->enabled || !d->finalized) {
         QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
+        d->targetValue = value;
         return;
     }
 
+    if (value == d->targetValue)
+        return;
+
     d->currentValue = d->property.read();
+    d->targetValue = value;
 
     if (d->animation->qtAnimation()->duration() != -1)
         d->animation->qtAnimation()->stop();
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png
new file mode 100644
index 0000000..d8be67b
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png
new file mode 100644
index 0000000..249e0dd
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png
new file mode 100644
index 0000000..044f823
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png
new file mode 100644
index 0000000..d8be67b
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml
new file mode 100644
index 0000000..dc8e2e2
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug10586/data/qtbug10586.qml
@@ -0,0 +1,1151 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 32
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 48
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 64
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 80
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 96
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 112
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 128
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 144
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 160
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 176
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 192
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 208
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 224
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 240
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 256
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 272
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 288
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 304
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 320
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 336
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 352
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 368
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 384
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 400
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 416
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 432
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 448
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 464
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 480
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 496
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 512
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 528
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 544
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 560
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 576
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 592
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 608
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 624
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 640
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 656
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 672
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 688
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 704
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 720
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 736
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 752
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 768
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 784
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 800
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 816
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 832
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 848
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 864
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 880
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 896
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 912
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 928
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 944
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug10586.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 992
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1008
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1024
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1040
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1056
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1072
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1088
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1104
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1120
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1136
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1152
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1168
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1184
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1200
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1216
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1232
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1248
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1264
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1280
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1296
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1312
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 174; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1344
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1360
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1376
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1392
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1408
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1424
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 1440
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 130; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1456
+        hash: "8b7dd0f0a3881f10d76b47cbec4754c3"
+    }
+    Frame {
+        msec: 1472
+        hash: "b6fc4990acb245e015c35261a3c6fd75"
+    }
+    Frame {
+        msec: 1488
+        hash: "849fa4174134804dadc000323141b341"
+    }
+    Frame {
+        msec: 1504
+        hash: "35f2d6405ed7d992bb62eb6e24478492"
+    }
+    Frame {
+        msec: 1520
+        hash: "673ebb4499522c3f27b775dff1dbbe44"
+    }
+    Frame {
+        msec: 1536
+        hash: "96945f5489ffd0dc8ab995c96eb5da43"
+    }
+    Frame {
+        msec: 1552
+        hash: "2e4543754429ac3db831a2432098c063"
+    }
+    Frame {
+        msec: 1568
+        hash: "02253fe8a9fd5009a07265c2c6ffc8e4"
+    }
+    Frame {
+        msec: 1584
+        hash: "200a89949df1e9ef58d005a139857d2c"
+    }
+    Frame {
+        msec: 1600
+        hash: "ceb28be34c7ea8eff5fa00fdea087439"
+    }
+    Frame {
+        msec: 1616
+        hash: "a9ece475c51f126094c5eff4e20f4a19"
+    }
+    Frame {
+        msec: 1632
+        hash: "aa0776f84aef87d6971affdfa2d8dd82"
+    }
+    Frame {
+        msec: 1648
+        hash: "4c74661e1c73fefc9c5154b257239352"
+    }
+    Frame {
+        msec: 1664
+        hash: "c10d23df3a75966aad5016bd8ba8e9d8"
+    }
+    Frame {
+        msec: 1680
+        hash: "41692977d654a55d3b1d037aea9f2c03"
+    }
+    Frame {
+        msec: 1696
+        hash: "2f1835a1de94f962eb5dc781c85b4c32"
+    }
+    Frame {
+        msec: 1712
+        hash: "7cb78e2e5f6d35d456c95f2bd8652eb5"
+    }
+    Frame {
+        msec: 1728
+        hash: "4388aee9b1c8b4fde43634ad08f03557"
+    }
+    Frame {
+        msec: 1744
+        hash: "1cdc71100fd11cb6e60c9ab7e65e95bf"
+    }
+    Frame {
+        msec: 1760
+        hash: "feddbf269adfc8bb1b1a3656b5b5736d"
+    }
+    Frame {
+        msec: 1776
+        hash: "76b39ce0ee9b9b4af8aa0141577b8460"
+    }
+    Frame {
+        msec: 1792
+        hash: "bac963d3df2841ab7a3770a371f3a94d"
+    }
+    Frame {
+        msec: 1808
+        hash: "403007bb6c0782fece1cedbd40994550"
+    }
+    Frame {
+        msec: 1824
+        hash: "72076c743fdd33fab2ac789c7c22973a"
+    }
+    Frame {
+        msec: 1840
+        hash: "662be553c32b0145b3f4fee9bb0d659d"
+    }
+    Frame {
+        msec: 1856
+        hash: "e6b9049949a0ee4ff8a0fcaf5464f479"
+    }
+    Frame {
+        msec: 1872
+        hash: "eb1939458851780b7bb51ee50f0a3bd7"
+    }
+    Frame {
+        msec: 1888
+        hash: "41c8d2686ddb882981a7d3a5c8c69005"
+    }
+    Frame {
+        msec: 1904
+        hash: "7d3b1fc34082a160cbea4409af85fc9c"
+    }
+    Frame {
+        msec: 1920
+        image: "qtbug10586.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "17be4a9c3d4d19e93bf1fc3a13a374a2"
+    }
+    Frame {
+        msec: 1952
+        hash: "d449593024a59487eb92195ee6b77a64"
+    }
+    Frame {
+        msec: 1968
+        hash: "c6ccbc2acec8e32f043f2cfb7b7848a9"
+    }
+    Frame {
+        msec: 1984
+        hash: "cef9f8e8cdd5e2d33b86a9a6fb64ecb4"
+    }
+    Frame {
+        msec: 2000
+        hash: "2a8956de5ce417431bdb156144985370"
+    }
+    Frame {
+        msec: 2016
+        hash: "73721425a9c658bd9d40eac3fcbe8e25"
+    }
+    Frame {
+        msec: 2032
+        hash: "9a9cf8eee0bf2f09944a4fb3b1c139d5"
+    }
+    Frame {
+        msec: 2048
+        hash: "3673cdee04343ce679ec2cebadc9f512"
+    }
+    Frame {
+        msec: 2064
+        hash: "eedd62019867e3189f9cf6e2b4149c6d"
+    }
+    Frame {
+        msec: 2080
+        hash: "7a66bc37f5cf917e8b121003af0530b0"
+    }
+    Frame {
+        msec: 2096
+        hash: "401667ed0f38858553de27164e9cadb5"
+    }
+    Frame {
+        msec: 2112
+        hash: "b391699437c4092de3ad1684a35bfd30"
+    }
+    Frame {
+        msec: 2128
+        hash: "109c91215f075292910095a25eaded49"
+    }
+    Frame {
+        msec: 2144
+        hash: "c44d3f6ce1fa1ab324dd9ef394f37f87"
+    }
+    Frame {
+        msec: 2160
+        hash: "299d43cb3dcf7b95af8803df3eb17a46"
+    }
+    Frame {
+        msec: 2176
+        hash: "7ddd97266383d954a008fbe7b95a3169"
+    }
+    Frame {
+        msec: 2192
+        hash: "941f2837ff5145a26df9a0d9f6d20bd9"
+    }
+    Frame {
+        msec: 2208
+        hash: "d99d76cba43f3ae953605d7732d6ce21"
+    }
+    Frame {
+        msec: 2224
+        hash: "929f49416f7ca80d7f5f2be3b13b849e"
+    }
+    Frame {
+        msec: 2240
+        hash: "929f49416f7ca80d7f5f2be3b13b849e"
+    }
+    Frame {
+        msec: 2256
+        hash: "fff9bbf16d1c3f7510ddfc44af616a5e"
+    }
+    Frame {
+        msec: 2272
+        hash: "70b6cdb95ad6723d18c623e1dc79a8db"
+    }
+    Frame {
+        msec: 2288
+        hash: "70b6cdb95ad6723d18c623e1dc79a8db"
+    }
+    Frame {
+        msec: 2304
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2320
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2336
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2352
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2368
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2384
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2400
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2416
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2432
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2448
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2464
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2480
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2496
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2512
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2528
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2544
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2560
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2576
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2592
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2608
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2624
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2640
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2656
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2672
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2688
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2704
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2720
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2736
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 29; y: 239
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2752
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2768
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2784
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2800
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Frame {
+        msec: 2816
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 35; y: 241
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2832
+        hash: "cdb3c12b1b0b6ab269ba7fcf75320f69"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 63; y: 243
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2848
+        hash: "2732b282b8ac482033694cd04c6f5b7e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 244
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2864
+        hash: "7d253797885f8b304d8fb3ba727a3c5d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 243
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 158; y: 243
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2880
+        image: "qtbug10586.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "d85a416e4ddf59dfd0723b0be0e2b418"
+    }
+    Frame {
+        msec: 2912
+        hash: "f1934f6ca6a3c5ac5df3451596b8d8ba"
+    }
+    Frame {
+        msec: 2928
+        hash: "28fc74a76f9eaeeccbd3063dc55a1000"
+    }
+    Frame {
+        msec: 2944
+        hash: "eb8ad8dae734b624664fcf584cda6ba0"
+    }
+    Frame {
+        msec: 2960
+        hash: "a6d0f4aba3e5ae1e003520f45b75d6dd"
+    }
+    Frame {
+        msec: 2976
+        hash: "4e5a4d04dfa5f06292774e6bf4f86508"
+    }
+    Frame {
+        msec: 2992
+        hash: "fc9e16fd8c7379d774a09fe50d4259dc"
+    }
+    Frame {
+        msec: 3008
+        hash: "721ea322d9a5e9d48117336476f568cb"
+    }
+    Frame {
+        msec: 3024
+        hash: "5930448341bce1c50de7acaba1f64ca1"
+    }
+    Frame {
+        msec: 3040
+        hash: "7194bacd56906f83948844224ce6a3e7"
+    }
+    Frame {
+        msec: 3056
+        hash: "fcf11cf70b8ac210d4bb2bc716942053"
+    }
+    Frame {
+        msec: 3072
+        hash: "767d707db4dbb02b6f97153b3822a1d1"
+    }
+    Frame {
+        msec: 3088
+        hash: "f8eb75b97f5233aa82b887aab34a38e3"
+    }
+    Frame {
+        msec: 3104
+        hash: "1d3beb06b39fa1d5cabd31ec4297f59f"
+    }
+    Frame {
+        msec: 3120
+        hash: "cadc775e0764afa7b50c5bab782035dd"
+    }
+    Frame {
+        msec: 3136
+        hash: "385f5a6e80da0d3ddf24539a64f26eb9"
+    }
+    Frame {
+        msec: 3152
+        hash: "34204871a684ea251c9d07fb125436da"
+    }
+    Frame {
+        msec: 3168
+        hash: "bc3e496535e66ff0d1e800092b7c78ca"
+    }
+    Frame {
+        msec: 3184
+        hash: "d6c4ff5bf223361be42c78d6d81248c3"
+    }
+    Frame {
+        msec: 3200
+        hash: "cb09d41612df66a8d099153026adcbf3"
+    }
+    Frame {
+        msec: 3216
+        hash: "f82180b8c0389ddc3623107a049c3366"
+    }
+    Frame {
+        msec: 3232
+        hash: "1b0f65e4599c65b8a603abd8da718d48"
+    }
+    Frame {
+        msec: 3248
+        hash: "897391a8206178356858139b3d1a4ce8"
+    }
+    Frame {
+        msec: 3264
+        hash: "b66d268dc7a42a7b1172b1ff566f4eb8"
+    }
+    Frame {
+        msec: 3280
+        hash: "0fe5d38a253dbd1ebcc67cca7ea86dc7"
+    }
+    Frame {
+        msec: 3296
+        hash: "b788f8a7e1e42f768fd1fe1198ca0344"
+    }
+    Frame {
+        msec: 3312
+        hash: "4f7f8b7f5bb78bb9327b6fa8142ce3a2"
+    }
+    Frame {
+        msec: 3328
+        hash: "30f041278c08174671568a0dfb7cbdf7"
+    }
+    Frame {
+        msec: 3344
+        hash: "6ecd90fc89ab9b6c4813fa6a6e9dffdb"
+    }
+    Frame {
+        msec: 3360
+        hash: "6ecd90fc89ab9b6c4813fa6a6e9dffdb"
+    }
+    Frame {
+        msec: 3376
+        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+    }
+    Frame {
+        msec: 3392
+        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+    }
+    Frame {
+        msec: 3408
+        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+    }
+    Frame {
+        msec: 3424
+        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+    }
+    Frame {
+        msec: 3440
+        hash: "6d79d9d0ba8da0b5654b39768b25591f"
+    }
+    Frame {
+        msec: 3456
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3472
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3488
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3504
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3520
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3536
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3552
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3568
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3584
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3600
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3616
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3632
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3648
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3664
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3680
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3696
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3712
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3728
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3744
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3760
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3776
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3792
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3808
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3824
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3840
+        image: "qtbug10586.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3872
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3888
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3904
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3920
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3936
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3952
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3968
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 3984
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4000
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4016
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4032
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4048
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4064
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4080
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4096
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4112
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4128
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4144
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4160
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4176
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+    Frame {
+        msec: 4192
+        hash: "cba9afe3f351e6cd6dc72d7f263401b0"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml b/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
new file mode 100644
index 0000000..f1a3ef7
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/animation/qtbug10586/qtbug10586.qml
@@ -0,0 +1,27 @@
+import Qt 4.7
+
+Rectangle {
+    width: 200
+    height: 400
+    Flickable {
+        id: flick
+        anchors.fill: parent
+        contentWidth: 1000; contentHeight: parent.height
+        Rectangle {
+            border.color: "black"
+            border.width: 10
+            width: 1000; height: 1000
+            rotation: 90
+            gradient: Gradient {
+                GradientStop { position: 0; color: "black" }
+                GradientStop { position: 1; color: "white" }
+            }
+        }
+    }
+    Rectangle {
+        color: "red"
+        width: 100; height: 100
+        y: flick.contentX < 10 ? 300 : 0
+        Behavior on y { NumberAnimation {} }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 5f25882..0f33a07 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -101,9 +101,8 @@ void tst_qmlvisual::visual_data()
         files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
     else {
         //these are newly added tests we want to try out in CI (then move to the stable list)
-        files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/borders.qml";
+        files << QT_TEST_SOURCE_DIR "/animation/qtbug10586/qtbug10586.qml";
         files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated.qml";
-        files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated-smooth.qml";
         files << QT_TEST_SOURCE_DIR "/qdeclarativeflipable/test-flipable.qml";
         files << QT_TEST_SOURCE_DIR "/qdeclarativepositioners/usingRepeater.qml";
 
@@ -123,6 +122,8 @@ void tst_qmlvisual::visual_data()
         //these reliably fail in CI, for unknown reasons
         //files << QT_TEST_SOURCE_DIR "/animation/easing/easing.qml";
         //files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
+        //files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/borders.qml";
+        //files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated-smooth.qml";
 
         //these reliably fail on Linux because of color interpolation (different float rounding)
 #if !defined(Q_WS_X11) && !defined(Q_WS_QWS)
-- 
cgit v0.12


From 84ae0d5c700b9b7396585301e7ef129ee0a2696d Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Wed, 12 May 2010 13:17:13 +1000
Subject: Sorted the tests list in declarative.pro

Also removed the #Cover tag, which is not used anymore.
---
 tests/auto/declarative/declarative.pro | 130 ++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index a9b069c..2520bcd 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,74 +1,74 @@
 TEMPLATE = subdirs
 SUBDIRS += \
            examples \
-           parserstress \           # Cover
-           qmetaobjectbuilder \     # Cover
-           qdeclarativeanimations \          # Cover
-           qdeclarativebehaviors \           # Cover
-           qdeclarativebinding \             # Cover
-           qdeclarativecomponent \           # Cover
-           qdeclarativeconnection \          # Cover
-           qdeclarativecontext \             # Cover
-           qdeclarativedebug \               # Cover
-           qdeclarativedebugclient \         # Cover
-           qdeclarativedebugservice \        # Cover
-           qdeclarativedom \                 # Cover
-           qdeclarativeecmascript \          # Cover
-           qdeclarativeengine     \          # Cover
-           qdeclarativeerror \               # Cover
-           qdeclarativefontloader \          # Cover
-           qdeclarativeanchors \     # Cover
-           qdeclarativeanimatedimage \ # Cover
-           qdeclarativeimage \       # Cover
-           qdeclarativeborderimage \ # Cover
-           qdeclarativeflickable   \ # Cover
-           qdeclarativeflipable    \ # Cover
-           qdeclarativefocusscope  \ # Cover
-           qdeclarativegridview \    # Cover
-           qdeclarativeitem \        # Cover
-           qdeclarativelistview \    # Cover
-           qdeclarativeloader \      # Cover
-           qdeclarativemousearea \   # Cover
-           qdeclarativeparticles \   # Cover
-           qdeclarativepathview \    # Cover
-           qdeclarativepositioners \ # Cover
-           qdeclarativetext \        # Cover
-           qdeclarativetextedit \    # Cover
-           qdeclarativetextinput \   # Cover
-           qdeclarativeinfo \                # Cover
-           qdeclarativeinstruction \         # Cover
-           qdeclarativelanguage \            # Cover
-           qdeclarativelistreference \       # Cover
-           qdeclarativelistmodel \           # Cover
-           qdeclarativeproperty \            # Cover
-           qdeclarativemetatype \            # Cover
-           qdeclarativemoduleplugin \        # Cover
-           qdeclarativepixmapcache \         # Cover
-           qdeclarativepropertymap \         # Cover
-           qdeclarativeqt \                  # Cover
-           qdeclarativesmoothedanimation \   # Cover
-           qdeclarativesmoothedfollow\       # Cover
-           qdeclarativespringfollow \        # Cover
-           qdeclarativestates \              # Cover
-           qdeclarativesystempalette \       # Cover
-           qdeclarativetimer \               # Cover
-           qdeclarativexmllistmodel \        # Cover
-           qpacketprotocol \        # Cover
-           qdeclarativerepeater \    # Cover
-           qdeclarativeworkerscript \    # Cover
-           qdeclarativevaluetypes \          # Cover
-           qdeclarativeview \          # Cover
-           qdeclarativexmlhttprequest \      # Cover
-           qdeclarativeimageprovider \       # Cover
-           qdeclarativestyledtext \          # Cover
-           qdeclarativesqldatabase \         # Cover
-           qdeclarativevisualdatamodel \     # Cover
-           qdeclarativeviewer \                      # Cover
-           qmlvisual                    # Cover
+           parserstress \
+           qdeclarativeanchors \
+           qdeclarativeanimatedimage \
+           qdeclarativeanimations \
+           qdeclarativebehaviors \
+           qdeclarativebinding \
+           qdeclarativeborderimage \
+           qdeclarativecomponent \
+           qdeclarativeconnection \
+           qdeclarativecontext \
+           qdeclarativedebug \
+           qdeclarativedebugclient \
+           qdeclarativedebugservice \
+           qdeclarativedom \
+           qdeclarativeecmascript \
+           qdeclarativeengine \
+           qdeclarativeerror \
+           qdeclarativefontloader \
+           qdeclarativeflickable \
+           qdeclarativeflipable \
+           qdeclarativefocusscope \
+           qdeclarativegridview \
+           qdeclarativeimage \
+           qdeclarativeimageprovider \
+           qdeclarativeinfo \
+           qdeclarativeinstruction \
+           qdeclarativeitem \
+           qdeclarativelanguage \
+           qdeclarativelistmodel \
+           qdeclarativelistreference \
+           qdeclarativelistview \
+           qdeclarativeloader \
+           qdeclarativemetatype \
+           qdeclarativemoduleplugin \
+           qdeclarativemousearea \
+           qdeclarativeparticles \
+           qdeclarativepathview \
+           qdeclarativepixmapcache \
+           qdeclarativepositioners \
+           qdeclarativeproperty \
+           qdeclarativepropertymap \
+           qdeclarativeqt \
+           qdeclarativerepeater \
+           qdeclarativesmoothedanimation \
+           qdeclarativesmoothedfollow\
+           qdeclarativespringfollow \
+           qdeclarativesqldatabase \
+           qdeclarativestates \
+           qdeclarativestyledtext \
+           qdeclarativesystempalette \
+           qdeclarativetext \
+           qdeclarativetextedit \
+           qdeclarativetextinput \
+           qdeclarativetimer \
+           qdeclarativevaluetypes \
+           qdeclarativeview \
+           qdeclarativeviewer \
+           qdeclarativevisualdatamodel \
+           qdeclarativeworkerscript \
+           qdeclarativexmlhttprequest \
+           qdeclarativexmllistmodel \
+           qmlvisual \
+           qpacketprotocol \
+           qmetaobjectbuilder
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
-           qdeclarativewebview       # Cover
+           qdeclarativewebview
 }
 
 # Tests which should run in Pulse
-- 
cgit v0.12


From 9e84653e20b20ea32a789deaef9d5d4acd5d68ea Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Wed, 12 May 2010 13:21:16 +1000
Subject: Add missing test, qdeclarativelayoutitem, to declarative.pro

---
 tests/auto/declarative/declarative.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 2520bcd..3496906 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -29,6 +29,7 @@ SUBDIRS += \
            qdeclarativeinstruction \
            qdeclarativeitem \
            qdeclarativelanguage \
+           qdeclarativelayoutitem \
            qdeclarativelistmodel \
            qdeclarativelistreference \
            qdeclarativelistview \
-- 
cgit v0.12


From d412a77d1e9a1c6810e10dfa4a0a35a81391cf29 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Wed, 12 May 2010 13:27:55 +1000
Subject: Use raster graphicssystem for qml.app on OS X.

Task-number: QTBUG-10544
---
 tools/qml/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 116ca71..003716e 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -184,7 +184,7 @@ int main(int argc, char ** argv)
     atexit(showWarnings);
 #endif
 
-#if defined (Q_WS_X11)
+#if defined (Q_WS_X11) || defined(Q_WS_MAC)
     //### default to using raster graphics backend for now
     bool gsSpecified = false;
     for (int i = 0; i < argc; ++i) {
-- 
cgit v0.12


From 1e992df9dfa4abcd5073f94da765c5e47b2f0319 Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 12 May 2010 12:20:00 +1000
Subject: Stop GIF handler claiming it can report Size for sequential devices,
 since it scans the entire image to do so (and then can't read the image).

Task-number: QTBUG-10621
---
 src/plugins/imageformats/gif/qgifhandler.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp
index 25d3dfa..8abc2d1 100644
--- a/src/plugins/imageformats/gif/qgifhandler.cpp
+++ b/src/plugins/imageformats/gif/qgifhandler.cpp
@@ -1119,8 +1119,11 @@ bool QGifHandler::write(const QImage &image)
 
 bool QGifHandler::supportsOption(ImageOption option) const
 {
-    return option == Size
-        || option == Animation;
+    if (!device() || device()->isSequential())
+        return option == Animation;
+    else
+        return option == Size
+            || option == Animation;
 }
 
 QVariant QGifHandler::option(ImageOption option) const
-- 
cgit v0.12


From b3a06e47bc66c36de8558ab7bc9817ed2518ae9c Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 12 May 2010 13:18:32 +1000
Subject: Don't pass sequential (QNetworkReply) to image reader, it doesn't
 work well enough. Work around QTBUG-10622

---
 src/declarative/util/qdeclarativepixmapcache.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index dbca326..d9ce42c 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -342,7 +343,10 @@ void QDeclarativeImageRequestHandler::networkRequestDone()
             errorString = reply->errorString();
         } else {
             QSize read_impsize;
-            if (readImage(reply->url(), reply, &image, &errorString, &read_impsize, job->forcedWidth(), job->forcedHeight())) {
+            QByteArray all = reply->readAll();
+            QBuffer buff(&all);
+            buff.open(QIODevice::ReadOnly);
+            if (readImage(reply->url(), &buff, &image, &errorString, &read_impsize, job->forcedWidth(), job->forcedHeight())) {
                 qmlOriginalSizes()->insert(reply->url(), read_impsize);
                 error = QDeclarativeImageReaderEvent::NoError;
             } else {
-- 
cgit v0.12


From 29450fd82c2c8efdc296a051f6a8fac2bd3fa76a Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Wed, 12 May 2010 13:56:44 +1000
Subject: Avoid warning (and possible future crash) upon reload.

Task-number: QTBUG-10555
---
 src/declarative/util/qdeclarativexmllistmodel.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index f02ed16..f1a00989 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -796,8 +796,11 @@ void QDeclarativeXmlListModel::reload()
 
     if (d->reply) {
         d->reply->abort();
-        d->reply->deleteLater();
-        d->reply = 0;
+        if (d->reply) {
+            // abort will generally have already done this (and more)
+            d->reply->deleteLater();
+            d->reply = 0;
+        }
     }
 
     if (!d->xml.isEmpty()) {
-- 
cgit v0.12


From 798bdb4543f84d427659b950a3a1643ae4987b8b Mon Sep 17 00:00:00 2001
From: Alexis Menard 
Date: Wed, 12 May 2010 07:12:34 +0200
Subject: Reset the dragDropItem to 0 when the item dies while dragging on top
 it.

If you drag something on top of an item and the former is deleted then
we need to reset the dragDropItem pointer to 0.

Task-number:KDE BUG 232182
Reviewed-by:leo
---
 src/gui/graphicsview/qgraphicsscene.cpp        |  4 ++++
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 0d4e48a..dacdbfe 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -690,6 +690,10 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
     if (item == lastMouseGrabberItem)
         lastMouseGrabberItem = 0;
 
+    // Reset the current drop item
+    if (item == dragDropItem)
+        dragDropItem = 0;
+
     // Reenable selectionChanged() for individual items
     --selectionChanging;
     if (!selectionChanging && selectedItems.size() != oldSelectedItemsSize)
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 81097be..5a5a821 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -447,6 +448,7 @@ private slots:
     void QT_2649_focusScope();
     void sortItemsWhileAdding();
     void doNotMarkFullUpdateIfNotInScene();
+    void itemDiesDuringDraggingOperation();
 
 private:
     QList paintedItems;
@@ -10484,5 +10486,27 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene()
     QTRY_COMPARE(item3->painted, 3);
 }
 
+void tst_QGraphicsItem::itemDiesDuringDraggingOperation()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 100, 100));
+    item->setFlag(QGraphicsItem::ItemIsMovable);
+    item->setAcceptDrops(true);
+    scene.addItem(item);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), (QWidget *)&view);
+    QGraphicsSceneDragDropEvent dragEnter(QEvent::GraphicsSceneDragEnter);
+    dragEnter.setScenePos(item->boundingRect().center());
+    QApplication::sendEvent(&scene, &dragEnter);
+    QGraphicsSceneDragDropEvent event(QEvent::GraphicsSceneDragMove);
+    event.setScenePos(item->boundingRect().center());
+    QApplication::sendEvent(&scene, &event);
+    QVERIFY(QGraphicsScenePrivate::get(&scene)->dragDropItem == item);
+    delete item;
+    QVERIFY(QGraphicsScenePrivate::get(&scene)->dragDropItem == 0);
+}
 QTEST_MAIN(tst_QGraphicsItem)
 #include "tst_qgraphicsitem.moc"
-- 
cgit v0.12


From 71187a1f0d26ff61c033a7c2d46892f48816fc45 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Tue, 11 May 2010 13:33:48 +1000
Subject: Flickable small API changes.

- Split moving into movingHorizontally anf movingVertically
- Split flicking into flickingHorizontally and flickingVertically
- Rename flickDirection to flickableDirection
- onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed

Task-number: QTBUG-10572
Reviewed-by: Martin Jones
---
 demos/declarative/flickr/common/ScrollBar.qml      |   2 +-
 demos/declarative/flickr/mobile/ImageDetails.qml   |   4 +-
 demos/declarative/webbrowser/content/ScrollBar.qml |   2 +-
 demos/declarative/webbrowser/webbrowser.qml        |  14 +-
 examples/declarative/listview/dynamic.qml          |   2 +-
 examples/declarative/scrollbar/display.qml         |   2 +-
 src/declarative/QmlChanges.txt                     |   7 +-
 .../graphicsitems/qdeclarativeflickable.cpp        | 213 ++++++++++++---------
 .../graphicsitems/qdeclarativeflickable_p.h        |  43 +++--
 .../graphicsitems/qdeclarativeflickable_p_p.h      |  10 +-
 .../graphicsitems/qdeclarativegridview.cpp         |  44 +++--
 .../graphicsitems/qdeclarativelistview.cpp         |  42 ++--
 .../tst_qdeclarativeflickable.cpp                  |  28 +++
 13 files changed, 257 insertions(+), 156 deletions(-)

diff --git a/demos/declarative/flickr/common/ScrollBar.qml b/demos/declarative/flickr/common/ScrollBar.qml
index 4022d23..d70cd3c 100644
--- a/demos/declarative/flickr/common/ScrollBar.qml
+++ b/demos/declarative/flickr/common/ScrollBar.qml
@@ -19,7 +19,7 @@ Item {
     states: [
         State {
             name: "show"
-            when: flickableArea.moving
+            when: flickableArea.movingVertically
             PropertyChanges {
                 target: container
                 opacity: 1
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml
index caf1571..79d7cab 100644
--- a/demos/declarative/flickr/mobile/ImageDetails.qml
+++ b/demos/declarative/flickr/mobile/ImageDetails.qml
@@ -70,7 +70,7 @@ Flipable {
 
                 Image {
                     id: bigImage; source: container.photoUrl; scale: slider.value
-                    anchors.centerIn: parent; smooth: !flickable.moving
+                    anchors.centerIn: parent; smooth: !flickable.movingVertically
                     onStatusChanged : {
                         // Default scale shows the entire image.
                         if (status == Image.Ready && width != 0) {
@@ -119,7 +119,7 @@ Flipable {
         SequentialAnimation {
             PropertyAction { target: bigImage; property: "smooth"; value: false }
             NumberAnimation { easing.type: Easing.InOutQuad; properties: "angle"; duration: 500 }
-            PropertyAction { target: bigImage; property: "smooth"; value: !flickable.moving }
+            PropertyAction { target: bigImage; property: "smooth"; value: !flickable.movingVertically }
         }
     }
 }
diff --git a/demos/declarative/webbrowser/content/ScrollBar.qml b/demos/declarative/webbrowser/content/ScrollBar.qml
index 976297b..aa79d35 100644
--- a/demos/declarative/webbrowser/content/ScrollBar.qml
+++ b/demos/declarative/webbrowser/content/ScrollBar.qml
@@ -55,7 +55,7 @@ Item {
 
     states: State {
         name: "visible"
-        when: scrollArea.moving
+        when: container.orientation == Qt.Vertical ? scrollArea.movingVertically : scrollArea.movingHorizontally
         PropertyChanges { target: container; opacity: 1.0 }
     }
 
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 27da814..f539e21 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -15,13 +15,9 @@ Rectangle {
         id: webView
         url: webBrowser.urlString
         anchors { top: headerSpace.bottom; left: parent.left; right: parent.right; bottom: parent.bottom }
-
     }
 
-    Item {
-        id: headerSpace
-        width: parent.width; height: 62
-    }
+    Item { id: headerSpace; width: parent.width; height: 62 }
 
     Header {
         id: header
@@ -34,8 +30,8 @@ Rectangle {
         anchors { right: parent.right; top: header.bottom; bottom: parent.bottom }
     }
 
-//    ScrollBar {
-//        scrollArea: webView; height: 8; orientation: Qt.Horizontal
-//        anchors { right: parent.right; rightMargin: 8; left: parent.left; bottom: parent.bottom }
-//    }
+    ScrollBar {
+        scrollArea: webView; height: 8; orientation: Qt.Horizontal
+        anchors { right: parent.right; rightMargin: 8; left: parent.left; bottom: parent.bottom }
+    }
 }
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 9b05ad5..64f324e 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -151,7 +151,7 @@ Rectangle {
 
         // Only show the scrollbar when the view is moving.
         states: State {
-            name: "ShowBars"; when: view.moving
+            name: "ShowBars"; when: view.movingVertically
             PropertyChanges { target: verticalScrollBar; opacity: 1 }
         }
         transitions: Transition {
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index b8a5e36..6b12d85 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -20,7 +20,7 @@ Rectangle {
         // Only show the scrollbars when the view is moving.
         states: State {
             name: "ShowBars"
-            when: view.moving
+            when: view.movingVertically || view.movingHorizontally
             PropertyChanges { target: verticalScrollBar; opacity: 1 }
             PropertyChanges { target: horizontalScrollBar; opacity: 1 }
         }
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 9f618d8..9ab3f08 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -1,7 +1,12 @@
 =============================================================================
 The changes below are pre Qt 4.7.0 RC
 
-Flickable: overShoot is replaced by boundsBehavior enumeration.
+Flickable:
+   - overShoot is replaced by boundsBehavior enumeration
+   - flicking is replaced by flickingHorizontally and flickingVertically
+   - moving is replaced by movingHorizontally and movingVertically
+   - flickDirection is renamed flickableDirection
+   - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed
 Component: isReady, isLoading, isError and isNull properties removed, use
     status property instead
 QList models no longer provide properties in model object.  The
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 34b0606..a7a8983 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -125,12 +125,14 @@ QDeclarativeFlickablePrivate::QDeclarativeFlickablePrivate()
   : viewport(new QDeclarativeItem)
     , hData(this, &QDeclarativeFlickablePrivate::setRoundedViewportX)
     , vData(this, &QDeclarativeFlickablePrivate::setRoundedViewportY)
-    , flicked(false), moving(false), stealMouse(false)
-    , pressed(false)
+    , flickingHorizontally(false), flickingVertically(false)
+    , hMoved(false), vMoved(false)
+    , movingHorizontally(false), movingVertically(false)
+    , stealMouse(false), pressed(false)
     , interactive(true), deceleration(500), maxVelocity(2000), reportedVelocitySmoothing(100)
     , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(600)
     , vTime(0), visibleArea(0)
-    , flickDirection(QDeclarativeFlickable::AutoFlickDirection)
+    , flickableDirection(QDeclarativeFlickable::AutoFlickDirection)
     , boundsBehavior(QDeclarativeFlickable::DragAndOvershootBounds)
 {
 }
@@ -226,10 +228,15 @@ void QDeclarativeFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal
         timeline.reset(data.move);
         timeline.accel(data.move, v, deceleration, maxDistance);
         timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
-        if (!flicked) {
-            flicked = true;
-            emit q->flickingChanged();
-            emit q->flickStarted();
+        if (!flickingHorizontally && q->xflick()) {
+            flickingHorizontally = true;
+            emit q->flickingChanged(); // deprecated
+            emit q->flickingHorizontallyChanged();
+        }
+        if (!flickingVertically && q->yflick()) {
+            flickingVertically = true;
+            emit q->flickingChanged(); // deprecated
+            emit q->flickingVerticallyChanged();
         }
     } else {
         timeline.reset(data.move);
@@ -274,7 +281,6 @@ void QDeclarativeFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal
                 q->viewportMoved();
             }
         }
-        //emit flickingChanged();
     } else if (data.move.value() < maxExtent) {
         timeline.reset(data.move);
         if (fixupDuration) {
@@ -285,11 +291,7 @@ void QDeclarativeFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal
             data.move.setValue(maxExtent);
             q->viewportMoved();
         }
-        //emit flickingChanged();
-    } else {
-        flicked = false;
     }
-
     vTime = timeline.time();
 }
 
@@ -363,37 +365,6 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
 */
 
 /*!
-    \qmlsignal Flickable::onMovementStarted()
-
-    This handler is called when the view begins moving due to user
-    interaction.
-*/
-
-/*!
-    \qmlsignal Flickable::onMovementEnded()
-
-    This handler is called when the view stops moving due to user
-    interaction.  If a flick was generated, this handler will
-    be triggered once the flick stops.  If a flick was not
-    generated, the handler will be triggered when the
-    user stops dragging - i.e. a mouse or touch release.
-*/
-
-/*!
-    \qmlsignal Flickable::onFlickStarted()
-
-    This handler is called when the view is flicked.  A flick
-    starts from the point that the mouse or touch is released,
-    while still in motion.
-*/
-
-/*!
-    \qmlsignal Flickable::onFlickEnded()
-
-    This handler is called when the view stops moving due to a flick.
-*/
-
-/*!
     \qmlproperty real Flickable::visibleArea.xPosition
     \qmlproperty real Flickable::visibleArea.widthRatio
     \qmlproperty real Flickable::visibleArea.yPosition
@@ -498,12 +469,14 @@ void QDeclarativeFlickable::setInteractive(bool interactive)
     Q_D(QDeclarativeFlickable);
     if (interactive != d->interactive) {
         d->interactive = interactive;
-        if (!interactive && d->flicked) {
+        if (!interactive && (d->flickingHorizontally || d->flickingVertically)) {
             d->timeline.clear();
             d->vTime = d->timeline.time();
-            d->flicked = false;
-            emit flickingChanged();
-            emit flickEnded();
+            d->flickingHorizontally = false;
+            d->flickingVertically = false;
+            emit flickingChanged(); // deprecated
+            emit flickingHorizontallyChanged();
+            emit flickingVerticallyChanged();
         }
         emit interactiveChanged();
     }
@@ -582,7 +555,7 @@ QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea()
 }
 
 /*!
-    \qmlproperty enumeration Flickable::flickDirection
+    \qmlproperty enumeration Flickable::flickableDirection
 
     This property determines which directions the view can be flicked.
 
@@ -596,21 +569,33 @@ QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea()
     \o Flickable.HorizontalAndVerticalFlick - allows flicking in both directions.
     \endlist
 */
-QDeclarativeFlickable::FlickDirection QDeclarativeFlickable::flickDirection() const
+QDeclarativeFlickable::FlickableDirection QDeclarativeFlickable::flickableDirection() const
 {
     Q_D(const QDeclarativeFlickable);
-    return d->flickDirection;
+    return d->flickableDirection;
 }
 
-void QDeclarativeFlickable::setFlickDirection(FlickDirection direction)
+void QDeclarativeFlickable::setFlickableDirection(FlickableDirection direction)
 {
     Q_D(QDeclarativeFlickable);
-    if (direction != d->flickDirection) {
-        d->flickDirection = direction;
-        emit flickDirectionChanged();
+    if (direction != d->flickableDirection) {
+        d->flickableDirection = direction;
+        emit flickableDirectionChanged();
     }
 }
 
+QDeclarativeFlickable::FlickableDirection QDeclarativeFlickable::flickDirection() const
+{
+    qmlInfo(this) << "'flickDirection' is deprecated. Please use 'flickableDirection' instead.";
+    return flickableDirection();
+}
+
+void QDeclarativeFlickable::setFlickDirection(FlickableDirection direction)
+{
+    qmlInfo(this) << "'flickDirection' is deprecated. Please use 'flickableDirection' instead.";
+    setFlickableDirection(direction);
+}
+
 void QDeclarativeFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (interactive && timeline.isActive() && (qAbs(hData.velocity) > 10 || qAbs(vData.velocity) > 10))
@@ -626,7 +611,8 @@ void QDeclarativeFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEven
     pressPos = event->pos();
     hData.pressPos = hData.move.value();
     vData.pressPos = vData.move.value();
-    flicked = false;
+    flickingHorizontally = false;
+    flickingVertically = false;
     QDeclarativeItemPrivate::start(pressTime);
     QDeclarativeItemPrivate::start(velocityTime);
 }
@@ -638,7 +624,6 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
         return;
     bool rejectY = false;
     bool rejectX = false;
-    bool moved = false;
 
     if (q->yflick()) {
         int dy = int(event->pos().y() - pressPos.y());
@@ -660,7 +645,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
             }
             if (!rejectY && stealMouse) {
                 vData.move.setValue(qRound(newY));
-                moved = true;
+                vMoved = true;
             }
             if (qAbs(dy) > QApplication::startDragDistance())
                 stealMouse = true;
@@ -687,7 +672,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
             }
             if (!rejectX && stealMouse) {
                 hData.move.setValue(qRound(newX));
-                moved = true;
+                hMoved = true;
             }
 
             if (qAbs(dx) > QApplication::startDragDistance())
@@ -717,7 +702,7 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
     if (rejectY) vData.velocity = 0;
     if (rejectX) hData.velocity = 0;
 
-    if (moved) {
+    if (hMoved || vMoved) {
         q->movementStarting();
         q->viewportMoved();
     }
@@ -812,9 +797,9 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
             d->vData.velocity = qMax(event->delta() - d->vData.smoothVelocity.value(), qreal(250.0));
         else
             d->vData.velocity = qMin(event->delta() - d->vData.smoothVelocity.value(), qreal(-250.0));
-        d->flicked = false;
+        d->flickingVertically = false;
         d->flickY(d->vData.velocity);
-        if (d->flicked)
+        if (d->flickingVertically)
             movementStarting();
         event->accept();
     } else if (xflick()) {
@@ -822,9 +807,9 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
             d->hData.velocity = qMax(event->delta() - d->hData.smoothVelocity.value(), qreal(250.0));
         else
             d->hData.velocity = qMin(event->delta() - d->hData.smoothVelocity.value(), qreal(-250.0));
-        d->flicked = false;
+        d->flickingHorizontally = false;
         d->flickX(d->hData.velocity);
-        if (d->flicked)
+        if (d->flickingHorizontally)
             movementStarting();
         event->accept();
     } else {
@@ -1091,7 +1076,7 @@ void QDeclarativeFlickable::setContentWidth(qreal w)
     else
         d->viewport->setWidth(w);
     // Make sure that we're entirely in view.
-    if (!d->pressed && !d->moving) {
+    if (!d->pressed && !d->movingHorizontally && !d->movingVertically) {
         int oldDuration = d->fixupDuration;
         d->fixupDuration = 0;
         d->fixupX();
@@ -1118,7 +1103,7 @@ void QDeclarativeFlickable::setContentHeight(qreal h)
     else
         d->viewport->setHeight(h);
     // Make sure that we're entirely in view.
-    if (!d->pressed && !d->moving) {
+    if (!d->pressed && !d->movingHorizontally && !d->movingVertically) {
         int oldDuration = d->fixupDuration;
         d->fixupDuration = 0;
         d->fixupY();
@@ -1149,17 +1134,17 @@ qreal QDeclarativeFlickable::vHeight() const
 bool QDeclarativeFlickable::xflick() const
 {
     Q_D(const QDeclarativeFlickable);
-    if (d->flickDirection == QDeclarativeFlickable::AutoFlickDirection)
+    if (d->flickableDirection == QDeclarativeFlickable::AutoFlickDirection)
         return vWidth() != width();
-    return d->flickDirection & QDeclarativeFlickable::HorizontalFlick;
+    return d->flickableDirection & QDeclarativeFlickable::HorizontalFlick;
 }
 
 bool QDeclarativeFlickable::yflick() const
 {
     Q_D(const QDeclarativeFlickable);
-    if (d->flickDirection == QDeclarativeFlickable::AutoFlickDirection)
+    if (d->flickableDirection == QDeclarativeFlickable::AutoFlickDirection)
         return vHeight() !=  height();
-    return d->flickDirection & QDeclarativeFlickable::VerticalFlick;
+    return d->flickableDirection & QDeclarativeFlickable::VerticalFlick;
 }
 
 bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
@@ -1281,16 +1266,30 @@ void QDeclarativeFlickable::setFlickDeceleration(qreal deceleration)
     emit flickDecelerationChanged();
 }
 
+bool QDeclarativeFlickable::isFlicking() const
+{
+    Q_D(const QDeclarativeFlickable);
+    qmlInfo(this) << "'flicking' is deprecated. Please use 'flickingHorizontally' and 'flickingVertically' instead.";
+    return d->flickingHorizontally ||  d->flickingVertically;
+}
+
 /*!
-    \qmlproperty bool Flickable::flicking
+    \qmlproperty bool Flickable::flickingHorizontally
+    \qmlproperty bool Flickable::flickingVertically
 
-    This property holds whether the view is currently moving due to
-    the user flicking the view.
+    These properties hold whether the view is currently moving horizontally
+    or vertically due to the user flicking the view.
 */
-bool QDeclarativeFlickable::isFlicking() const
+bool QDeclarativeFlickable::isFlickingHorizontally() const
 {
     Q_D(const QDeclarativeFlickable);
-    return d->flicked;
+    return d->flickingHorizontally;
+}
+
+bool QDeclarativeFlickable::isFlickingVertically() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->flickingVertically;
 }
 
 /*!
@@ -1319,40 +1318,72 @@ void QDeclarativeFlickable::setPressDelay(int delay)
     emit pressDelayChanged();
 }
 
+
+bool QDeclarativeFlickable::isMoving() const
+{
+    Q_D(const QDeclarativeFlickable);
+    qmlInfo(this) << "'moving' is deprecated. Please use 'movingHorizontally' or 'movingVertically' instead.";
+    return d->movingHorizontally || d->movingVertically;
+}
+
 /*!
-    \qmlproperty bool Flickable::moving
+    \qmlproperty bool Flickable::movingHorizontally
+    \qmlproperty bool Flickable::movingVertically
 
-    This property holds whether the view is currently moving due to
-    the user either dragging or flicking the view.
+    These properties hold whether the view is currently moving horizontally
+    or vertically due to the user either dragging or flicking the view.
 */
-bool QDeclarativeFlickable::isMoving() const
+bool QDeclarativeFlickable::isMovingHorizontally() const
+{
+    Q_D(const QDeclarativeFlickable);
+    return d->movingHorizontally;
+}
+
+bool QDeclarativeFlickable::isMovingVertically() const
 {
     Q_D(const QDeclarativeFlickable);
-    return d->moving;
+    return d->movingVertically;
 }
 
 void QDeclarativeFlickable::movementStarting()
 {
     Q_D(QDeclarativeFlickable);
-    if (!d->moving) {
-        d->moving = true;
-        emit movingChanged();
-        emit movementStarted();
+    if (d->hMoved && !d->movingHorizontally) {
+        d->movingHorizontally = true;
+        emit movingChanged(); // deprecated
+        emit movingHorizontallyChanged();
+    }
+    if (d->vMoved && !d->movingVertically) {
+        d->movingVertically = true;
+        emit movingChanged(); // deprecated
+        emit movingVerticallyChanged();
     }
 }
 
 void QDeclarativeFlickable::movementEnding()
 {
     Q_D(QDeclarativeFlickable);
-    if (d->moving) {
-        d->moving = false;
-        emit movingChanged();
-        emit movementEnded();
+    if (d->flickingHorizontally) {
+        d->flickingHorizontally = false;
+        emit flickingChanged(); // deprecated
+        emit flickingHorizontallyChanged();
+    }
+    if (d->flickingVertically) {
+        d->flickingVertically = false;
+        emit flickingChanged(); // deprecated
+        emit flickingVerticallyChanged();
+    }
+    if (d->movingHorizontally) {
+        d->movingHorizontally = false;
+        d->hMoved = false;
+        emit movingChanged(); // deprecated
+        emit movingHorizontallyChanged();
     }
-    if (d->flicked) {
-        d->flicked = false;
-        emit flickingChanged();
-        emit flickEnded();
+    if (d->movingVertically) {
+        d->movingVertically = false;
+        d->vMoved = false;
+        emit movingChanged(); // deprecated
+        emit movingVerticallyChanged();
     }
     d->hData.smoothVelocity.setValue(0);
     d->vData.smoothVelocity.setValue(0);
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index f031a24..7944e2b 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -68,9 +68,14 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem
     Q_PROPERTY(BoundsBehavior boundsBehavior READ boundsBehavior WRITE setBoundsBehavior NOTIFY boundsBehaviorChanged)
     Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged)
     Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged)
-    Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged)
-    Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
-    Q_PROPERTY(FlickDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickDirectionChanged)
+    Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged) // deprecated
+    Q_PROPERTY(bool movingHorizontally READ isMovingHorizontally NOTIFY movingHorizontallyChanged)
+    Q_PROPERTY(bool movingVertically READ isMovingVertically NOTIFY movingVerticallyChanged)
+    Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) // deprecated
+    Q_PROPERTY(bool flickingHorizontally READ isFlickingHorizontally NOTIFY flickingHorizontallyChanged)
+    Q_PROPERTY(bool flickingVertically READ isFlickingVertically NOTIFY flickingVerticallyChanged)
+    Q_PROPERTY(FlickableDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickableDirectionChanged) // deprecated
+    Q_PROPERTY(FlickableDirection flickableDirection READ flickableDirection WRITE setFlickableDirection NOTIFY flickableDirectionChanged)
 
     Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged)
     Q_PROPERTY(int pressDelay READ pressDelay WRITE setPressDelay NOTIFY pressDelayChanged)
@@ -86,7 +91,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem
     Q_PROPERTY(QDeclarativeListProperty flickableChildren READ flickableChildren)
     Q_CLASSINFO("DefaultProperty", "flickableData")
 
-    Q_ENUMS(FlickDirection)
+    Q_ENUMS(FlickableDirection)
     Q_ENUMS(BoundsBehavior)
 
 public:
@@ -115,8 +120,12 @@ public:
     qreal contentY() const;
     void setContentY(qreal pos);
 
-    bool isMoving() const;
-    bool isFlicking() const;
+    bool isMoving() const; // deprecated
+    bool isMovingHorizontally() const;
+    bool isMovingVertically() const;
+    bool isFlicking() const; // deprecated
+    bool isFlickingHorizontally() const;
+    bool isFlickingVertically() const;
 
     int pressDelay() const;
     void setPressDelay(int delay);
@@ -140,26 +149,28 @@ public:
 
     QDeclarativeItem *viewport();
 
-    enum FlickDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
-    FlickDirection flickDirection() const;
-    void setFlickDirection(FlickDirection);
+    enum FlickableDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 };
+    FlickableDirection flickDirection() const; // deprecated
+    void setFlickDirection(FlickableDirection); // deprecated
+    FlickableDirection flickableDirection() const;
+    void setFlickableDirection(FlickableDirection);
 
 Q_SIGNALS:
     void contentWidthChanged();
     void contentHeightChanged();
     void contentXChanged();
     void contentYChanged();
-    void movingChanged();
-    void flickingChanged();
-    void movementStarted();
-    void movementEnded();
-    void flickStarted();
-    void flickEnded();
+    void movingChanged(); // deprecated
+    void movingHorizontallyChanged();
+    void movingVerticallyChanged();
+    void flickingChanged(); // deprecated
+    void flickingHorizontallyChanged();
+    void flickingVerticallyChanged();
     void horizontalVelocityChanged();
     void verticalVelocityChanged();
     void isAtBoundaryChanged();
     void pageChanged();
-    void flickDirectionChanged();
+    void flickableDirectionChanged();
     void interactiveChanged();
     void overShootChanged();
     void boundsBehaviorChanged();
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index 01cfb18..b467ed2 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -131,8 +131,12 @@ public:
     AxisData vData;
 
     QDeclarativeTimeLine timeline;
-    bool flicked : 1;
-    bool moving : 1;
+    bool flickingHorizontally : 1;
+    bool flickingVertically : 1;
+    bool hMoved : 1;
+    bool vMoved : 1;
+    bool movingHorizontally : 1;
+    bool movingVertically : 1;
     bool stealMouse : 1;
     bool pressed : 1;
     bool interactive : 1;
@@ -158,7 +162,7 @@ public:
     int vTime;
     QDeclarativeTimeLine velocityTimeline;
     QDeclarativeFlickableVisibleArea *visibleArea;
-    QDeclarativeFlickable::FlickDirection flickDirection;
+    QDeclarativeFlickable::FlickableDirection flickableDirection;
     QDeclarativeFlickable::BoundsBehavior boundsBehavior;
 
     void handleMousePressEvent(QGraphicsSceneMouseEvent *);
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 305d55c..396acd0 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -347,9 +347,10 @@ public:
 void QDeclarativeGridViewPrivate::init()
 {
     Q_Q(QDeclarativeGridView);
-    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
+    QObject::connect(q, SIGNAL(movingHorizontallyChanged()), q, SLOT(animStopped()));
+    QObject::connect(q, SIGNAL(movingVerticallyChanged()), q, SLOT(animStopped()));
     q->setFlag(QGraphicsItem::ItemIsFocusScope);
-    q->setFlickDirection(QDeclarativeFlickable::VerticalFlick);
+    q->setFlickableDirection(QDeclarativeFlickable::VerticalFlick);
     addItemChangeListener(this, Geometry);
 }
 
@@ -692,7 +693,7 @@ void QDeclarativeGridViewPrivate::updateHighlight()
 {
     if ((!currentItem && highlight) || (currentItem && !highlight))
         createHighlight();
-    if (currentItem && autoHighlight && highlight && !moving) {
+    if (currentItem && autoHighlight && highlight && !movingHorizontally && !movingVertically) {
         // auto-update highlight
         highlightXAnimator->to = currentItem->item->x();
         highlightYAnimator->to = currentItem->item->y();
@@ -806,7 +807,8 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     Q_Q(QDeclarativeGridView);
 
     moveReason = Mouse;
-    if ((!haveHighlightRange || highlightRange != QDeclarativeGridView::StrictlyEnforceRange) && snapMode == QDeclarativeGridView::NoSnap) {
+    if ((!haveHighlightRange || highlightRange != QDeclarativeGridView::StrictlyEnforceRange)
+        && snapMode == QDeclarativeGridView::NoSnap) {
         QDeclarativeFlickablePrivate::flick(data, minExtent, maxExtent, vSize, fixupCallback, velocity);
         return;
     }
@@ -874,9 +876,16 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
         timeline.reset(data.move);
         timeline.accel(data.move, v, accel, maxDistance + overshootDist);
         timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
-        flicked = true;
-        emit q->flickingChanged();
-        emit q->flickStarted();
+        if (!flickingHorizontally && q->xflick()) {
+            flickingHorizontally = true;
+            emit q->flickingChanged(); // deprecated
+            emit q->flickingHorizontallyChanged();
+        }
+        if (!flickingVertically && q->yflick()) {
+            flickingVertically = true;
+            emit q->flickingChanged(); // deprecated
+            emit q->flickingVerticallyChanged();
+        }
     } else {
         timeline.reset(data.move);
         fixup(data, minExtent, maxExtent);
@@ -1371,10 +1380,10 @@ void QDeclarativeGridView::setFlow(Flow flow)
         d->flow = flow;
         if (d->flow == LeftToRight) {
             setContentWidth(-1);
-            setFlickDirection(QDeclarativeFlickable::VerticalFlick);
+            setFlickableDirection(QDeclarativeFlickable::VerticalFlick);
         } else {
             setContentHeight(-1);
-            setFlickDirection(QDeclarativeFlickable::HorizontalFlick);
+            setFlickableDirection(QDeclarativeFlickable::HorizontalFlick);
         }
         d->clear();
         d->updateGrid();
@@ -1530,7 +1539,7 @@ void QDeclarativeGridView::viewportMoved()
     Q_D(QDeclarativeGridView);
     QDeclarativeFlickable::viewportMoved();
     d->lazyRelease = true;
-    if (d->flicked) {
+    if (d->flickingHorizontally || d->flickingVertically) {
         if (yflick()) {
             if (d->vData.velocity > 0)
                 d->bufferMode = QDeclarativeGridViewPrivate::BufferBefore;
@@ -1546,7 +1555,7 @@ void QDeclarativeGridView::viewportMoved()
         }
     }
     refill();
-    if (isFlicking() || d->moving)
+    if (d->flickingHorizontally || d->flickingVertically || d->movingHorizontally || d->movingVertically)
         d->moveReason = QDeclarativeGridViewPrivate::Mouse;
     if (d->moveReason != QDeclarativeGridViewPrivate::SetIndex) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
@@ -1885,7 +1894,8 @@ void QDeclarativeGridView::trackedPositionChanged()
     Q_D(QDeclarativeGridView);
     if (!d->trackedItem || !d->currentItem)
         return;
-    if (!isFlicking() && !d->moving && d->moveReason == QDeclarativeGridViewPrivate::SetIndex) {
+    if (!d->flickingHorizontally && !d->flickingVertically && !d->movingHorizontally && !d->movingVertically
+        && d->moveReason == QDeclarativeGridViewPrivate::SetIndex) {
         const qreal trackedPos = d->trackedItem->rowPos();
         const qreal viewPos = d->position();
         if (d->haveHighlightRange) {
@@ -2301,9 +2311,13 @@ void QDeclarativeGridView::destroyingItem(QDeclarativeItem *item)
 void QDeclarativeGridView::animStopped()
 {
     Q_D(QDeclarativeGridView);
-    d->bufferMode = QDeclarativeGridViewPrivate::NoBuffer;
-    if (d->haveHighlightRange && d->highlightRange == QDeclarativeGridView::StrictlyEnforceRange)
-        d->updateHighlight();
+    if ((!d->movingVertically && d->flow == QDeclarativeGridView::LeftToRight)
+        || (!d->movingHorizontally && d->flow == QDeclarativeGridView::TopToBottom))
+    {
+        d->bufferMode = QDeclarativeGridViewPrivate::NoBuffer;
+        if (d->haveHighlightRange && d->highlightRange == QDeclarativeGridView::StrictlyEnforceRange)
+            d->updateHighlight();
+    }
 }
 
 void QDeclarativeGridView::refill()
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 65edb03..20106cb 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -525,8 +525,9 @@ void QDeclarativeListViewPrivate::init()
     Q_Q(QDeclarativeListView);
     q->setFlag(QGraphicsItem::ItemIsFocusScope);
     addItemChangeListener(this, Geometry);
-    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
-    q->setFlickDirection(QDeclarativeFlickable::VerticalFlick);
+    QObject::connect(q, SIGNAL(movingHorizontallyChanged()), q, SLOT(animStopped()));
+    QObject::connect(q, SIGNAL(movingVerticallyChanged()), q, SLOT(animStopped()));
+    q->setFlickableDirection(QDeclarativeFlickable::VerticalFlick);
     ::memset(sectionCache, 0, sizeof(QDeclarativeItem*) * sectionCacheSize);
 }
 
@@ -869,7 +870,7 @@ void QDeclarativeListViewPrivate::updateHighlight()
 {
     if ((!currentItem && highlight) || (currentItem && !highlight))
         createHighlight();
-    if (currentItem && autoHighlight && highlight && !moving) {
+    if (currentItem && autoHighlight && highlight && !movingHorizontally && !movingVertically) {
         // auto-update highlight
         highlightPosAnimator->to = currentItem->position();
         highlightSizeAnimator->to = currentItem->size();
@@ -1209,7 +1210,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
             else
                 v = maxVelocity;
         }
-        if (!flicked) {
+        if (!flickingHorizontally && !flickingVertically) {
             // the initial flick - estimate boundary
             qreal accel = deceleration;
             qreal v2 = v * v;
@@ -1257,9 +1258,16 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
             timeline.reset(data.move);
             timeline.accel(data.move, v, accel, maxDistance + overshootDist);
             timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
-            flicked = true;
-            emit q->flickingChanged();
-            emit q->flickStarted();
+            if (!flickingHorizontally && q->xflick()) {
+                flickingHorizontally = true;
+                emit q->flickingChanged(); // deprecated
+                emit q->flickingHorizontallyChanged();
+            }
+            if (!flickingVertically && q->yflick()) {
+                flickingVertically = true;
+                emit q->flickingChanged(); // deprecated
+                emit q->flickingVerticallyChanged();
+            }
             correctFlick = true;
         } else {
             // reevaluate the target boundary.
@@ -1805,10 +1813,10 @@ void QDeclarativeListView::setOrientation(QDeclarativeListView::Orientation orie
         d->orient = orientation;
         if (d->orient == QDeclarativeListView::Vertical) {
             setContentWidth(-1);
-            setFlickDirection(VerticalFlick);
+            setFlickableDirection(VerticalFlick);
         } else {
             setContentHeight(-1);
-            setFlickDirection(HorizontalFlick);
+            setFlickableDirection(HorizontalFlick);
         }
         d->clear();
         d->setPosition(0);
@@ -2107,7 +2115,7 @@ void QDeclarativeListView::viewportMoved()
     QDeclarativeFlickable::viewportMoved();
     d->lazyRelease = true;
     refill();
-    if (isFlicking() || d->moving)
+    if (d->flickingHorizontally || d->flickingVertically || d->movingHorizontally || d->movingVertically)
         d->moveReason = QDeclarativeListViewPrivate::Mouse;
     if (d->moveReason != QDeclarativeListViewPrivate::SetIndex) {
         if (d->haveHighlightRange && d->highlightRange == StrictlyEnforceRange && d->highlight) {
@@ -2127,7 +2135,7 @@ void QDeclarativeListView::viewportMoved()
         }
     }
 
-    if (d->flicked && d->correctFlick && !d->inFlickCorrection) {
+    if ((d->flickingHorizontally || d->flickingVertically) && d->correctFlick && !d->inFlickCorrection) {
         d->inFlickCorrection = true;
         // Near an end and it seems that the extent has changed?
         // Recalculate the flick so that we don't end up in an odd position.
@@ -2447,7 +2455,8 @@ void QDeclarativeListView::trackedPositionChanged()
     Q_D(QDeclarativeListView);
     if (!d->trackedItem || !d->currentItem)
         return;
-    if (!isFlicking() && !d->moving && d->moveReason == QDeclarativeListViewPrivate::SetIndex) {
+    if (!d->flickingHorizontally && !d->flickingVertically && !d->movingHorizontally && !d->movingVertically
+        && d->moveReason == QDeclarativeListViewPrivate::SetIndex) {
         const qreal trackedPos = qCeil(d->trackedItem->position());
         const qreal viewPos = d->position();
         if (d->haveHighlightRange) {
@@ -2881,9 +2890,12 @@ void QDeclarativeListView::destroyingItem(QDeclarativeItem *item)
 void QDeclarativeListView::animStopped()
 {
     Q_D(QDeclarativeListView);
-    d->bufferMode = QDeclarativeListViewPrivate::NoBuffer;
-    if (d->haveHighlightRange && d->highlightRange == QDeclarativeListView::StrictlyEnforceRange)
-        d->updateHighlight();
+    if ((!d->movingVertically && d->orient == QDeclarativeListView::Vertical) || (!d->movingHorizontally && d->orient == QDeclarativeListView::Horizontal))
+    {
+        d->bufferMode = QDeclarativeListViewPrivate::NoBuffer;
+        if (d->haveHighlightRange && d->highlightRange == QDeclarativeListView::StrictlyEnforceRange)
+            d->updateHighlight();
+    }
 }
 
 QDeclarativeListViewAttached *QDeclarativeListView::qmlAttachedProperties(QObject *obj)
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 9ce9c49..2c6890e 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -61,6 +61,7 @@ private slots:
     void maximumFlickVelocity();
     void flickDeceleration();
     void pressDelay();
+    void flickableDirection();
 
 private:
     QDeclarativeEngine engine;
@@ -224,6 +225,33 @@ void tst_qdeclarativeflickable::pressDelay()
     QCOMPARE(spy.count(),1);
 }
 
+void tst_qdeclarativeflickable::flickableDirection()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt 4.7; Flickable { flickableDirection: Flickable.VerticalFlick; }", QUrl::fromLocalFile(""));
+    QDeclarativeFlickable *flickable = qobject_cast(component.create());
+    QSignalSpy spy(flickable, SIGNAL(flickableDirectionChanged()));
+
+    QVERIFY(flickable);
+    QCOMPARE(flickable->flickableDirection(), QDeclarativeFlickable::VerticalFlick);
+
+    flickable->setFlickableDirection(QDeclarativeFlickable::HorizontalAndVerticalFlick);
+    QCOMPARE(flickable->flickableDirection(), QDeclarativeFlickable::HorizontalAndVerticalFlick);
+    QCOMPARE(spy.count(),1);
+
+    flickable->setFlickableDirection(QDeclarativeFlickable::AutoFlickDirection);
+    QCOMPARE(flickable->flickableDirection(), QDeclarativeFlickable::AutoFlickDirection);
+    QCOMPARE(spy.count(),2);
+
+    flickable->setFlickableDirection(QDeclarativeFlickable::HorizontalFlick);
+    QCOMPARE(flickable->flickableDirection(), QDeclarativeFlickable::HorizontalFlick);
+    QCOMPARE(spy.count(),3);
+
+    flickable->setFlickableDirection(QDeclarativeFlickable::HorizontalFlick);
+    QCOMPARE(flickable->flickableDirection(), QDeclarativeFlickable::HorizontalFlick);
+    QCOMPARE(spy.count(),3);
+}
+
 QTEST_MAIN(tst_qdeclarativeflickable)
 
 #include "tst_qdeclarativeflickable.moc"
-- 
cgit v0.12


From 9a45f780a24625f8f1104a6e2442f00874ab296f Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Wed, 12 May 2010 16:27:34 +1000
Subject: Improve Image docs. Move all fillMode image examples to fillMode
 property docs and remove the animated gif.

---
 doc/src/images/declarative-image_fillMode.gif      | Bin 79561 -> 0 bytes
 .../declarative-qtlogo-preserveaspectcrop.png      | Bin 0 -> 6440 bytes
 .../declarative-qtlogo-preserveaspectfit.png       | Bin 0 -> 4076 bytes
 doc/src/images/declarative-qtlogo-stretch.png      | Bin 0 -> 5584 bytes
 doc/src/images/declarative-qtlogo-tile.png         | Bin 0 -> 3940 bytes
 .../images/declarative-qtlogo-tilehorizontally.png | Bin 0 -> 5544 bytes
 .../images/declarative-qtlogo-tilevertically.png   | Bin 0 -> 6288 bytes
 doc/src/images/declarative-qtlogo.png              | Bin 0 -> 3436 bytes
 doc/src/images/declarative-qtlogo1.png             | Bin 3436 -> 0 bytes
 doc/src/images/declarative-qtlogo2.png             | Bin 11023 -> 0 bytes
 doc/src/images/declarative-qtlogo3.png             | Bin 4783 -> 0 bytes
 doc/src/images/declarative-qtlogo4.png             | Bin 11241 -> 0 bytes
 doc/src/images/declarative-qtlogo5.png             | Bin 3553 -> 0 bytes
 doc/src/images/declarative-qtlogo6.png             | Bin 4763 -> 0 bytes
 .../graphicsitems/qdeclarativeimage.cpp            | 193 ++++++++++++---------
 15 files changed, 109 insertions(+), 84 deletions(-)
 delete mode 100644 doc/src/images/declarative-image_fillMode.gif
 create mode 100644 doc/src/images/declarative-qtlogo-preserveaspectcrop.png
 create mode 100644 doc/src/images/declarative-qtlogo-preserveaspectfit.png
 create mode 100644 doc/src/images/declarative-qtlogo-stretch.png
 create mode 100644 doc/src/images/declarative-qtlogo-tile.png
 create mode 100644 doc/src/images/declarative-qtlogo-tilehorizontally.png
 create mode 100644 doc/src/images/declarative-qtlogo-tilevertically.png
 create mode 100644 doc/src/images/declarative-qtlogo.png
 delete mode 100644 doc/src/images/declarative-qtlogo1.png
 delete mode 100644 doc/src/images/declarative-qtlogo2.png
 delete mode 100644 doc/src/images/declarative-qtlogo3.png
 delete mode 100644 doc/src/images/declarative-qtlogo4.png
 delete mode 100644 doc/src/images/declarative-qtlogo5.png
 delete mode 100644 doc/src/images/declarative-qtlogo6.png

diff --git a/doc/src/images/declarative-image_fillMode.gif b/doc/src/images/declarative-image_fillMode.gif
deleted file mode 100644
index eb0a9af..0000000
Binary files a/doc/src/images/declarative-image_fillMode.gif and /dev/null differ
diff --git a/doc/src/images/declarative-qtlogo-preserveaspectcrop.png b/doc/src/images/declarative-qtlogo-preserveaspectcrop.png
new file mode 100644
index 0000000..64fb086
Binary files /dev/null and b/doc/src/images/declarative-qtlogo-preserveaspectcrop.png differ
diff --git a/doc/src/images/declarative-qtlogo-preserveaspectfit.png b/doc/src/images/declarative-qtlogo-preserveaspectfit.png
new file mode 100644
index 0000000..2585fa5
Binary files /dev/null and b/doc/src/images/declarative-qtlogo-preserveaspectfit.png differ
diff --git a/doc/src/images/declarative-qtlogo-stretch.png b/doc/src/images/declarative-qtlogo-stretch.png
new file mode 100644
index 0000000..32a0114
Binary files /dev/null and b/doc/src/images/declarative-qtlogo-stretch.png differ
diff --git a/doc/src/images/declarative-qtlogo-tile.png b/doc/src/images/declarative-qtlogo-tile.png
new file mode 100644
index 0000000..7d1b9d0
Binary files /dev/null and b/doc/src/images/declarative-qtlogo-tile.png differ
diff --git a/doc/src/images/declarative-qtlogo-tilehorizontally.png b/doc/src/images/declarative-qtlogo-tilehorizontally.png
new file mode 100644
index 0000000..367a8c7
Binary files /dev/null and b/doc/src/images/declarative-qtlogo-tilehorizontally.png differ
diff --git a/doc/src/images/declarative-qtlogo-tilevertically.png b/doc/src/images/declarative-qtlogo-tilevertically.png
new file mode 100644
index 0000000..68afafa
Binary files /dev/null and b/doc/src/images/declarative-qtlogo-tilevertically.png differ
diff --git a/doc/src/images/declarative-qtlogo.png b/doc/src/images/declarative-qtlogo.png
new file mode 100644
index 0000000..940d159
Binary files /dev/null and b/doc/src/images/declarative-qtlogo.png differ
diff --git a/doc/src/images/declarative-qtlogo1.png b/doc/src/images/declarative-qtlogo1.png
deleted file mode 100644
index 940d159..0000000
Binary files a/doc/src/images/declarative-qtlogo1.png and /dev/null differ
diff --git a/doc/src/images/declarative-qtlogo2.png b/doc/src/images/declarative-qtlogo2.png
deleted file mode 100644
index b1d128a..0000000
Binary files a/doc/src/images/declarative-qtlogo2.png and /dev/null differ
diff --git a/doc/src/images/declarative-qtlogo3.png b/doc/src/images/declarative-qtlogo3.png
deleted file mode 100644
index d516524..0000000
Binary files a/doc/src/images/declarative-qtlogo3.png and /dev/null differ
diff --git a/doc/src/images/declarative-qtlogo4.png b/doc/src/images/declarative-qtlogo4.png
deleted file mode 100644
index 7c8aa64..0000000
Binary files a/doc/src/images/declarative-qtlogo4.png and /dev/null differ
diff --git a/doc/src/images/declarative-qtlogo5.png b/doc/src/images/declarative-qtlogo5.png
deleted file mode 100644
index b7b3513..0000000
Binary files a/doc/src/images/declarative-qtlogo5.png and /dev/null differ
diff --git a/doc/src/images/declarative-qtlogo6.png b/doc/src/images/declarative-qtlogo6.png
deleted file mode 100644
index 07a078f..0000000
Binary files a/doc/src/images/declarative-qtlogo6.png and /dev/null differ
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index aeddb15..88e8520 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -54,79 +54,36 @@ QT_BEGIN_NAMESPACE
     \brief The Image element allows you to add bitmaps to a scene.
     \inherits Item
 
-    Displays the image from the specified \l source.  If a size is not specified explicitly,
-    the Image element will be sized to the loaded image.
+    An Image element displays a specified \l source image:
 
-    If the source resolves to a network resource, the image will be loaded asynchronously,
-    updating the \l progress and \l status properties appropriately.
+    \table
+    \o
+    \image declarative-qtlogo.png
+    \o
+    \qml
+        import Qt 4.7
+
+        Image { source: "qtlogo.png" }
+    \endqml
+    \endtable
+    
+    If a size is not specified explicitly, the Image element is sized to the loaded image.
+    Image elements can be stretched and tiled using the \l fillMode property.
 
-    Images which are available locally
-    will be loaded immediately, blocking the user interface.  This is typically the
-    correct behavior for user interface elements.  For large local images, which do not need
-    to be visible immediately, it may be preferable to enable \l asynchronous loading.
-    This will load the image in the background using a low priority thread.
+    If the image \l source is a network resource, the image is loaded asynchronous and the
+    \l progress and \l status properties are updated appropriately.  Otherwise, if the image is
+    available locally, it is loaded immediately and the user interface is blocked until loading is
+    complete.  (This is typically the correct behavior for user interface elements.)
+    For large local images, which do not need to be visible immediately, it may be preferable to
+    enable \l asynchronous loading.  This loads the image in the background using a low priority thread.
 
     Images are cached and shared internally, so if several Image elements have the same source
     only one copy of the image will be loaded.
 
-    \bold Note: Images are often the greatest user of memory in QML UIs.  It is recommended
+    \bold Note: Images are often the greatest user of memory in QML user interfaces.  It is recommended
     that images which do not form part of the user interface have their
     size bounded via the \l sourceSize property. This is especially important for content
     that is loaded from external sources or provided by the user.
-
-    The Image element supports untransformed, stretched and tiled images.
-
-    For an explanation of stretching and tiling, see the fillMode property description.
-
-    Examples:
-    \table
-    \row
-    \o \image declarative-qtlogo1.png
-    \o Untransformed
-    \qml
-    Image { source: "pics/qtlogo.png" }
-    \endqml
-    \row
-    \o \image declarative-qtlogo2.png
-    \o fillMode: Stretch (default)
-    \qml
-    Image {
-        width: 160
-        height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \row
-    \o \image declarative-qtlogo3.png
-    \o fillMode: Tile
-    \qml
-    Image {
-        fillMode: Image.Tile
-        width: 160; height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \row
-    \o \image declarative-qtlogo6.png
-    \o fillMode: TileVertically
-    \qml
-    Image {
-        fillMode: Image.TileVertically
-        width: 160; height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \row
-    \o \image declarative-qtlogo5.png
-    \o fillMode: TileHorizontally
-    \qml
-    Image {
-        fillMode: Image.TileHorizontally
-        width: 160; height: 160
-        source: "pics/qtlogo.png"
-    }
-    \endqml
-    \endtable
 */
 
 /*!
@@ -207,7 +164,77 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap)
     \o Image.TileHorizontally - the image is stretched vertically and tiled horizontally
     \endlist
 
-    \image declarative-image_fillMode.gif
+    \table
+    
+    \row
+    \o \image declarative-qtlogo-stretch.png
+    \o Stretch (default)
+    \qml
+    Image {
+        width: 130; height: 100
+        smooth: true
+        source: "qtlogo.png"
+    }
+    \endqml
+
+    \row
+    \o \image declarative-qtlogo-preserveaspectfit.png
+    \o PreserveAspectFit
+    \qml
+    Image {
+        width: 130; height: 100
+        fillMode: Image.PreserveAspectFit
+        smooth: true
+        source: "qtlogo.png"
+    }
+    \endqml
+
+    \row
+    \o \image declarative-qtlogo-preserveaspectcrop.png
+    \o PreserveAspectCrop
+    \qml
+    Image {
+        width: 130; height: 100
+        fillMode: Image.PreserveAspectCrop
+        smooth: true
+        source: "qtlogo.png"
+    }
+    \endqml
+
+    \row
+    \o \image declarative-qtlogo-tile.png
+    \o Tile
+    \qml
+    Image {
+        width: 120; height: 120
+        fillMode: Image.Tile
+        source: "qtlogo.png"
+    }
+    \endqml
+
+    \row
+    \o \image declarative-qtlogo-tilevertically.png
+    \o TileVertically
+    \qml
+    Image {
+        width: 120; height: 120
+        fillMode: Image.TileVertically
+        source: "qtlogo.png"
+    }
+    \endqml
+
+    \row
+    \o \image declarative-qtlogo-tilehorizontally.png
+    \o TileHorizontally
+    \qml
+    Image {
+        width: 120; height: 120
+        fillMode: Image.TileHorizontally
+        source: "qtlogo.png"
+    }
+    \endqml
+
+    \endtable
 */
 QDeclarativeImage::FillMode QDeclarativeImage::fillMode() const
 {
@@ -290,32 +317,30 @@ qreal QDeclarativeImage::paintedHeight() const
 /*!
     \qmlproperty QSize Image::sourceSize
 
-    This properties is the size of the loaded image, in pixels.
+    This property holds the size of the loaded image, in pixels.
 
-    If you set this property explicitly, you can to control the storage
-    used by a loaded image. The image will be scaled down if its intrinsic size
-    is greater than this value.
-
-    If only one dimension of the size is set (and the other left at 0), the
-    unset dimension will be set in proportion to the set dimension to preserve
-    the source image aspect ratio. The fillMode is independent of this.
-
-    Unlike setting the width and height properties, which merely scale the painting
-    of the image, this property affects the number of pixels stored.
-
-    \e{Changing this property dynamically will lead to the image source being reloaded,
-    potentially even from the network if it is not in the disk cache.}
+    This is used to control the storage used by a loaded image. Unlike
+    the width and height properties, which scale the painting of the image, this property
+    affects the number of pixels stored.
 
+    If the image's actual size is larger than the sourceSize, the image is scaled down.
+    If only one dimension of the size is set to greater than 0, the
+    other dimension is set in proportion to preserve the source image's aspect ratio.
+    (The \l fillMode is independent of this.)
+   
     If the source is an instrinsically scalable image (eg. SVG), this property
-    determines the size of the loaded image regardless of intrinsic size. You should
-    avoid changing this property dynamically - rendering an SVG is \e slow compared
+    determines the size of the loaded image regardless of intrinsic size.
+    Avoid changing this property dynamically; rendering an SVG is \e slow compared
     to an image.
 
     If the source is a non-scalable image (eg. JPEG), the loaded image will
     be no greater than this property specifies. For some formats (currently only JPEG),
     the whole image will never actually be loaded into memory.
+ 
+    \note \e{Changing this property dynamically will lead to the image source being reloaded,
+    potentially even from the network if it is not in the disk cache.}
 
-    The example below will ensure that the size of the image in memory is
+    Here is an example that ensures the size of the image in memory is
     no larger than 1024x1024 pixels, regardless of the size of the Image element.
 
     \code
@@ -327,8 +352,8 @@ qreal QDeclarativeImage::paintedHeight() const
     }
     \endcode
 
-    The example below will ensure that the memory used by the image is
-    no more than necessary to display the image at the size of the Image element.
+    The example below ensures the memory used by the image is no more than necessary 
+    to display the image at the size of the Image element.
     Of course if the Image element is resized a costly reload will be required, so
     use this technique \e only when the Image size is fixed.
 
-- 
cgit v0.12


From 01fbf55727678509f87523ef2ddda1d21d4ac2ab Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Wed, 12 May 2010 17:02:14 +1000
Subject: Correctly assign bool to variant properties

QTBUG-10623
---
 src/declarative/qml/qdeclarativecompiler.cpp                   |  4 ++++
 src/declarative/qml/qdeclarativeinstruction.cpp                |  3 +++
 src/declarative/qml/qdeclarativeinstruction_p.h                |  1 +
 src/declarative/qml/qdeclarativevme.cpp                        | 10 ++++++++++
 .../qdeclarativelanguage/data/assignLiteralToVariant.qml       |  2 ++
 .../qdeclarativelanguage/tst_qdeclarativelanguage.cpp          |  4 ++++
 6 files changed, 24 insertions(+)

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 6d420a7..a43b9ac 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -352,6 +352,10 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop,
                     instr.storeDouble.propertyIndex = prop.propertyIndex();
                     instr.storeDouble.value = n;
                 }
+            } else if(v->value.isBoolean()) {
+                instr.type = QDeclarativeInstruction::StoreVariantBool;
+                instr.storeBool.propertyIndex = prop.propertyIndex();
+                instr.storeBool.value = v->value.asBoolean();
             } else {
                 instr.type = QDeclarativeInstruction::StoreVariant;
                 instr.storeString.propertyIndex = prop.propertyIndex();
diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp
index 99f1cc8..0236950 100644
--- a/src/declarative/qml/qdeclarativeinstruction.cpp
+++ b/src/declarative/qml/qdeclarativeinstruction.cpp
@@ -136,6 +136,9 @@ void QDeclarativeCompiledData::dump(QDeclarativeInstruction *instr, int idx)
     case QDeclarativeInstruction::StoreVariantDouble:
         qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VARIANT_DOUBLE\t\t" << instr->storeDouble.propertyIndex << "\t" << instr->storeDouble.value;
         break;
+    case QDeclarativeInstruction::StoreVariantBool:
+        qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_VARIANT_BOOL\t\t" << instr->storeBool.propertyIndex << "\t" << instr->storeBool.value;
+        break;
     case QDeclarativeInstruction::StoreObject:
         qWarning().nospace() << idx << "\t\t" << line << "\t" << "STORE_OBJECT\t\t" << instr->storeObject.propertyIndex;
         break;
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index c09b157..dc5f2f8 100644
--- a/src/declarative/qml/qdeclarativeinstruction_p.h
+++ b/src/declarative/qml/qdeclarativeinstruction_p.h
@@ -116,6 +116,7 @@ public:
         StoreVariant,             /* storeString */
         StoreVariantInteger,      /* storeInteger */
         StoreVariantDouble,       /* storeDouble */
+        StoreVariantBool,         /* storeBool */
         StoreObject,              /* storeObject */
         StoreVariantObject,       /* storeObject */
         StoreInterface,           /* storeObject */
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 3e63e24..8ba79a6 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -360,6 +360,16 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack &stack,
             }
             break;
 
+        case QDeclarativeInstruction::StoreVariantBool:
+            {
+                QObject *target = stack.top();
+                QVariant v(instr.storeBool.value);
+                void *a[] = { &v, 0, &status, &flags };
+                QMetaObject::metacall(target, QMetaObject::WriteProperty, 
+                                      instr.storeString.propertyIndex, a);
+            }
+            break;
+
         case QDeclarativeInstruction::StoreString:
             {
                 QObject *target = stack.top();
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
index 5af3d6e..bac704e 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml
@@ -10,5 +10,7 @@ QtObject {
     property variant test7: "10x10"
     property variant test8: "100,100,100"
     property variant test9: String("#FF008800")
+    property variant test10: true
+    property variant test11: false
 }
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index ff03005..6b070f5 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -536,6 +536,8 @@ void tst_qdeclarativelanguage::assignLiteralToVariant()
     QCOMPARE(object->property("test7").userType(), (int)QVariant::SizeF);
     QCOMPARE(object->property("test8").userType(), (int)QVariant::Vector3D);
     QCOMPARE(object->property("test9").userType(), (int)QVariant::String);
+    QCOMPARE(object->property("test10").userType(), (int)QVariant::Bool);
+    QCOMPARE(object->property("test11").userType(), (int)QVariant::Bool);
 
     QVERIFY(object->property("test1") == QVariant(1));
     QVERIFY(object->property("test2") == QVariant((double)1.7));
@@ -546,6 +548,8 @@ void tst_qdeclarativelanguage::assignLiteralToVariant()
     QVERIFY(object->property("test7") == QVariant(QSizeF(10, 10)));
     QVERIFY(object->property("test8") == QVariant(QVector3D(100, 100, 100)));
     QVERIFY(object->property("test9") == QVariant(QString(QLatin1String("#FF008800"))));
+    QVERIFY(object->property("test10") == QVariant(bool(true)));
+    QVERIFY(object->property("test11") == QVariant(bool(false)));
 
     delete object;
 }
-- 
cgit v0.12


From ad7988629c47a5fc1a671d36d9cdaed630f5e7f2 Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Wed, 12 May 2010 09:24:39 +0200
Subject: Stabilize tst_QWidgetAction::visibilityUpdate

---
 tests/auto/qwidgetaction/tst_qwidgetaction.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
index 5dfcd43..53dc4b5 100644
--- a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
@@ -51,6 +51,8 @@
 #include 
 #include 
 
+#include "../../shared/util.h"
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -190,8 +192,8 @@ void tst_QWidgetAction::visibilityUpdate()
     QVERIFY(action->isVisible());
 
     action->setVisible(false);
-    QTest::qWait(100); //the call to hide is delayed by the toolbar layout
-    QVERIFY(!combo->isVisible());
+    qApp->processEvents(); //the call to hide is delayed by the toolbar layout
+    QTRY_VERIFY(!combo->isVisible());
 
     delete action;
     // action also deletes combo
-- 
cgit v0.12


From a81cc0add7f9517dfbd31bb9988ab6bdc08c2b96 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen 
Date: Wed, 12 May 2010 10:36:18 +0300
Subject: Provide a way to specify the final sis name with createpackage/make
 sis

The -n parameter can be used to specify the final sis name when
using createpackage script or "make sis" with QT_SIS_OPTIONS.

Task-number: QTBUG-9400
Reviewed-by: Janne Koskinen
---
 bin/createpackage.pl                        | 29 ++++++++++++++++++++++-------
 doc/src/platforms/symbian-introduction.qdoc |  5 ++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index e844767..7453ba5 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -69,15 +69,17 @@ Convenience script for creating signed packages you can install on your phone.
 Usage: createpackage.pl [options] templatepkg [target]-[platform] [certificate key [passphrase]]
 
 Where supported options are as follows:
-     [-i|install]            = Install the package right away using PC suite
+     [-i|install]            = Install the package right away using PC suite.
      [-p|preprocess]         = Only preprocess the template .pkg file.
-     [-c|certfile=]    = The file containing certificate information for signing.
+     [-c|certfile ]    = The file containing certificate information for signing.
                                The file can have several certificates, each specified in
                                separate line. The certificate, key and passphrase in line
                                must be ';' separated. Lines starting with '#' are treated
                                as a comments. Also empty lines are ignored. The paths in
                                 can be absolute or relative to .
-     [-u|unsigned]           = Preserves the unsigned package
+     [-u|unsigned]           = Preserves the unsigned package.
+     [-s|stub]               = Generates stub sis for ROM.
+     [-n|sisname ]     = Specifies the final sis name.
 Where parameters are as follows:
      templatepkg             = Name of .pkg file template
      target                  = Either debug or release
@@ -118,12 +120,14 @@ my $preprocessonly = "";
 my $certfile = "";
 my $preserveUnsigned = "";
 my $stub = "";
+my $signed_sis_name = "";
 
 unless (GetOptions('i|install' => \$install,
                    'p|preprocess' => \$preprocessonly,
                    'c|certfile=s' => \$certfile,
                    'u|unsigned' => \$preserveUnsigned,
-                   's|stub' => \$stub,)){
+                   's|stub' => \$stub,
+                   'n|sisname=s' => \$signed_sis_name,)) {
     Usage();
 }
 
@@ -162,10 +166,21 @@ $pkgoutputbasename = $pkgoutputbasename;
 
 # Store output file names to variables
 my $pkgoutput = $pkgoutputbasename.".pkg";
-my $sisoutputbasename = $pkgoutputbasename;
-$sisoutputbasename =~ s/_$targetplatform//g;
+my $sisoutputbasename;
+if ($signed_sis_name eq "") {
+    $sisoutputbasename = $pkgoutputbasename;
+    $sisoutputbasename =~ s/_$targetplatform//g;
+    $signed_sis_name = $sisoutputbasename.".sis";
+} else {
+    $sisoutputbasename = $signed_sis_name;
+    if ($sisoutputbasename =~ m/(\.sis$|\.sisx$)/i) {
+        $sisoutputbasename =~ s/$1//i;
+    } else {
+        $signed_sis_name = $signed_sis_name.".sis";
+    }
+}
+
 my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis";
-my $signed_sis_name = $sisoutputbasename.".sis";
 my $stub_sis_name = $sisoutputbasename."_stub.sis";
 
 # Store some utility variables
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 591d6f1..6ffc568 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -191,7 +191,10 @@
     \table
     \row \o -i                  \o Install the package right away using PC suite.
     \row \o -p                  \o Only preprocess the template \c .pkg file.
-    \row \o -c=           \o Read certificate information from a file.
+    \row \o -c            \o Read certificate information from a file.
+    \row \o -u                  \o Preserves unsigned package.
+    \row \o -s                  \o Generates stub sis for ROM.
+    \row \o -n            \o Specifies the final sis name.
     \endtable
 
     Execute the \c{createpackage.pl} script without any
-- 
cgit v0.12


From 9b6041bf62cfd2b0be62134ff6ee0fd488ce5921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= 
Date: Wed, 12 May 2010 12:37:47 +0200
Subject: Modified QPainter and QPixmap benchmarks to use raster pixmaps.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These benchmarks are not written in a way that supports robust
benchmarking of asynchronous pixmap backends.

Reviewed-by: Bjørn Erik Nilsen
---
 tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp | 38 +++++++++--
 .../gui/painting/qpainter/tst_qpainter.cpp         | 79 +++++++++++++++-------
 2 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp b/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp
index 9ffbefb..8e9de4a 100644
--- a/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/benchmarks/gui/image/qpixmap/tst_qpixmap.cpp
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class tst_QPixmap : public QObject
 {
@@ -67,6 +68,31 @@ Q_DECLARE_METATYPE(QImage::Format)
 Q_DECLARE_METATYPE(Qt::AspectRatioMode)
 Q_DECLARE_METATYPE(Qt::TransformationMode)
 
+QPixmap rasterPixmap(int width, int height)
+{
+    QPixmapData *data =
+        new QRasterPixmapData(QPixmapData::PixmapType);
+
+    data->resize(width, height);
+
+    return QPixmap(data);
+}
+
+QPixmap rasterPixmap(const QSize &size)
+{
+    return rasterPixmap(size.width(), size.height());
+}
+
+QPixmap rasterPixmap(const QImage &image)
+{
+    QPixmapData *data =
+        new QRasterPixmapData(QPixmapData::PixmapType);
+
+    data->fromImage(image, Qt::AutoColor);
+
+    return QPixmap(data);
+}
+
 tst_QPixmap::tst_QPixmap()
 {
 }
@@ -90,7 +116,7 @@ void tst_QPixmap::fill()
     QFETCH(int, height);
 
     const QColor color = opaque ? QColor(255, 0, 0) : QColor(255, 0, 0, 200);
-    QPixmap pixmap(width, height);
+    QPixmap pixmap = rasterPixmap(width, height);
 
     QBENCHMARK {
         pixmap.fill(color);
@@ -126,8 +152,8 @@ void tst_QPixmap::scaled()
     QFETCH(Qt::AspectRatioMode, ratioMode);
     QFETCH(Qt::TransformationMode, transformMode);
 
-    QPixmap opaque(size);
-    QPixmap transparent(size);
+    QPixmap opaque = rasterPixmap(size);
+    QPixmap transparent = rasterPixmap(size);
     opaque.fill(QColor(255, 0, 0));
     transparent.fill(QColor(255, 0, 0, 200));
 
@@ -180,8 +206,8 @@ void tst_QPixmap::transformed()
     QFETCH(QTransform, transform);
     QFETCH(Qt::TransformationMode, transformMode);
 
-    QPixmap opaque(size);
-    QPixmap transparent(size);
+    QPixmap opaque = rasterPixmap(size);
+    QPixmap transparent = rasterPixmap(size);
     opaque.fill(QColor(255, 0, 0));
     transparent.fill(QColor(255, 0, 0, 200));
 
@@ -209,7 +235,7 @@ void tst_QPixmap::mask()
 {
     QFETCH(QSize, size);
 
-    QPixmap src(size);
+    QPixmap src = rasterPixmap(size);
     src.fill(Qt::transparent);
     {
         QPainter p(&src);
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
index d570bb3..318b671 100644
--- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
@@ -50,6 +50,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 
+#include 
+
 Q_DECLARE_METATYPE(QLine)
 Q_DECLARE_METATYPE(QRect)
 Q_DECLARE_METATYPE(QSize)
@@ -125,6 +127,32 @@ struct PrimitiveSet {
 };
 
 
+QPixmap rasterPixmap(int width, int height)
+{
+    QPixmapData *data =
+        new QRasterPixmapData(QPixmapData::PixmapType);
+
+    data->resize(width, height);
+
+    return QPixmap(data);
+}
+
+QPixmap rasterPixmap(const QSize &size)
+{
+    return rasterPixmap(size.width(), size.height());
+}
+
+QPixmap rasterPixmap(const QImage &image)
+{
+    QPixmapData *data =
+        new QRasterPixmapData(QPixmapData::PixmapType);
+
+    data->fromImage(image, Qt::AutoColor);
+
+    return QPixmap(data);
+}
+
+
 class tst_QPainter : public QObject
 {
     Q_OBJECT
@@ -222,7 +250,8 @@ private:
 
     QPaintDevice *surface()
     {
-        return new QPixmap(1024, 1024);
+        m_pixmap = rasterPixmap(1024, 1024);
+        return &m_pixmap;
     }
 
 
@@ -233,6 +262,7 @@ private:
     PrimitiveSet m_primitives_100;
     PrimitiveSet m_primitives_1000;
 
+    QPixmap m_pixmap;
     QPaintDevice *m_surface;
     QPainter m_painter;
 
@@ -490,7 +520,7 @@ void tst_QPainter::setupBrushes()
 
 void tst_QPainter::beginAndEnd()
 {
-    QPixmap pixmap(100, 100);
+    QPixmap pixmap = rasterPixmap(100, 100);
 
     QBENCHMARK {
         QPainter p;
@@ -505,10 +535,11 @@ void tst_QPainter::drawLine()
     QFETCH(QPen, pen);
 
     const int offset = 5;
-    QPixmap pixmapUnclipped(qMin(line.x1(), line.x2())
-                            + 2*offset + qAbs(line.dx()),
-                            qMin(line.y1(), line.y2())
-                            + 2*offset + qAbs(line.dy()));
+    QPixmap pixmapUnclipped =
+        rasterPixmap(qMin(line.x1(), line.x2())
+                     + 2*offset + qAbs(line.dx()),
+                     qMin(line.y1(), line.y2())
+                     + 2*offset + qAbs(line.dy()));
     pixmapUnclipped.fill(Qt::white);
 
     QPainter p(&pixmapUnclipped);
@@ -535,10 +566,11 @@ void tst_QPainter::drawLine_clipped()
     QFETCH(QPen, pen);
 
     const int offset = 5;
-    QPixmap pixmapClipped(qMin(line.x1(), line.x2())
-                          + 2*offset + qAbs(line.dx()),
-                          qMin(line.y1(), line.y2())
-                          + 2*offset + qAbs(line.dy()));
+    QPixmap pixmapClipped
+        = rasterPixmap(qMin(line.x1(), line.x2())
+                       + 2*offset + qAbs(line.dx()),
+                       qMin(line.y1(), line.y2())
+                       + 2*offset + qAbs(line.dy()));
 
     const QRect clip = QRect(line.p1(), line.p2()).normalized();
 
@@ -569,10 +601,11 @@ void tst_QPainter::drawLine_antialiased_clipped()
     QFETCH(QPen, pen);
 
     const int offset = 5;
-    QPixmap pixmapClipped(qMin(line.x1(), line.x2())
-                          + 2*offset + qAbs(line.dx()),
-                          qMin(line.y1(), line.y2())
-                          + 2*offset + qAbs(line.dy()));
+    QPixmap pixmapClipped
+        = rasterPixmap(qMin(line.x1(), line.x2())
+                       + 2*offset + qAbs(line.dx()),
+                       qMin(line.y1(), line.y2())
+                       + 2*offset + qAbs(line.dy()));
 
     const QRect clip = QRect(line.p1(), line.p2()).normalized();
 
@@ -696,8 +729,8 @@ void tst_QPainter::drawPixmap()
     QImage sourceImage = createImage(type, size).convertToFormat(sourceFormat);
     QImage targetImage(size, targetFormat);
 
-    QPixmap sourcePixmap = QPixmap::fromImage(sourceImage);
-    QPixmap targetPixmap = QPixmap::fromImage(targetImage);
+    QPixmap sourcePixmap = rasterPixmap(sourceImage);
+    QPixmap targetPixmap = rasterPixmap(targetImage);
 
     QPainter p(&targetPixmap);
 
@@ -759,10 +792,10 @@ void tst_QPainter::compositionModes()
     QFETCH(QSize, size);
     QFETCH(QColor, color);
 
-    QPixmap src(size);
+    QPixmap src = rasterPixmap(size);
     src.fill(color);
 
-    QPixmap dest(size);
+    QPixmap dest = rasterPixmap(size);
     if (mode < QPainter::RasterOp_SourceOrDestination)
         color.setAlpha(127); // porter-duff needs an alpha channel
     dest.fill(color);
@@ -844,11 +877,11 @@ void tst_QPainter::drawTiledPixmap()
     QFETCH(QColor, color);
     QFETCH(QPainter::RenderHint, renderHint);
 
-    QPixmap src(srcSize);
+    QPixmap src = rasterPixmap(srcSize);
     src.fill(color);
 
     const QRect dstRect = transform.mapRect(QRect(QPoint(), dstSize));
-    QPixmap dst(dstRect.right() + 5, dstRect.bottom() + 5);
+    QPixmap dst = rasterPixmap(dstRect.right() + 5, dstRect.bottom() + 5);
     QPainter p(&dst);
     p.setTransform(transform);
     p.setRenderHint(renderHint);
@@ -1411,7 +1444,7 @@ void tst_QPainter::drawBorderPixmapRoundedRect()
         rp.drawRoundedRect(QRectF(qreal(pw)/2+1, qreal(pw)/2+1, rectImage.width()-(pw+1), rectImage.height()-(pw+1)), radius, radius);
     else
         rp.drawRoundedRect(QRectF(qreal(pw)/2, qreal(pw)/2, rectImage.width()-pw, rectImage.height()-pw), radius, radius);
-    QPixmap rectPixmap = QPixmap::fromImage(rectImage);
+    QPixmap rectPixmap = rasterPixmap(rectImage);
 
     //setup surface
     QImage surface(100, 100, QImage::Format_RGB16);
@@ -1466,7 +1499,7 @@ void tst_QPainter::drawScaledBorderPixmapRoundedRect()
     else
         rp.drawRoundedRect(QRectF(qreal(pw)/2, qreal(pw)/2, rectImage.width()-pw, rectImage.height()-pw), radius, radius);
 
-    QPixmap rectPixmap = QPixmap::fromImage(rectImage);
+    QPixmap rectPixmap = rasterPixmap(rectImage);
 
     //setup surface
     QImage surface(400, 400, QImage::Format_RGB16);
@@ -1522,7 +1555,7 @@ void tst_QPainter::drawTransformedBorderPixmapRoundedRect()
     else
         rp.drawRoundedRect(QRectF(qreal(pw)/2, qreal(pw)/2, rectImage.width()-pw, rectImage.height()-pw), radius, radius);
 
-    QPixmap rectPixmap = QPixmap::fromImage(rectImage);
+    QPixmap rectPixmap = rasterPixmap(rectImage);
 
     //setup surface
     QImage surface(400, 400, QImage::Format_RGB16);
-- 
cgit v0.12


From 8191aae91f97c22545750460c7a7d5ef1a7288bd Mon Sep 17 00:00:00 2001
From: Simon Hausmann 
Date: Wed, 12 May 2010 12:55:03 +0200
Subject: Updated WebKit to dc5821c3df2ef60456d85263160852f5335cf946

Integrated changes:

||  || [Qt] fast/text/find-hidden-text.html ||
||  || Rename window.media to window.styleMedia ||
||  || Need to call FrameView::scrollPositionChanged when changing the scroll position when the ScrollView does not have a platformWidget ||
||  || [Qt] fast/frames/flattening/frameset-flattening-subframesets.html fails intermittently on Qt bot ||
---
 src/3rdparty/webkit/.tag                           |   2 +-
 src/3rdparty/webkit/VERSION                        |   2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              |  99 ++++++++++
 src/3rdparty/webkit/WebCore/WebCore.gypi           |  16 +-
 src/3rdparty/webkit/WebCore/WebCore.pri            |   4 +-
 src/3rdparty/webkit/WebCore/WebCore.pro            |   4 +-
 src/3rdparty/webkit/WebCore/css/Media.cpp          |  77 --------
 src/3rdparty/webkit/WebCore/css/Media.h            |  54 ------
 src/3rdparty/webkit/WebCore/css/Media.idl          |  31 ----
 src/3rdparty/webkit/WebCore/css/StyleMedia.cpp     |  77 ++++++++
 src/3rdparty/webkit/WebCore/css/StyleMedia.h       |  55 ++++++
 src/3rdparty/webkit/WebCore/css/StyleMedia.idl     |  32 ++++
 .../webkit/WebCore/generated/JSDOMWindow.cpp       |  10 +-
 .../webkit/WebCore/generated/JSDOMWindow.h         |   2 +-
 src/3rdparty/webkit/WebCore/generated/JSMedia.cpp  | 201 ---------------------
 src/3rdparty/webkit/WebCore/generated/JSMedia.h    |  87 ---------
 .../webkit/WebCore/generated/JSStyleMedia.cpp      | 201 +++++++++++++++++++++
 .../webkit/WebCore/generated/JSStyleMedia.h        |  87 +++++++++
 src/3rdparty/webkit/WebCore/page/AbstractView.idl  |   2 +-
 src/3rdparty/webkit/WebCore/page/DOMWindow.cpp     |   6 +-
 src/3rdparty/webkit/WebCore/page/DOMWindow.h       |   8 +-
 src/3rdparty/webkit/WebCore/page/DOMWindow.idl     |   2 +-
 src/3rdparty/webkit/WebCore/page/FrameView.h       |   2 +-
 .../webkit/WebCore/platform/ScrollView.cpp         |   1 +
 src/3rdparty/webkit/WebCore/platform/ScrollView.h  |   3 +
 .../WebCore/platform/qt/ScrollbarThemeQt.cpp       |   2 +-
 26 files changed, 586 insertions(+), 481 deletions(-)
 delete mode 100644 src/3rdparty/webkit/WebCore/css/Media.cpp
 delete mode 100644 src/3rdparty/webkit/WebCore/css/Media.h
 delete mode 100644 src/3rdparty/webkit/WebCore/css/Media.idl
 create mode 100644 src/3rdparty/webkit/WebCore/css/StyleMedia.cpp
 create mode 100644 src/3rdparty/webkit/WebCore/css/StyleMedia.h
 create mode 100644 src/3rdparty/webkit/WebCore/css/StyleMedia.idl
 delete mode 100644 src/3rdparty/webkit/WebCore/generated/JSMedia.cpp
 delete mode 100644 src/3rdparty/webkit/WebCore/generated/JSMedia.h
 create mode 100644 src/3rdparty/webkit/WebCore/generated/JSStyleMedia.cpp
 create mode 100644 src/3rdparty/webkit/WebCore/generated/JSStyleMedia.h

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 65cfdda..d8b4b32 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-dc5821c3df2ef60456d85263160852f5335cf946
+57d10d5c05e59bbf7de8189ff47dd18d1be996dc
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 24f855b..c8c2aa3 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
 
-        b4aa5e1ddc41edab895132aba3cc66d9d7129444
+        dc5821c3df2ef60456d85263160852f5335cf946
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index ee42878..76b4eff 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,102 @@
+2010-04-29  James Robinson  
+
+        Reviewed by Simon Fraser.
+
+        Calls FrameView::scrollPositionChanged whenever a ScrollView is scrolled
+        https://bugs.webkit.org/show_bug.cgi?id=38286
+
+        When a ScrollView's  scroll position is changed, we have to call
+        FrameView::scrollPositionChanged to generate repaint invalidation for
+        fixed position elements.  This ends up getting called indirectly when
+        the ScrollView has a platformWidget through the port layer
+        (see WebHTMLView.mm's _frameOrBoundsChanged method for how the mac
+        port does it) but not when there is no platformWidget.
+
+        This is tested by the fast/repaint/fixed-* tests when run in pixel
+        mode.
+
+        Test: fast/repaint/fixed-move-after-keyboard-scroll.html
+
+        * page/FrameView.h:
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::valueChanged):
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::scrollPositionChanged):
+
+2010-04-23  Kenneth Rohde Christiansen  
+
+        Unreviewed build fix.
+
+        Change Media to StyleMedia
+
+        * DerivedSources.make:
+
+2010-04-22  Kenneth Rohde Christiansen  
+
+        Reviewed by Laszlo Gombos.
+
+        Rename window.media to window.styleMedia
+        https://bugs.webkit.org/show_bug.cgi?id=36187
+
+        Rename the interface Media to StyleMedia as required by the
+        new CSSOM View spec.
+
+        * Android.derived.jscbindings.mk:
+        * Android.derived.v8bindings.mk:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pri:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/Media.cpp: Removed.
+        * css/Media.h: Removed.
+        * css/Media.idl: Removed.
+        * css/StyleMedia.cpp: Added.
+        (WebCore::StyleMedia::StyleMedia):
+        (WebCore::StyleMedia::type):
+        (WebCore::StyleMedia::matchMedium):
+        * css/StyleMedia.h: Added.
+        (WebCore::StyleMedia::create):
+        (WebCore::StyleMedia::disconnectFrame):
+        * css/StyleMedia.idl: Added.
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::styleMedia):
+        * page/DOMWindow.h:
+        (WebCore::DOMWindow::optionalMedia):
+        * page/DOMWindow.idl:
+
+2010-04-22  Kenneth Rohde Christiansen  
+
+        Reviewed by Simon Fraser.
+
+        Rename window.media to window.styleMedia
+        https://bugs.webkit.org/show_bug.cgi?id=36187
+
+        It has been defined that the AbstractView media extension
+        defined in the CSSOM View spec should be renamed to styleMedia.
+        This patch does that and updates the current layout tests
+        making use of it.
+
+        * page/AbstractView.idl:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::styleMedia):
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+
+2010-05-11  Benjamin Poulain  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] fast/text/find-hidden-text.html
+        https://bugs.webkit.org/show_bug.cgi?id=32922
+
+        Use the real page step for populating the QStyleOption otherwhise
+        the size can be negative, which can break the QStyle used.
+
+        * platform/qt/ScrollbarThemeQt.cpp:
+        (WebCore::styleOptionSlider):
+
 2010-05-03  Antonio Gomes  
 
         Reviewed by Kenneth Christiansen.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.gypi b/src/3rdparty/webkit/WebCore/WebCore.gypi
index 701ad90..1e92f1f 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.gypi
+++ b/src/3rdparty/webkit/WebCore/WebCore.gypi
@@ -18,10 +18,10 @@
             'css/CSSVariablesDeclaration.idl',
             'css/CSSVariablesRule.idl',
             'css/Counter.idl',
-            'css/Media.idl',
             'css/MediaList.idl',
-            'css/RGBColor.idl',
             'css/Rect.idl',
+            'css/RGBColor.idl',
+            'css/StyleMedia.idl',
             'css/StyleSheet.idl',
             'css/StyleSheetList.idl',
             'css/WebKitCSSKeyframeRule.idl',
@@ -1003,33 +1003,33 @@
             'css/FontValue.h',
             'css/MediaFeatureNames.cpp',
             'css/MediaFeatureNames.h',
-            'css/Media.cpp',
-            'css/Media.h',
             'css/MediaList.cpp',
             'css/MediaList.h',
             'css/MediaQuery.cpp',
-            'css/MediaQuery.h',
             'css/MediaQueryEvaluator.cpp',
             'css/MediaQueryEvaluator.h',
             'css/MediaQueryExp.cpp',
             'css/MediaQueryExp.h',
+            'css/MediaQuery.h',
             'css/Pair.h',
             'css/Rect.h',
             'css/RGBColor.cpp',
             'css/RGBColor.h',
-            'css/SVGCSSComputedStyleDeclaration.cpp',
-            'css/SVGCSSParser.cpp',
-            'css/SVGCSSStyleSelector.cpp',
             'css/ShadowValue.cpp',
             'css/ShadowValue.h',
             'css/StyleBase.cpp',
             'css/StyleBase.h',
             'css/StyleList.cpp',
             'css/StyleList.h',
+            'css/StyleMedia.cpp',
+            'css/StyleMedia.h',
             'css/StyleSheet.cpp',
             'css/StyleSheet.h',
             'css/StyleSheetList.cpp',
             'css/StyleSheetList.h',
+            'css/SVGCSSComputedStyleDeclaration.cpp',
+            'css/SVGCSSParser.cpp',
+            'css/SVGCSSStyleSelector.cpp',
             'css/WebKitCSSKeyframeRule.cpp',
             'css/WebKitCSSKeyframeRule.h',
             'css/WebKitCSSKeyframesRule.cpp',
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pri b/src/3rdparty/webkit/WebCore/WebCore.pri
index ad514a2..5f5987f 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pri
+++ b/src/3rdparty/webkit/WebCore/WebCore.pri
@@ -227,10 +227,10 @@ IDL_BINDINGS += \
     css/CSSValueList.idl \
     css/CSSVariablesDeclaration.idl \
     css/CSSVariablesRule.idl \
-    css/Media.idl \
     css/MediaList.idl \
-    css/RGBColor.idl \
     css/Rect.idl \
+    css/RGBColor.idl \
+    css/StyleMedia.idl \
     css/StyleSheet.idl \
     css/StyleSheetList.idl \
     css/WebKitCSSKeyframeRule.idl \
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index e42cd8e..254d17b 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -431,7 +431,6 @@ SOURCES += \
     css/FontFamilyValue.cpp \
     css/FontValue.cpp \
     css/MediaFeatureNames.cpp \
-    css/Media.cpp \
     css/MediaList.cpp \
     css/MediaQuery.cpp \
     css/MediaQueryEvaluator.cpp \
@@ -440,6 +439,7 @@ SOURCES += \
     css/ShadowValue.cpp \
     css/StyleBase.cpp \
     css/StyleList.cpp \
+    css/StyleMedia.cpp \
     css/StyleSheet.cpp \
     css/StyleSheetList.cpp \
     css/WebKitCSSKeyframeRule.cpp \
@@ -1145,7 +1145,6 @@ HEADERS += \
     css/FontFamilyValue.h \
     css/FontValue.h \
     css/MediaFeatureNames.h \
-    css/Media.h \
     css/MediaList.h \
     css/MediaQueryEvaluator.h \
     css/MediaQueryExp.h \
@@ -1154,6 +1153,7 @@ HEADERS += \
     css/ShadowValue.h \
     css/StyleBase.h \
     css/StyleList.h \
+    css/StyleMedia.h \
     css/StyleSheet.h \
     css/StyleSheetList.h \
     css/WebKitCSSKeyframeRule.h \
diff --git a/src/3rdparty/webkit/WebCore/css/Media.cpp b/src/3rdparty/webkit/WebCore/css/Media.cpp
deleted file mode 100644
index e238602..0000000
--- a/src/3rdparty/webkit/WebCore/css/Media.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-
-#include "Media.h"
-#include "CSSStyleSelector.h"
-#include "Frame.h"
-#include "FrameView.h"
-#include "MediaList.h"
-#include "MediaQueryEvaluator.h"
-
-namespace WebCore {
-
-Media::Media(Frame* frame)
-    : m_frame(frame)
-{
-}
-
-String Media::type() const
-{
-    FrameView* view = m_frame ? m_frame->view() : 0;
-    if (view)
-        return view->mediaType();
-
-    return String();
-}
-
-bool Media::matchMedium(const String& query) const
-{
-    if (!m_frame)
-        return false;
-
-    Document* document = m_frame->document();
-    ASSERT(document);
-    Element* documentElement = document->documentElement();
-    ASSERT(documentElement);
-
-    CSSStyleSelector* styleSelector = document->styleSelector();
-    if (!styleSelector)
-        return false;
-
-    RefPtr rootStyle = styleSelector->styleForElement(documentElement, 0 /*defaultParent*/, false /*allowSharing*/, true /*resolveForRootDefault*/);
-    RefPtr media = MediaList::create();
-
-    ExceptionCode ec = 0;
-    media->setMediaText(query, ec);
-    if (ec)
-        return false;
-
-    MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get());
-    return screenEval.eval(media.get());
-}
-
-} // namespace WebCore
diff --git a/src/3rdparty/webkit/WebCore/css/Media.h b/src/3rdparty/webkit/WebCore/css/Media.h
deleted file mode 100644
index ee6961b..0000000
--- a/src/3rdparty/webkit/WebCore/css/Media.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#ifndef Media_h
-#define Media_h
-
-#include "DOMWindow.h"
-
-namespace WebCore {
-
-class Media : public RefCounted {
-public:
-    static PassRefPtr create(Frame* frame)
-    {
-        return adoptRef(new Media(frame));
-    }
-
-    void disconnectFrame() { m_frame = 0; }
-
-    String type() const;
-
-    bool matchMedium(const String&) const;
-    
-private:
-    Media(Frame*);
-
-    Frame* m_frame;
-};
-
-} // namespace
-
-#endif // Media_h
diff --git a/src/3rdparty/webkit/WebCore/css/Media.idl b/src/3rdparty/webkit/WebCore/css/Media.idl
deleted file mode 100644
index 1bf5900..0000000
--- a/src/3rdparty/webkit/WebCore/css/Media.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module view {
-    interface Media {
-        readonly attribute DOMString type;
-        boolean matchMedium(in DOMString mediaquery);
-    };
-}
diff --git a/src/3rdparty/webkit/WebCore/css/StyleMedia.cpp b/src/3rdparty/webkit/WebCore/css/StyleMedia.cpp
new file mode 100644
index 0000000..6cb662f
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/css/StyleMedia.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "config.h"
+#include "StyleMedia.h"
+
+#include "CSSStyleSelector.h"
+#include "Frame.h"
+#include "FrameView.h"
+#include "MediaList.h"
+#include "MediaQueryEvaluator.h"
+
+namespace WebCore {
+
+StyleMedia::StyleMedia(Frame* frame)
+    : m_frame(frame)
+{
+}
+
+String StyleMedia::type() const
+{
+    FrameView* view = m_frame ? m_frame->view() : 0;
+    if (view)
+        return view->mediaType();
+
+    return String();
+}
+
+bool StyleMedia::matchMedium(const String& query) const
+{
+    if (!m_frame)
+        return false;
+
+    Document* document = m_frame->document();
+    ASSERT(document);
+    Element* documentElement = document->documentElement();
+    ASSERT(documentElement);
+
+    CSSStyleSelector* styleSelector = document->styleSelector();
+    if (!styleSelector)
+        return false;
+
+    RefPtr rootStyle = styleSelector->styleForElement(documentElement, 0 /*defaultParent*/, false /*allowSharing*/, true /*resolveForRootDefault*/);
+    RefPtr media = MediaList::create();
+
+    ExceptionCode ec = 0;
+    media->setMediaText(query, ec);
+    if (ec)
+        return false;
+
+    MediaQueryEvaluator screenEval(type(), m_frame, rootStyle.get());
+    return screenEval.eval(media.get());
+}
+
+} // namespace WebCore
diff --git a/src/3rdparty/webkit/WebCore/css/StyleMedia.h b/src/3rdparty/webkit/WebCore/css/StyleMedia.h
new file mode 100644
index 0000000..761e6a3
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/css/StyleMedia.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef StyleMedia_h
+#define StyleMedia_h
+
+#include "DOMWindow.h"
+
+namespace WebCore {
+
+class StyleMedia : public RefCounted {
+public:
+    static PassRefPtr create(Frame* frame)
+    {
+        return adoptRef(new StyleMedia(frame));
+    }
+
+    void disconnectFrame() { m_frame = 0; }
+
+    String type() const;
+
+    bool matchMedium(const String&) const;
+
+private:
+    StyleMedia(Frame*);
+
+    Frame* m_frame;
+};
+
+} // namespace
+
+#endif // StyleMedia_h
diff --git a/src/3rdparty/webkit/WebCore/css/StyleMedia.idl b/src/3rdparty/webkit/WebCore/css/StyleMedia.idl
new file mode 100644
index 0000000..7be35cc
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/css/StyleMedia.idl
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+module view {
+    interface StyleMedia {
+        readonly attribute DOMString type;
+        boolean matchMedium(in DOMString mediaquery);
+    };
+}
diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
index 04238bc..11dfd2e 100644
--- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
+++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
@@ -152,7 +152,6 @@
 #include "JSHTMLVideoElement.h"
 #include "JSImageData.h"
 #include "JSKeyboardEvent.h"
-#include "JSMedia.h"
 #include "JSMediaError.h"
 #include "JSMediaList.h"
 #include "JSMessageChannel.h"
@@ -299,6 +298,7 @@
 #include "JSSharedWorker.h"
 #include "JSStorage.h"
 #include "JSStorageEvent.h"
+#include "JSStyleMedia.h"
 #include "JSStyleSheet.h"
 #include "JSStyleSheetList.h"
 #include "JSText.h"
@@ -334,11 +334,11 @@
 #include "JSXPathResult.h"
 #include "JSXSLTProcessor.h"
 #include "KURL.h"
-#include "Media.h"
 #include "Navigator.h"
 #include "RegisteredEventListener.h"
 #include "Screen.h"
 #include "Storage.h"
+#include "StyleMedia.h"
 #include "WebKitPoint.h"
 #include 
 #include 
@@ -395,7 +395,7 @@ static const HashTableValue JSDOMWindowTableValues[409] =
     { "parent", DontDelete, (intptr_t)static_cast(jsDOMWindowParent), (intptr_t)setJSDOMWindowParent },
     { "top", DontDelete, (intptr_t)static_cast(jsDOMWindowTop), (intptr_t)setJSDOMWindowTop },
     { "document", DontDelete|ReadOnly, (intptr_t)static_cast(jsDOMWindowDocument), (intptr_t)0 },
-    { "media", DontDelete|ReadOnly, (intptr_t)static_cast(jsDOMWindowMedia), (intptr_t)0 },
+    { "styleMedia", DontDelete|ReadOnly, (intptr_t)static_cast(jsDOMWindowStyleMedia), (intptr_t)0 },
     { "devicePixelRatio", DontDelete, (intptr_t)static_cast(jsDOMWindowDevicePixelRatio), (intptr_t)setJSDOMWindowDevicePixelRatio },
     { "applicationCache", DontDelete|ReadOnly, (intptr_t)static_cast(jsDOMWindowApplicationCache), (intptr_t)0 },
     { "sessionStorage", DontDelete|ReadOnly, (intptr_t)static_cast(jsDOMWindowSessionStorage), (intptr_t)0 },
@@ -1304,14 +1304,14 @@ JSValue jsDOMWindowDocument(ExecState* exec, JSValue slotBase, const Identifier&
     return result;
 }
 
-JSValue jsDOMWindowMedia(ExecState* exec, JSValue slotBase, const Identifier&)
+JSValue jsDOMWindowStyleMedia(ExecState* exec, JSValue slotBase, const Identifier&)
 {
     JSDOMWindow* castedThis = static_cast(asObject(slotBase));
     if (!castedThis->allowsAccessFrom(exec))
         return jsUndefined();
     UNUSED_PARAM(exec);
     DOMWindow* imp = static_cast(castedThis->impl());
-    JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->media()));
+    JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(imp->styleMedia()));
     return result;
 }
 
diff --git a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h
index a6f3253..7e50556 100644
--- a/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h
+++ b/src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h
@@ -231,7 +231,7 @@ void setJSDOMWindowParent(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
 JSC::JSValue jsDOMWindowTop(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
 void setJSDOMWindowTop(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
 JSC::JSValue jsDOMWindowDocument(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
-JSC::JSValue jsDOMWindowMedia(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
+JSC::JSValue jsDOMWindowStyleMedia(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
 JSC::JSValue jsDOMWindowDevicePixelRatio(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
 void setJSDOMWindowDevicePixelRatio(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
 JSC::JSValue jsDOMWindowApplicationCache(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
diff --git a/src/3rdparty/webkit/WebCore/generated/JSMedia.cpp b/src/3rdparty/webkit/WebCore/generated/JSMedia.cpp
deleted file mode 100644
index 1579c2b..0000000
--- a/src/3rdparty/webkit/WebCore/generated/JSMedia.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-    This file is part of the WebKit open source project.
-    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "config.h"
-#include "JSMedia.h"
-
-#include "KURL.h"
-#include "Media.h"
-#include 
-#include 
-#include 
-
-using namespace JSC;
-
-namespace WebCore {
-
-ASSERT_CLASS_FITS_IN_CELL(JSMedia);
-
-/* Hash table */
-
-static const HashTableValue JSMediaTableValues[3] =
-{
-    { "type", DontDelete|ReadOnly, (intptr_t)static_cast(jsMediaType), (intptr_t)0 },
-    { "constructor", DontEnum|ReadOnly, (intptr_t)static_cast(jsMediaConstructor), (intptr_t)0 },
-    { 0, 0, 0, 0 }
-};
-
-static JSC_CONST_HASHTABLE HashTable JSMediaTable =
-#if ENABLE(PERFECT_HASH_SIZE)
-    { 3, JSMediaTableValues, 0 };
-#else
-    { 4, 3, JSMediaTableValues, 0 };
-#endif
-
-/* Hash table for constructor */
-
-static const HashTableValue JSMediaConstructorTableValues[1] =
-{
-    { 0, 0, 0, 0 }
-};
-
-static JSC_CONST_HASHTABLE HashTable JSMediaConstructorTable =
-#if ENABLE(PERFECT_HASH_SIZE)
-    { 0, JSMediaConstructorTableValues, 0 };
-#else
-    { 1, 0, JSMediaConstructorTableValues, 0 };
-#endif
-
-class JSMediaConstructor : public DOMConstructorObject {
-public:
-    JSMediaConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)
-        : DOMConstructorObject(JSMediaConstructor::createStructure(globalObject->objectPrototype()), globalObject)
-    {
-        putDirect(exec->propertyNames().prototype, JSMediaPrototype::self(exec, globalObject), None);
-    }
-    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-    virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
-    virtual const ClassInfo* classInfo() const { return &s_info; }
-    static const ClassInfo s_info;
-
-    static PassRefPtr createStructure(JSValue proto) 
-    { 
-        return Structure::create(proto, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount); 
-    }
-    
-protected:
-    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | DOMConstructorObject::StructureFlags;
-};
-
-const ClassInfo JSMediaConstructor::s_info = { "MediaConstructor", 0, &JSMediaConstructorTable, 0 };
-
-bool JSMediaConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-    return getStaticValueSlot(exec, &JSMediaConstructorTable, this, propertyName, slot);
-}
-
-bool JSMediaConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
-{
-    return getStaticValueDescriptor(exec, &JSMediaConstructorTable, this, propertyName, descriptor);
-}
-
-/* Hash table for prototype */
-
-static const HashTableValue JSMediaPrototypeTableValues[2] =
-{
-    { "matchMedium", DontDelete|Function, (intptr_t)static_cast(jsMediaPrototypeFunctionMatchMedium), (intptr_t)1 },
-    { 0, 0, 0, 0 }
-};
-
-static JSC_CONST_HASHTABLE HashTable JSMediaPrototypeTable =
-#if ENABLE(PERFECT_HASH_SIZE)
-    { 0, JSMediaPrototypeTableValues, 0 };
-#else
-    { 2, 1, JSMediaPrototypeTableValues, 0 };
-#endif
-
-const ClassInfo JSMediaPrototype::s_info = { "MediaPrototype", 0, &JSMediaPrototypeTable, 0 };
-
-JSObject* JSMediaPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
-{
-    return getDOMPrototype(exec, globalObject);
-}
-
-bool JSMediaPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-    return getStaticFunctionSlot(exec, &JSMediaPrototypeTable, this, propertyName, slot);
-}
-
-bool JSMediaPrototype::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
-{
-    return getStaticFunctionDescriptor(exec, &JSMediaPrototypeTable, this, propertyName, descriptor);
-}
-
-const ClassInfo JSMedia::s_info = { "Media", 0, &JSMediaTable, 0 };
-
-JSMedia::JSMedia(NonNullPassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl)
-    : DOMObjectWithGlobalPointer(structure, globalObject)
-    , m_impl(impl)
-{
-}
-
-JSMedia::~JSMedia()
-{
-    forgetDOMObject(this, impl());
-}
-
-JSObject* JSMedia::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
-{
-    return new (exec) JSMediaPrototype(JSMediaPrototype::createStructure(globalObject->objectPrototype()));
-}
-
-bool JSMedia::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-    return getStaticValueSlot(exec, &JSMediaTable, this, propertyName, slot);
-}
-
-bool JSMedia::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
-{
-    return getStaticValueDescriptor(exec, &JSMediaTable, this, propertyName, descriptor);
-}
-
-JSValue jsMediaType(ExecState* exec, JSValue slotBase, const Identifier&)
-{
-    JSMedia* castedThis = static_cast(asObject(slotBase));
-    UNUSED_PARAM(exec);
-    Media* imp = static_cast(castedThis->impl());
-    JSValue result = jsString(exec, imp->type());
-    return result;
-}
-
-JSValue jsMediaConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
-{
-    JSMedia* domObject = static_cast(asObject(slotBase));
-    return JSMedia::getConstructor(exec, domObject->globalObject());
-}
-JSValue JSMedia::getConstructor(ExecState* exec, JSGlobalObject* globalObject)
-{
-    return getDOMConstructor(exec, static_cast(globalObject));
-}
-
-JSValue JSC_HOST_CALL jsMediaPrototypeFunctionMatchMedium(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
-{
-    UNUSED_PARAM(args);
-    if (!thisValue.inherits(&JSMedia::s_info))
-        return throwError(exec, TypeError);
-    JSMedia* castedThisObj = static_cast(asObject(thisValue));
-    Media* imp = static_cast(castedThisObj->impl());
-    const UString& mediaquery = args.at(0).toString(exec);
-
-
-    JSC::JSValue result = jsBoolean(imp->matchMedium(mediaquery));
-    return result;
-}
-
-JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Media* object)
-{
-    return getDOMObjectWrapper(exec, globalObject, object);
-}
-Media* toMedia(JSC::JSValue value)
-{
-    return value.inherits(&JSMedia::s_info) ? static_cast(asObject(value))->impl() : 0;
-}
-
-}
diff --git a/src/3rdparty/webkit/WebCore/generated/JSMedia.h b/src/3rdparty/webkit/WebCore/generated/JSMedia.h
deleted file mode 100644
index 28515c9..0000000
--- a/src/3rdparty/webkit/WebCore/generated/JSMedia.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-    This file is part of the WebKit open source project.
-    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef JSMedia_h
-#define JSMedia_h
-
-#include "JSDOMBinding.h"
-#include 
-#include 
-
-namespace WebCore {
-
-class Media;
-
-class JSMedia : public DOMObjectWithGlobalPointer {
-    typedef DOMObjectWithGlobalPointer Base;
-public:
-    JSMedia(NonNullPassRefPtr, JSDOMGlobalObject*, PassRefPtr);
-    virtual ~JSMedia();
-    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
-    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
-    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);
-    virtual const JSC::ClassInfo* classInfo() const { return &s_info; }
-    static const JSC::ClassInfo s_info;
-
-    static PassRefPtr createStructure(JSC::JSValue prototype)
-    {
-        return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount);
-    }
-
-    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
-    Media* impl() const { return m_impl.get(); }
-
-private:
-    RefPtr m_impl;
-protected:
-    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
-};
-
-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Media*);
-Media* toMedia(JSC::JSValue);
-
-class JSMediaPrototype : public JSC::JSObject {
-    typedef JSC::JSObject Base;
-public:
-    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
-    virtual const JSC::ClassInfo* classInfo() const { return &s_info; }
-    static const JSC::ClassInfo s_info;
-    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
-    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
-    static PassRefPtr createStructure(JSC::JSValue prototype)
-    {
-        return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount);
-    }
-    JSMediaPrototype(NonNullPassRefPtr structure) : JSC::JSObject(structure) { }
-protected:
-    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
-};
-
-// Functions
-
-JSC::JSValue JSC_HOST_CALL jsMediaPrototypeFunctionMatchMedium(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
-// Attributes
-
-JSC::JSValue jsMediaType(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
-JSC::JSValue jsMediaConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
-
-} // namespace WebCore
-
-#endif
diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleMedia.cpp b/src/3rdparty/webkit/WebCore/generated/JSStyleMedia.cpp
new file mode 100644
index 0000000..b06bf09
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/generated/JSStyleMedia.cpp
@@ -0,0 +1,201 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+#include "JSStyleMedia.h"
+
+#include "KURL.h"
+#include "StyleMedia.h"
+#include 
+#include 
+#include 
+
+using namespace JSC;
+
+namespace WebCore {
+
+ASSERT_CLASS_FITS_IN_CELL(JSStyleMedia);
+
+/* Hash table */
+
+static const HashTableValue JSStyleMediaTableValues[3] =
+{
+    { "type", DontDelete|ReadOnly, (intptr_t)static_cast(jsStyleMediaType), (intptr_t)0 },
+    { "constructor", DontEnum|ReadOnly, (intptr_t)static_cast(jsStyleMediaConstructor), (intptr_t)0 },
+    { 0, 0, 0, 0 }
+};
+
+static JSC_CONST_HASHTABLE HashTable JSStyleMediaTable =
+#if ENABLE(PERFECT_HASH_SIZE)
+    { 3, JSStyleMediaTableValues, 0 };
+#else
+    { 4, 3, JSStyleMediaTableValues, 0 };
+#endif
+
+/* Hash table for constructor */
+
+static const HashTableValue JSStyleMediaConstructorTableValues[1] =
+{
+    { 0, 0, 0, 0 }
+};
+
+static JSC_CONST_HASHTABLE HashTable JSStyleMediaConstructorTable =
+#if ENABLE(PERFECT_HASH_SIZE)
+    { 0, JSStyleMediaConstructorTableValues, 0 };
+#else
+    { 1, 0, JSStyleMediaConstructorTableValues, 0 };
+#endif
+
+class JSStyleMediaConstructor : public DOMConstructorObject {
+public:
+    JSStyleMediaConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)
+        : DOMConstructorObject(JSStyleMediaConstructor::createStructure(globalObject->objectPrototype()), globalObject)
+    {
+        putDirect(exec->propertyNames().prototype, JSStyleMediaPrototype::self(exec, globalObject), None);
+    }
+    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
+    virtual const ClassInfo* classInfo() const { return &s_info; }
+    static const ClassInfo s_info;
+
+    static PassRefPtr createStructure(JSValue proto) 
+    { 
+        return Structure::create(proto, TypeInfo(ObjectType, StructureFlags), AnonymousSlotCount); 
+    }
+    
+protected:
+    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | DOMConstructorObject::StructureFlags;
+};
+
+const ClassInfo JSStyleMediaConstructor::s_info = { "StyleMediaConstructor", 0, &JSStyleMediaConstructorTable, 0 };
+
+bool JSStyleMediaConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    return getStaticValueSlot(exec, &JSStyleMediaConstructorTable, this, propertyName, slot);
+}
+
+bool JSStyleMediaConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+    return getStaticValueDescriptor(exec, &JSStyleMediaConstructorTable, this, propertyName, descriptor);
+}
+
+/* Hash table for prototype */
+
+static const HashTableValue JSStyleMediaPrototypeTableValues[2] =
+{
+    { "matchMedium", DontDelete|Function, (intptr_t)static_cast(jsStyleMediaPrototypeFunctionMatchMedium), (intptr_t)1 },
+    { 0, 0, 0, 0 }
+};
+
+static JSC_CONST_HASHTABLE HashTable JSStyleMediaPrototypeTable =
+#if ENABLE(PERFECT_HASH_SIZE)
+    { 0, JSStyleMediaPrototypeTableValues, 0 };
+#else
+    { 2, 1, JSStyleMediaPrototypeTableValues, 0 };
+#endif
+
+const ClassInfo JSStyleMediaPrototype::s_info = { "StyleMediaPrototype", 0, &JSStyleMediaPrototypeTable, 0 };
+
+JSObject* JSStyleMediaPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return getDOMPrototype(exec, globalObject);
+}
+
+bool JSStyleMediaPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    return getStaticFunctionSlot(exec, &JSStyleMediaPrototypeTable, this, propertyName, slot);
+}
+
+bool JSStyleMediaPrototype::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+    return getStaticFunctionDescriptor(exec, &JSStyleMediaPrototypeTable, this, propertyName, descriptor);
+}
+
+const ClassInfo JSStyleMedia::s_info = { "StyleMedia", 0, &JSStyleMediaTable, 0 };
+
+JSStyleMedia::JSStyleMedia(NonNullPassRefPtr structure, JSDOMGlobalObject* globalObject, PassRefPtr impl)
+    : DOMObjectWithGlobalPointer(structure, globalObject)
+    , m_impl(impl)
+{
+}
+
+JSStyleMedia::~JSStyleMedia()
+{
+    forgetDOMObject(this, impl());
+}
+
+JSObject* JSStyleMedia::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return new (exec) JSStyleMediaPrototype(JSStyleMediaPrototype::createStructure(globalObject->objectPrototype()));
+}
+
+bool JSStyleMedia::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    return getStaticValueSlot(exec, &JSStyleMediaTable, this, propertyName, slot);
+}
+
+bool JSStyleMedia::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+    return getStaticValueDescriptor(exec, &JSStyleMediaTable, this, propertyName, descriptor);
+}
+
+JSValue jsStyleMediaType(ExecState* exec, JSValue slotBase, const Identifier&)
+{
+    JSStyleMedia* castedThis = static_cast(asObject(slotBase));
+    UNUSED_PARAM(exec);
+    StyleMedia* imp = static_cast(castedThis->impl());
+    JSValue result = jsString(exec, imp->type());
+    return result;
+}
+
+JSValue jsStyleMediaConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
+{
+    JSStyleMedia* domObject = static_cast(asObject(slotBase));
+    return JSStyleMedia::getConstructor(exec, domObject->globalObject());
+}
+JSValue JSStyleMedia::getConstructor(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return getDOMConstructor(exec, static_cast(globalObject));
+}
+
+JSValue JSC_HOST_CALL jsStyleMediaPrototypeFunctionMatchMedium(ExecState* exec, JSObject*, JSValue thisValue, const ArgList& args)
+{
+    UNUSED_PARAM(args);
+    if (!thisValue.inherits(&JSStyleMedia::s_info))
+        return throwError(exec, TypeError);
+    JSStyleMedia* castedThisObj = static_cast(asObject(thisValue));
+    StyleMedia* imp = static_cast(castedThisObj->impl());
+    const UString& mediaquery = args.at(0).toString(exec);
+
+
+    JSC::JSValue result = jsBoolean(imp->matchMedium(mediaquery));
+    return result;
+}
+
+JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, StyleMedia* object)
+{
+    return getDOMObjectWrapper(exec, globalObject, object);
+}
+StyleMedia* toStyleMedia(JSC::JSValue value)
+{
+    return value.inherits(&JSStyleMedia::s_info) ? static_cast(asObject(value))->impl() : 0;
+}
+
+}
diff --git a/src/3rdparty/webkit/WebCore/generated/JSStyleMedia.h b/src/3rdparty/webkit/WebCore/generated/JSStyleMedia.h
new file mode 100644
index 0000000..12601d5
--- /dev/null
+++ b/src/3rdparty/webkit/WebCore/generated/JSStyleMedia.h
@@ -0,0 +1,87 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef JSStyleMedia_h
+#define JSStyleMedia_h
+
+#include "JSDOMBinding.h"
+#include 
+#include 
+
+namespace WebCore {
+
+class StyleMedia;
+
+class JSStyleMedia : public DOMObjectWithGlobalPointer {
+    typedef DOMObjectWithGlobalPointer Base;
+public:
+    JSStyleMedia(NonNullPassRefPtr, JSDOMGlobalObject*, PassRefPtr);
+    virtual ~JSStyleMedia();
+    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
+    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);
+    virtual const JSC::ClassInfo* classInfo() const { return &s_info; }
+    static const JSC::ClassInfo s_info;
+
+    static PassRefPtr createStructure(JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount);
+    }
+
+    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
+    StyleMedia* impl() const { return m_impl.get(); }
+
+private:
+    RefPtr m_impl;
+protected:
+    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
+};
+
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, StyleMedia*);
+StyleMedia* toStyleMedia(JSC::JSValue);
+
+class JSStyleMediaPrototype : public JSC::JSObject {
+    typedef JSC::JSObject Base;
+public:
+    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
+    virtual const JSC::ClassInfo* classInfo() const { return &s_info; }
+    static const JSC::ClassInfo s_info;
+    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
+    static PassRefPtr createStructure(JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount);
+    }
+    JSStyleMediaPrototype(NonNullPassRefPtr structure) : JSC::JSObject(structure) { }
+protected:
+    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
+};
+
+// Functions
+
+JSC::JSValue JSC_HOST_CALL jsStyleMediaPrototypeFunctionMatchMedium(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
+// Attributes
+
+JSC::JSValue jsStyleMediaType(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
+JSC::JSValue jsStyleMediaConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
+
+} // namespace WebCore
+
+#endif
diff --git a/src/3rdparty/webkit/WebCore/page/AbstractView.idl b/src/3rdparty/webkit/WebCore/page/AbstractView.idl
index 290bf48..e4ece0f 100644
--- a/src/3rdparty/webkit/WebCore/page/AbstractView.idl
+++ b/src/3rdparty/webkit/WebCore/page/AbstractView.idl
@@ -32,7 +32,7 @@ module views {
         OmitConstructor
     ] AbstractView {
         readonly attribute Document document;
-        readonly attribute Media media;
+        readonly attribute Media styleMedia;
     };
 
 }
diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp b/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp
index dd90200..8dcff5c 100644
--- a/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp
+++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.cpp
@@ -57,7 +57,7 @@
 #include "InspectorController.h"
 #include "InspectorTimelineAgent.h"
 #include "Location.h"
-#include "Media.h"
+#include "StyleMedia.h"
 #include "MessageEvent.h"
 #include "Navigator.h"
 #include "NotificationCenter.h"
@@ -1112,10 +1112,10 @@ Document* DOMWindow::document() const
     return m_frame->document();
 }
 
-PassRefPtr DOMWindow::media() const
+PassRefPtr DOMWindow::styleMedia() const
 {
     if (!m_media)
-        m_media = Media::create(m_frame);
+        m_media = StyleMedia::create(m_frame);
     return m_media.get();
 }
 
diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.h b/src/3rdparty/webkit/WebCore/page/DOMWindow.h
index a70713b..cf9bc88 100644
--- a/src/3rdparty/webkit/WebCore/page/DOMWindow.h
+++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.h
@@ -56,7 +56,7 @@ namespace WebCore {
     class IndexedDatabaseRequest;
     class InspectorTimelineAgent;
     class Location;
-    class Media;
+    class StyleMedia;
     class Navigator;
     class Node;
     class NotificationCenter;
@@ -187,7 +187,7 @@ namespace WebCore {
         // DOM Level 2 AbstractView Interface
         Document* document() const;
         // CSSOM View Module
-        PassRefPtr media() const;
+        PassRefPtr styleMedia() const;
 
         // DOM Level 2 Style Interface
         PassRefPtr getComputedStyle(Element*, const String& pseudoElt) const;
@@ -353,7 +353,7 @@ namespace WebCore {
         Console* optionalConsole() const { return m_console.get(); }
         Navigator* optionalNavigator() const { return m_navigator.get(); }
         Location* optionalLocation() const { return m_location.get(); }
-        Media* optionalMedia() const { return m_media.get(); }
+        StyleMedia* optionalMedia() const { return m_media.get(); }
 #if ENABLE(DOM_STORAGE)
         Storage* optionalSessionStorage() const { return m_sessionStorage.get(); }
         Storage* optionalLocalStorage() const { return m_localStorage.get(); }
@@ -390,7 +390,7 @@ namespace WebCore {
         mutable RefPtr m_console;
         mutable RefPtr m_navigator;
         mutable RefPtr m_location;
-        mutable RefPtr m_media;
+        mutable RefPtr m_media;
 #if ENABLE(DOM_STORAGE)
         mutable RefPtr m_sessionStorage;
         mutable RefPtr m_localStorage;
diff --git a/src/3rdparty/webkit/WebCore/page/DOMWindow.idl b/src/3rdparty/webkit/WebCore/page/DOMWindow.idl
index 31e4d4f..33e49e8 100644
--- a/src/3rdparty/webkit/WebCore/page/DOMWindow.idl
+++ b/src/3rdparty/webkit/WebCore/page/DOMWindow.idl
@@ -141,7 +141,7 @@ module window {
         readonly attribute Document document;
 
         // CSSOM View Module
-        readonly attribute Media media;
+        readonly attribute StyleMedia styleMedia;
 
         // DOM Level 2 Style Interface
         CSSStyleDeclaration getComputedStyle(in Element element,
diff --git a/src/3rdparty/webkit/WebCore/page/FrameView.h b/src/3rdparty/webkit/WebCore/page/FrameView.h
index 7371d13..7119975 100644
--- a/src/3rdparty/webkit/WebCore/page/FrameView.h
+++ b/src/3rdparty/webkit/WebCore/page/FrameView.h
@@ -139,7 +139,7 @@ public:
 
     virtual void scrollRectIntoViewRecursively(const IntRect&);
     virtual void setScrollPosition(const IntPoint&);
-    void scrollPositionChanged();
+    virtual void scrollPositionChanged();
 
     String mediaType() const;
     void setMediaType(const String&);
diff --git a/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp b/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
index 5c70eff..e50ab55 100644
--- a/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
@@ -292,6 +292,7 @@ void ScrollView::valueChanged(Scrollbar* scrollbar)
     if (scrollbarsSuppressed())
         return;
 
+    scrollPositionChanged();
     scrollContents(scrollDelta);
 }
 
diff --git a/src/3rdparty/webkit/WebCore/platform/ScrollView.h b/src/3rdparty/webkit/WebCore/platform/ScrollView.h
index 9134ddf..118a310 100644
--- a/src/3rdparty/webkit/WebCore/platform/ScrollView.h
+++ b/src/3rdparty/webkit/WebCore/platform/ScrollView.h
@@ -302,6 +302,9 @@ private:
     // Called to update the scrollbars to accurately reflect the state of the view.
     void updateScrollbars(const IntSize& desiredOffset);
 
+    // Called when the scroll position within this view changes.  FrameView overrides this to generate repaint invalidations.
+    virtual void scrollPositionChanged() {}
+
     void platformInit();
     void platformDestroy();
     void platformAddChild(Widget*);
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp
index 04a2b1b..eb2d934 100644
--- a/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp
@@ -114,7 +114,7 @@ static QStyleOptionSlider* styleOptionSlider(Scrollbar* scrollbar, QWidget* widg
         opt.state |= QStyle::State_Horizontal;
     opt.sliderValue = scrollbar->value();
     opt.sliderPosition = opt.sliderValue;
-    opt.pageStep = scrollbar->visibleSize();
+    opt.pageStep = scrollbar->pageStep();
     opt.singleStep = scrollbar->lineStep();
     opt.minimum = 0;
     opt.maximum = qMax(0, scrollbar->maximum());
-- 
cgit v0.12


From 7894bbb901a2ba74284bd6c0544b06c6a41f6b6f Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Wed, 12 May 2010 14:44:06 +0200
Subject: Possibly fix autotest

It's unclear why the autotest failed on a platform I can't test on right
now, but this might clear it up.
---
 .../declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
index 2207635..c0c5abc 100644
--- a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
+++ b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
@@ -75,7 +75,7 @@ void tst_qdeclarativelayoutitem::test_resizing()
     view.setScene(&scene);
     //Add the QML snippet into the layout
     QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl(SRCDIR "/data/layoutItem.qml"));
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/layoutItem.qml"));
     QDeclarativeLayoutItem* obj = static_cast(c.create());
     layout->addItem(obj);
     layout->setContentsMargins(0,0,0,0);
-- 
cgit v0.12


From c46688b8a88da02028405604ab633b27d3fefa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= 
Date: Tue, 11 May 2010 12:46:46 +0200
Subject: Made curve tesselation be dynamically adjusted based on transform.

This lets us avoid having to use a very low curve threshold value for
all scales, and thus avoids the performance regression from change
c41dbbb5e6495e26cd32.

Task-number: QTBUG-9218
Reviewed-by: Gunnar Sletta
---
 src/gui/painting/qbezier.cpp        | 228 +-----------------------------------
 src/gui/painting/qbezier_p.h        |   7 +-
 src/gui/painting/qpaintengineex.cpp |   2 +
 src/gui/painting/qstroker.cpp       |  23 ++--
 src/gui/painting/qstroker_p.h       |  18 ++-
 src/gui/painting/qtransform.cpp     |   9 +-
 src/s60installs/bwins/QtGuiu.def    |   4 +-
 src/s60installs/eabi/QtGuiu.def     |   4 +-
 8 files changed, 50 insertions(+), 245 deletions(-)

diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index 7ff2a37..2a9b31a 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -93,7 +93,7 @@ QBezier QBezier::fromPoints(const QPointF &p1, const QPointF &p2,
 /*!
   \internal
 */
-QPolygonF QBezier::toPolygon() const
+QPolygonF QBezier::toPolygon(qreal bezier_flattening_threshold) const
 {
     // flattening is done by splitting the bezier until we can replace the segment by a straight
     // line. We split further until the control points are close enough to the line connecting the
@@ -108,7 +108,7 @@ QPolygonF QBezier::toPolygon() const
 
     QPolygonF polygon;
     polygon.append(QPointF(x1, y1));
-    addToPolygon(&polygon);
+    addToPolygon(&polygon, bezier_flattening_threshold);
     return polygon;
 }
 
@@ -117,34 +117,6 @@ QBezier QBezier::mapBy(const QTransform &transform) const
     return QBezier::fromPoints(transform.map(pt1()), transform.map(pt2()), transform.map(pt3()), transform.map(pt4()));
 }
 
-//0.05 is really low, but required for scaled-up beziers...
-static const qreal flatness = 0.05;
-
-//based on "Fast, precise flattening of cubic Bezier path and offset curves"
-//      by T. F. Hain, A. L. Ahmad, S. V. R. Racherla and D. D. Langan
-static inline void flattenBezierWithoutInflections(QBezier &bez,
-                                                   QPolygonF *&p)
-{
-    QBezier left;
-
-    while (1) {
-        qreal dx = bez.x2 - bez.x1;
-        qreal dy = bez.y2 - bez.y1;
-
-        qreal normalized = qSqrt(dx * dx + dy * dy);
-        if (qFuzzyIsNull(normalized))
-           break;
-
-        qreal d = qAbs(dx * (bez.y3 - bez.y2) - dy * (bez.x3 - bez.x2));
-
-        qreal t = qSqrt(4. / 3. * normalized * flatness / d);
-        if (t > 1 || qFuzzyIsNull(t - (qreal)1.))
-            break;
-        bez.parameterSplitLeft(t, &left);
-        p->append(bez.pt1());
-    }
-}
-
 QBezier QBezier::getSubRange(qreal t0, qreal t1) const
 {
     QBezier result;
@@ -223,7 +195,7 @@ static inline bool findInflections(qreal a, qreal b, qreal c,
 }
 
 
-void QBezier::addToPolygon(QPolygonF *polygon) const
+void QBezier::addToPolygon(QPolygonF *polygon, qreal bezier_flattening_threshold) const
 {
     QBezier beziers[32];
     beziers[0] = *this;
@@ -243,7 +215,7 @@ void QBezier::addToPolygon(QPolygonF *polygon) const
                 qAbs(b->x1 - b->x3) + qAbs(b->y1 - b->y3);
             l = 1.;
         }
-        if (d < flatness*l || b == beziers + 31) {
+        if (d < bezier_flattening_threshold*l || b == beziers + 31) {
             // good enough, we pop it off and add the endpoint
             polygon->append(QPointF(b->x4, b->y4));
             --b;
@@ -255,55 +227,6 @@ void QBezier::addToPolygon(QPolygonF *polygon) const
     }
 }
 
-void QBezier::addToPolygonMixed(QPolygonF *polygon) const
-{
-    qreal ax = -x1 + 3*x2 - 3*x3 + x4;
-    qreal ay = -y1 + 3*y2 - 3*y3 + y4;
-    qreal bx = 3*x1 - 6*x2 + 3*x3;
-    qreal by = 3*y1 - 6*y2 + 3*y3;
-    qreal cx = -3*x1 + 3*x2;
-    qreal cy = -3*y1 + 2*y2;
-    qreal a = 6 * (ay * bx - ax * by);
-    qreal b = 6 * (ay * cx - ax * cy);
-    qreal c = 2 * (by * cx - bx * cy);
-
-    if ((qFuzzyIsNull(a) && qFuzzyIsNull(b)) ||
-        (b * b - 4 * a *c) < 0) {
-        QBezier bez(*this);
-        flattenBezierWithoutInflections(bez, polygon);
-        polygon->append(QPointF(x4, y4));
-    } else {
-        QBezier beziers[32];
-        beziers[0] = *this;
-        QBezier *b = beziers;
-
-        while (b >= beziers) {
-            // check if we can pop the top bezier curve from the stack
-            qreal y4y1 = b->y4 - b->y1;
-            qreal x4x1 = b->x4 - b->x1;
-            qreal l = qAbs(x4x1) + qAbs(y4y1);
-            qreal d;
-            if (l > 1.) {
-                d = qAbs( (x4x1)*(b->y1 - b->y2) - (y4y1)*(b->x1 - b->x2) )
-                    + qAbs( (x4x1)*(b->y1 - b->y3) - (y4y1)*(b->x1 - b->x3) );
-            } else {
-                d = qAbs(b->x1 - b->x2) + qAbs(b->y1 - b->y2) +
-                    qAbs(b->x1 - b->x3) + qAbs(b->y1 - b->y3);
-                l = 1.;
-            }
-            if (d < .5*l || b == beziers + 31) {
-                // good enough, we pop it off and add the endpoint
-                polygon->append(QPointF(b->x4, b->y4));
-                --b;
-            } else {
-                // split, second half of the polygon goes lower into the stack
-                b->split(b+1, b);
-                ++b;
-            }
-        }
-    }
-}
-
 QRectF QBezier::bounds() const
 {
     qreal xmin = x1;
@@ -824,147 +747,4 @@ QBezier QBezier::bezierOnInterval(qreal t0, qreal t1) const
     return result;
 }
 
-
-static inline void bindInflectionPoint(const QBezier &bez, const qreal t,
-                                       qreal *tMinus , qreal *tPlus)
-{
-    if (t <= 0) {
-        *tMinus = *tPlus = -1;
-        return;
-    } else if (t >= 1) {
-        *tMinus = *tPlus = 2;
-        return;
-    }
-
-    QBezier left, right;
-    splitBezierAt(bez, t, &left, &right);
-
-    qreal ax = -right.x1 + 3*right.x2 - 3*right.x3 + right.x4;
-    qreal ay = -right.y1 + 3*right.y2 - 3*right.y3 + right.y4;
-    qreal ex = 3 * (right.x2 - right.x3);
-    qreal ey = 3 * (right.y2 - right.y3);
-
-    qreal s4 = qAbs(6 * (ey * ax - ex * ay) / qSqrt(ex * ex + ey * ey)) + 0.00001f;
-    qreal tf = qPow(qreal(9 * flatness / s4), qreal(1./3.));
-    *tMinus = t - (1 - t) * tf;
-    *tPlus  = t + (1 - t) * tf;
-}
-
-void QBezier::addToPolygonIterative(QPolygonF *p) const
-{
-    qreal t1, t2, tcusp;
-    qreal t1min, t1plus, t2min, t2plus;
-
-    qreal ax = -x1 + 3*x2 - 3*x3 + x4;
-    qreal ay = -y1 + 3*y2 - 3*y3 + y4;
-    qreal bx = 3*x1 - 6*x2 + 3*x3;
-    qreal by = 3*y1 - 6*y2 + 3*y3;
-    qreal cx = -3*x1 + 3*x2;
-    qreal cy = -3*y1 + 2*y2;
-
-    if (findInflections(6 * (ay * bx - ax * by),
-                        6 * (ay * cx - ax * cy),
-                        2 * (by * cx - bx * cy),
-                        &t1, &t2, &tcusp)) {
-        bindInflectionPoint(*this, t1, &t1min, &t1plus);
-        bindInflectionPoint(*this, t2, &t2min, &t2plus);
-
-        QBezier tmpBez = *this;
-        QBezier left, right, bez1, bez2, bez3;
-	if (t1min > 0) {
-            if (t1min >= 1) {
-                flattenBezierWithoutInflections(tmpBez, p);
-            } else {
-                splitBezierAt(tmpBez, t1min, &left, &right);
-                flattenBezierWithoutInflections(left, p);
-                p->append(tmpBez.pointAt(t1min));
-
-                if (t2min < t1plus) {
-                    if (tcusp < 1) {
-                        p->append(tmpBez.pointAt(tcusp));
-                    }
-                    if (t2plus < 1) {
-                        splitBezierAt(tmpBez, t2plus, &left, &right);
-                        flattenBezierWithoutInflections(right, p);
-                    }
-                } else if (t1plus < 1) {
-                    if (t2min < 1) {
-                        splitBezierAt(tmpBez, t2min, &bez3, &right);
-                        splitBezierAt(bez3, t1plus, &left, &bez2);
-
-                        flattenBezierWithoutInflections(bez2, p);
-                        p->append(tmpBez.pointAt(t2min));
-
-                        if (t2plus < 1) {
-                            splitBezierAt(tmpBez, t2plus, &left, &bez2);
-                            flattenBezierWithoutInflections(bez2, p);
-                        }
-                    } else {
-                        splitBezierAt(tmpBez, t1plus, &left, &bez2);
-                        flattenBezierWithoutInflections(bez2, p);
-                    }
-                }
-            }
-	} else if (t1plus > 0) {
-            p->append(QPointF(x1, y1));
-            if (t2min < t1plus)	{
-                if (tcusp < 1) {
-                    p->append(tmpBez.pointAt(tcusp));
-                }
-                if (t2plus < 1) {
-                    splitBezierAt(tmpBez, t2plus, &left, &bez2);
-                    flattenBezierWithoutInflections(bez2, p);
-                }
-            } else if (t1plus < 1) {
-                if (t2min < 1) {
-                    splitBezierAt(tmpBez, t2min, &bez3, &right);
-                    splitBezierAt(bez3, t1plus, &left, &bez2);
-
-                    flattenBezierWithoutInflections(bez2, p);
-
-                    p->append(tmpBez.pointAt(t2min));
-                    if (t2plus < 1) {
-                        splitBezierAt(tmpBez, t2plus, &left, &bez2);
-                        flattenBezierWithoutInflections(bez2, p);
-                    }
-                } else {
-                    splitBezierAt(tmpBez, t1plus, &left, &bez2);
-                    flattenBezierWithoutInflections(bez2, p);
-                }
-            }
-        } else if (t2min > 0) {
-            if (t2min < 1) {
-                splitBezierAt(tmpBez, t2min, &bez1, &right);
-                flattenBezierWithoutInflections(bez1, p);
-                p->append(tmpBez.pointAt(t2min));
-
-                if (t2plus < 1) {
-                    splitBezierAt(tmpBez, t2plus, &left, &bez2);
-                    flattenBezierWithoutInflections(bez2, p);
-                }
-            } else {
-                //### in here we should check whether the area of the
-                //    triangle formed between pt1/pt2/pt3 is smaller
-                //    or equal to 0 and then do iterative flattening
-                //    if not we should fallback and do the recursive
-                //    flattening.
-                flattenBezierWithoutInflections(tmpBez, p);
-            }
-        } else if (t2plus > 0) {
-            p->append(QPointF(x1, y1));
-            if (t2plus < 1) {
-                splitBezierAt(tmpBez, t2plus, &left, &bez2);
-                flattenBezierWithoutInflections(bez2, p);
-            }
-        } else {
-            flattenBezierWithoutInflections(tmpBez, p);
-        }
-    } else {
-        QBezier bez = *this;
-        flattenBezierWithoutInflections(bez, p);
-    }
-
-    p->append(QPointF(x4, y4));
-}
-
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qbezier_p.h b/src/gui/painting/qbezier_p.h
index 846635f..18ec116 100644
--- a/src/gui/painting/qbezier_p.h
+++ b/src/gui/painting/qbezier_p.h
@@ -79,10 +79,9 @@ public:
     inline QPointF derivedAt(qreal t) const;
     inline QPointF secondDerivedAt(qreal t) const;
 
-    QPolygonF toPolygon() const;
-    void addToPolygon(QPolygonF *p) const;
-    void addToPolygonIterative(QPolygonF *p) const;
-    void addToPolygonMixed(QPolygonF *p) const;
+    QPolygonF toPolygon(qreal bezier_flattening_threshold = 0.5) const;
+    void addToPolygon(QPolygonF *p, qreal bezier_flattening_threshold = 0.5) const;
+
     QRectF bounds() const;
     qreal length(qreal error = 0.01) const;
     void addIfClose(qreal *length, qreal error) const;
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index fda937e..ff82d59 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -461,6 +461,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
         // change the current transform. Normal transformed,
         // non-cosmetic pens will be transformed as part of fill
         // later, so they are also covered here..
+        d->activeStroker->setCurveThresholdFromTransform(state()->matrix);
         d->activeStroker->begin(d->strokeHandler);
         if (types) {
             while (points < lastPoint) {
@@ -518,6 +519,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->begin(d->strokeHandler);
             if (types) {
                 while (points < lastPoint) {
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 9b8e099..eabbd8a 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -120,8 +120,8 @@ private:
 class QSubpathFlatIterator
 {
 public:
-    QSubpathFlatIterator(const QDataBuffer *path)
-        : m_path(path), m_pos(0), m_curve_index(-1) { }
+    QSubpathFlatIterator(const QDataBuffer *path, qreal threshold)
+        : m_path(path), m_pos(0), m_curve_index(-1), m_curve_threshold(threshold) { }
 
     inline bool hasNext() const { return m_curve_index >= 0 || m_pos < m_path->size(); }
 
@@ -152,7 +152,7 @@ public:
                                           QPointF(qt_fixed_to_real(m_path->at(m_pos+1).x),
                                                   qt_fixed_to_real(m_path->at(m_pos+1).y)),
                                           QPointF(qt_fixed_to_real(m_path->at(m_pos+2).x),
-                                                  qt_fixed_to_real(m_path->at(m_pos+2).y))).toPolygon();
+                                                  qt_fixed_to_real(m_path->at(m_pos+2).y))).toPolygon(m_curve_threshold);
             m_curve_index = 1;
             e.type = QPainterPath::LineToElement;
             e.x = m_curve.at(0).x();
@@ -169,6 +169,7 @@ private:
     int m_pos;
     QPolygonF m_curve;
     int m_curve_index;
+    qreal m_curve_threshold;
 };
 
 template  bool qt_stroke_side(Iterator *it, QStroker *stroker,
@@ -187,7 +188,12 @@ static inline qreal adapted_angle_on_x(const QLineF &line)
 }
 
 QStrokerOps::QStrokerOps()
-    : m_elements(0), m_customData(0), m_moveTo(0), m_lineTo(0), m_cubicTo(0)
+    : m_elements(0)
+    , m_curveThreshold(qt_real_to_fixed(0.25))
+    , m_customData(0)
+    , m_moveTo(0)
+    , m_lineTo(0)
+    , m_cubicTo(0)
 {
 }
 
@@ -195,7 +201,6 @@ QStrokerOps::~QStrokerOps()
 {
 }
 
-
 /*!
     Prepares the stroker. Call this function once before starting a
     stroke by calling moveTo, lineTo or cubicTo.
@@ -238,6 +243,7 @@ void QStrokerOps::strokePath(const QPainterPath &path, void *customData, const Q
     if (path.isEmpty())
         return;
 
+    setCurveThresholdFromTransform(matrix);
     begin(customData);
     int count = path.elementCount();
     if (matrix.isIdentity()) {
@@ -308,6 +314,8 @@ void QStrokerOps::strokePolygon(const QPointF *points, int pointCount, bool impl
 {
     if (!pointCount)
         return;
+
+    setCurveThresholdFromTransform(matrix);
     begin(data);
     if (matrix.isIdentity()) {
         moveTo(qt_real_to_fixed(points[0].x()), qt_real_to_fixed(points[0].y()));
@@ -348,6 +356,7 @@ void QStrokerOps::strokeEllipse(const QRectF &rect, void *data, const QTransform
         }
     }
 
+    setCurveThresholdFromTransform(matrix);
     begin(data);
     moveTo(qt_real_to_fixed(start.x()), qt_real_to_fixed(start.y()));
     for (int i=0; i<12; i+=3) {
@@ -366,12 +375,10 @@ QStroker::QStroker()
 {
     m_strokeWidth = qt_real_to_fixed(1);
     m_miterLimit = qt_real_to_fixed(2);
-    m_curveThreshold = qt_real_to_fixed(0.25);
 }
 
 QStroker::~QStroker()
 {
-
 }
 
 Qt::PenCapStyle QStroker::capForJoinMode(LineJoinMode mode)
@@ -1135,7 +1142,7 @@ void QDashStroker::processCurrentSubpath()
 
     QPainterPath dashPath;
 
-    QSubpathFlatIterator it(&m_elements);
+    QSubpathFlatIterator it(&m_elements, m_curveThreshold);
     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 3e622a8..0f133ef 100644
--- a/src/gui/painting/qstroker_p.h
+++ b/src/gui/painting/qstroker_p.h
@@ -124,6 +124,9 @@ typedef void (*qStrokerCubicToHook)(qfixed c1x, qfixed c1y,
                                     qfixed ex, qfixed ey,
                                     void *data);
 
+// qtransform.cpp
+extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
+
 class Q_GUI_EXPORT QStrokerOps
 {
 public:
@@ -161,6 +164,16 @@ public:
     QRectF clipRect() const { return m_clip_rect; }
     void setClipRect(const QRectF &clip) { m_clip_rect = clip; }
 
+    void setCurveThresholdFromTransform(const QTransform &transform)
+    {
+        qreal scale;
+        qt_scaleForTransform(transform, &scale);
+        setCurveThreshold(scale == 0 ? qreal(0.5) : (qreal(0.5) / scale));
+    }
+
+    void setCurveThreshold(qfixed threshold) { m_curveThreshold = threshold; }
+    qfixed curveThreshold() const { return m_curveThreshold; }
+
 protected:
     inline void emitMoveTo(qfixed x, qfixed y);
     inline void emitLineTo(qfixed x, qfixed y);
@@ -170,6 +183,7 @@ protected:
     QDataBuffer m_elements;
 
     QRectF m_clip_rect;
+    qfixed m_curveThreshold;
 
     void *m_customData;
     qStrokerMoveToHook m_moveTo;
@@ -208,9 +222,6 @@ public:
     void setMiterLimit(qfixed length) { m_miterLimit = length; }
     qfixed miterLimit() const { return m_miterLimit; }
 
-    void setCurveThreshold(qfixed threshold) { m_curveThreshold = threshold; }
-    qfixed curveThreshold() const { return m_curveThreshold; }
-
     void joinPoints(qfixed x, qfixed y, const QLineF &nextLine, LineJoinMode join);
     inline void emitMoveTo(qfixed x, qfixed y);
     inline void emitLineTo(qfixed x, qfixed y);
@@ -227,7 +238,6 @@ protected:
 
     qfixed m_strokeWidth;
     qfixed m_miterLimit;
-    qfixed m_curveThreshold;
 
     LineJoinMode m_capStyle;
     LineJoinMode m_joinStyle;
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index 80b7520..c72a08e 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1545,12 +1545,19 @@ static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transfor
 
     return true;
 }
+bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
 
 static inline bool cubicTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, const QPointF &c, const QPointF &d, bool needsMoveTo)
 {
     // Convert projective xformed curves to line
     // segments so they can be transformed more accurately
-    QPolygonF segment = QBezier::fromPoints(a, b, c, d).toPolygon();
+
+    qreal scale;
+    qt_scaleForTransform(transform, &scale);
+
+    qreal curveThreshold = scale == 0 ? qreal(0.25) : (qreal(0.25) / scale);
+
+    QPolygonF segment = QBezier::fromPoints(a, b, c, d).toPolygon(curveThreshold);
 
     for (int i = 0; i < segment.size() - 1; ++i)
         if (lineTo_clipped(path, transform, segment.at(i), segment.at(i+1), needsMoveTo))
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index c3a3a08..8957c34 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -2126,8 +2126,8 @@ EXPORTS
 	?addToGroup@QGraphicsItemGroup@@QAEXPAVQGraphicsItem@@@Z @ 2125 NONAME ; void QGraphicsItemGroup::addToGroup(class QGraphicsItem *)
 	?addToIndex@QGraphicsItem@@IAEXXZ @ 2126 NONAME ; void QGraphicsItem::addToIndex(void)
 	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@@Z @ 2127 NONAME ; void QBezier::addToPolygon(class QPolygonF *) const
-	?addToPolygonIterative@QBezier@@QBEXPAVQPolygonF@@@Z @ 2128 NONAME ; void QBezier::addToPolygonIterative(class QPolygonF *) const
-	?addToPolygonMixed@QBezier@@QBEXPAVQPolygonF@@@Z @ 2129 NONAME ; void QBezier::addToPolygonMixed(class QPolygonF *) const
+	?addToPolygonIterative@QBezier@@QBEXPAVQPolygonF@@@Z @ 2128 NONAME ABSENT ; void QBezier::addToPolygonIterative(class QPolygonF *) const
+	?addToPolygonMixed@QBezier@@QBEXPAVQPolygonF@@@Z @ 2129 NONAME ABSENT ; void QBezier::addToPolygonMixed(class QPolygonF *) const
 	?addToolBar@QMainWindow@@QAEPAVQToolBar@@ABVQString@@@Z @ 2130 NONAME ; class QToolBar * QMainWindow::addToolBar(class QString const &)
 	?addToolBar@QMainWindow@@QAEXPAVQToolBar@@@Z @ 2131 NONAME ; void QMainWindow::addToolBar(class QToolBar *)
 	?addToolBar@QMainWindow@@QAEXW4ToolBarArea@Qt@@PAVQToolBar@@@Z @ 2132 NONAME ; void QMainWindow::addToolBar(enum Qt::ToolBarArea, class QToolBar *)
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index b1166c5..d127b41 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -9901,9 +9901,9 @@ EXPORTS
 	_ZNK7QBezier10addIfCloseEPff @ 9900 NONAME
 	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME
 	_ZNK7QBezier16bezierOnIntervalEff @ 9902 NONAME
-	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME
+	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME ABSENT
 	_ZNK7QBezier17stationaryYPointsERfS0_ @ 9904 NONAME
-	_ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME
+	_ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME ABSENT
 	_ZNK7QBezier5tForYEfff @ 9906 NONAME
 	_ZNK7QBezier6boundsEv @ 9907 NONAME
 	_ZNK7QBezier6lengthEf @ 9908 NONAME
-- 
cgit v0.12


From 50fa9ebe8fc0e7eca7536a8663c86cd6b98b2c04 Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Wed, 12 May 2010 15:04:18 +0200
Subject: qdoc: Yet another revision of the top doc page.

Still more to come.
---
 doc/src/frameworks-technologies/accessible.qdoc    |  3 +--
 .../activeqt-container.qdoc                        |  7 ++++---
 .../frameworks-technologies/activeqt-server.qdoc   |  6 +++---
 doc/src/frameworks-technologies/activeqt.qdoc      |  5 ++---
 doc/src/frameworks-technologies/containers.qdoc    |  2 +-
 doc/src/frameworks-technologies/dbus-adaptors.qdoc |  1 +
 doc/src/frameworks-technologies/dbus-intro.qdoc    |  2 +-
 .../desktop-integration.qdoc                       |  6 +-----
 doc/src/frameworks-technologies/dnd.qdoc           | 10 ++-------
 doc/src/frameworks-technologies/gestures.qdoc      |  7 ++++---
 doc/src/frameworks-technologies/graphicsview.qdoc  |  2 --
 .../frameworks-technologies/implicit-sharing.qdoc  |  2 +-
 doc/src/frameworks-technologies/ipc.qdoc           |  3 ++-
 doc/src/frameworks-technologies/phonon.qdoc        |  4 ++--
 doc/src/frameworks-technologies/unicode.qdoc       |  2 +-
 doc/src/index.qdoc                                 |  3 ++-
 doc/src/overviews.qdoc                             | 24 ++++++++++++++--------
 src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc   |  4 +++-
 18 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 101d22a..35f1c75 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -47,8 +47,7 @@
 /*!
     \page accessible.html
     \title Accessibility
-    
-    \ingroup frameworks-technologies
+    \ingroup technology-apis
 
     \tableofcontents
 
diff --git a/doc/src/frameworks-technologies/activeqt-container.qdoc b/doc/src/frameworks-technologies/activeqt-container.qdoc
index c1c0947..03cfa8f 100644
--- a/doc/src/frameworks-technologies/activeqt-container.qdoc
+++ b/doc/src/frameworks-technologies/activeqt-container.qdoc
@@ -41,10 +41,11 @@
 
 /*!
     \page activeqt-container.html
-    \title Using ActiveX controls and COM objects in Qt
+    \title Using ActiveX controls and COM in Qt
+    \ingroup qt-activex
 
-    \brief The QAxContainer module is a Windows-only extension for
-    accessing ActiveX controls and COM objects.
+    \brief A Windows-only extension for accessing ActiveX controls and
+    COM objects.
 
     The QAxContainer module is part of the \l ActiveQt framework. It
     provides a library implementing a QWidget subclass, QAxWidget,
diff --git a/doc/src/frameworks-technologies/activeqt-server.qdoc b/doc/src/frameworks-technologies/activeqt-server.qdoc
index 4afcee1..900953a 100644
--- a/doc/src/frameworks-technologies/activeqt-server.qdoc
+++ b/doc/src/frameworks-technologies/activeqt-server.qdoc
@@ -41,10 +41,10 @@
 
 /*!
     \page activeqt-server.html
-    \title Building ActiveX servers and controls with Qt
+    \title Building ActiveX servers in Qt
+    \ingroup qt-activex
 
-    \brief The QAxServer module is a Windows-only static library that
-    you can use to turn a standard Qt binary into a COM server.
+    \brief A Windows-only static library for turning a Qt binary into a COM server.
 
     The QAxServer module is part of the \l ActiveQt framework. It
     consists of three classes:
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index b752122..6f4ec30 100644
--- a/doc/src/frameworks-technologies/activeqt.qdoc
+++ b/doc/src/frameworks-technologies/activeqt.qdoc
@@ -53,11 +53,10 @@
 
 /*!
     \page activeqt.html
-    \title ActiveQt Framework
+    \title Qt's ActiveX Framework (ActiveQt)
     \brief An overview of Qt's ActiveX and COM integration on Windows.
 
-    \ingroup platform-specific
-    \ingroup frameworks-technologies
+    \ingroup qt-activex
     \keyword ActiveQt
 
     Qt's ActiveX and COM support allows Qt for Windows developers to:
diff --git a/doc/src/frameworks-technologies/containers.qdoc b/doc/src/frameworks-technologies/containers.qdoc
index 505b65c..5b184fa 100644
--- a/doc/src/frameworks-technologies/containers.qdoc
+++ b/doc/src/frameworks-technologies/containers.qdoc
@@ -58,7 +58,7 @@
 /*!
     \page containers.html
     \title Generic Containers
-    \ingroup frameworks-technologies
+    \ingroup technology-apis
     \ingroup groups
     \keyword container class
     \keyword container classes
diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 5fc7a79..11c5998 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page usingadaptors.html
     \title Using QtDBus Adaptors
+    \ingroup technology-apis
 
     \ingroup best-practices
 
diff --git a/doc/src/frameworks-technologies/dbus-intro.qdoc b/doc/src/frameworks-technologies/dbus-intro.qdoc
index 1fe2ed2..10726e5 100644
--- a/doc/src/frameworks-technologies/dbus-intro.qdoc
+++ b/doc/src/frameworks-technologies/dbus-intro.qdoc
@@ -45,7 +45,7 @@
     \brief An introduction to Inter-Process Communication and Remote Procedure Calling with D-Bus.
 
     \keyword QtDBus
-    \ingroup frameworks-technologies
+    \ingroup technology-apis
 
     \section1 Introduction
 
diff --git a/doc/src/frameworks-technologies/desktop-integration.qdoc b/doc/src/frameworks-technologies/desktop-integration.qdoc
index 7f01ae3..59b2570 100644
--- a/doc/src/frameworks-technologies/desktop-integration.qdoc
+++ b/doc/src/frameworks-technologies/desktop-integration.qdoc
@@ -40,16 +40,12 @@
 ****************************************************************************/
 
 /*!
-    \group desktop
-    \title Desktop Integration Classes
-*/
-
-/*!
     \page desktop-integration.html
     \title Desktop Integration
     \brief Integrating with the user's desktop environment.
     
     \ingroup best-practices
+    \ingroup qt-gui-concepts
 
     Qt applications behave well in the user's desktop environment, but certain
     integrations require additional, and sometimes platform specific, techniques.
diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc
index 49468de..0e952ad 100644
--- a/doc/src/frameworks-technologies/dnd.qdoc
+++ b/doc/src/frameworks-technologies/dnd.qdoc
@@ -40,18 +40,12 @@
 ****************************************************************************/
 
 /*!
-    \group draganddrop
-    \title Drag And Drop Classes
-
-    \brief Classes dealing with drag and drop and mime type encoding and decoding.
-*/
-
-/*!
     \page dnd.html
     \title Drag and Drop
     \brief An overview of the drag and drop system provided by Qt.
 
-    \ingroup frameworks-technologies
+    \ingroup technology-apis
+    \ingroup qt-gui-concepts
 
     Drag and drop provides a simple visual mechanism which users can use
     to transfer information between and within applications. (In the
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index 1b395b0..c999fa6 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -42,12 +42,13 @@
 /*!
     \page gestures-overview.html
     \title Gestures Programming
-    \ingroup frameworks-technologies
     \startpage index.html Qt Reference Documentation
+    \ingroup technology-apis
+    \ingroup qt-gui-concepts
 
-    \brief An overview of the Qt support for Gesture programming.
+    \brief An overview of Qt support for Gesture programming.
 
-    Qt includes a framework for gesture programming that gives has the ability
+    Qt includes a framework for gesture programming that has the ability
     to form gestures from a series of events, independently of the input methods
     used. A gesture could be a particular movement of a mouse, a touch screen
     action, or a series of events from some other source. The nature of the input,
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 1dd6c7c..681568e 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -51,8 +51,6 @@
     \brief An overview of the Graphics View framework for interactive 2D
     graphics.
 
-    \ingroup frameworks-technologies
-
     \keyword Graphics View
     \keyword GraphicsView
     \keyword Graphics
diff --git a/doc/src/frameworks-technologies/implicit-sharing.qdoc b/doc/src/frameworks-technologies/implicit-sharing.qdoc
index e4d6f65..f42ec93 100644
--- a/doc/src/frameworks-technologies/implicit-sharing.qdoc
+++ b/doc/src/frameworks-technologies/implicit-sharing.qdoc
@@ -50,7 +50,7 @@
 /*!
     \page implicit-sharing.html
     \title Implicit Sharing
-    \ingroup frameworks-technologies
+    \ingroup qt-basic-concepts
 
     \brief Reference counting for fast copying.
 
diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc
index 18a9455..5139f04 100644
--- a/doc/src/frameworks-technologies/ipc.qdoc
+++ b/doc/src/frameworks-technologies/ipc.qdoc
@@ -44,7 +44,8 @@
     \title Inter-Process Communication in Qt
     \brief Inter-Process communication in Qt applications.
 
-    \ingroup frameworks-technologies
+    \ingroup technology-apis
+    \ingout qt-network
 
     Qt provides several ways to implement Inter-Process Communication
     (IPC) in Qt applications.
diff --git a/doc/src/frameworks-technologies/phonon.qdoc b/doc/src/frameworks-technologies/phonon.qdoc
index 2d035c7..61d7926 100644
--- a/doc/src/frameworks-technologies/phonon.qdoc
+++ b/doc/src/frameworks-technologies/phonon.qdoc
@@ -41,8 +41,8 @@
 
 /*!
     \page phonon-overview.html
-    \title Phonon Overview
-    \ingroup frameworks-technologies
+    \title Phonon multimedia framework
+    \ingroup technology-apis
 
     \tableofcontents
 
diff --git a/doc/src/frameworks-technologies/unicode.qdoc b/doc/src/frameworks-technologies/unicode.qdoc
index 8fa168a..88393a0 100644
--- a/doc/src/frameworks-technologies/unicode.qdoc
+++ b/doc/src/frameworks-technologies/unicode.qdoc
@@ -58,7 +58,7 @@
 
     \keyword Unicode
 
-    \ingroup frameworks-technologies
+    \ingroup technology-apis
 
     Unicode is a multi-byte character set, portable across all major
     computing platforms and with decent coverage over most of the world.
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index c9b6929..b759435 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -90,8 +90,9 @@
               
      
               
      
                 
               
      
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index cee1109..0b82388 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -93,19 +93,27 @@
     \generatelist {related}
  */
 
+/*!
+    \group technology-apis
+    \title Qt API's for other technologies
 
+    These pages document Qt's API's for some widely-used standards and
+    technologies.
 
-/*!
-    \group frameworks-technologies
-    \title Frameworks and Technologies
+    \generatelist{related}
+*/
 
-    \brief Documentation about the frameworks and technologies in Qt
+/*!
+  \group qt-activex
+  \title Qt For ActiveX
+  \brief Qt API's for using ActiveX controls, servers, and COM.
+  \ingroup technology-apis
+  \ingroup platform-specific
 
-    These documents dive into the frameworks of classes that Qt provides,
-    and provide background information about the technical solutions used
-    in Qt's architecture.
+  These pages document Qt's API's for developing with ActiveX
+  controls, servers, and COM.
 
-    \generatelist{related}
+  \generatelist{related}
 */
 
 /*!
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 9e653e4..96eb16e 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -5,7 +5,9 @@
     \previouspage QtSvg
     \nextpage QtXml
     \ingroup modules
-    \brief The QtWebKit module provides a web browser engine as well as
+    \ingroup technology-apis
+
+    \brief The QtWebKit module provides a web browser engine and
     classes to render and interact with web content.
 
     To include the definitions of the module's classes, use the
-- 
cgit v0.12


From 953411c6eecc4175752ade1834bf8db3398961c5 Mon Sep 17 00:00:00 2001
From: Mirko Damiani 
Date: Wed, 12 May 2010 16:08:23 +0200
Subject: Skip definition of wintab functions in case of QT_NO_TABLETEVENT.

Following functions are not compiled when QT_NO_TABLETEVENT is defined
(both declaration and definition):
- qt_tablet_init
- qt_tablet_cleanup
- init_wintab_functions
- qt_tablet_init_wce
- qt_tablet_cleanup_wce

Merge-request: 2388
Reviewed-by: Benjamin Poulain 
---
 src/gui/kernel/qwidget_win.cpp   | 5 +++++
 src/gui/kernel/qwidget_wince.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 7d647b7..c2a24fe 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -123,9 +123,11 @@ static PtrWTClose ptrWTClose = 0;
 static PtrWTInfo ptrWTInfo = 0;
 static PtrWTQueueSizeGet ptrWTQueueSizeGet = 0;
 static PtrWTQueueSizeSet ptrWTQueueSizeSet = 0;
+#ifndef QT_NO_TABLETEVENT
 static void init_wintab_functions();
 static void qt_tablet_init();
 static void qt_tablet_cleanup();
+#endif // QT_NO_TABLETEVENT
 extern HCTX qt_tablet_context;
 extern bool qt_tablet_tilt_support;
 
@@ -136,6 +138,8 @@ QWidget* qt_get_tablet_widget()
 }
 
 extern bool qt_is_gui_used;
+
+#ifndef QT_NO_TABLETEVENT
 static void init_wintab_functions()
 {
 #if defined(Q_OS_WINCE)
@@ -227,6 +231,7 @@ static void qt_tablet_cleanup()
     delete qt_tablet_widget;
     qt_tablet_widget = 0;
 }
+#endif // QT_NO_TABLETEVENT
 
 const QString qt_reg_winclass(QWidget *w);                // defined in qapplication_win.cpp
 
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp
index 509847b..9c2c8c7 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/kernel/qwidget_wince.cpp
@@ -63,6 +63,7 @@ typedef BOOL        (API *PtrWTGet)(HCTX, LPLOGCONTEXT);
 typedef int     (API *PtrWTQueueSizeGet)(HCTX);
 typedef BOOL    (API *PtrWTQueueSizeSet)(HCTX, int);
 
+#ifndef QT_NO_TABLETEVENT
 static void qt_tablet_init_wce();
 static void qt_tablet_cleanup_wce();
 
@@ -135,6 +136,7 @@ static void qt_tablet_cleanup_wce() {
     delete qt_tablet_widget;
     qt_tablet_widget = 0;
 }
+#endif // QT_NO_TABLETEVENT
 
 
 // The internal qWinRequestConfig, defined in qapplication_win.cpp, stores move,
-- 
cgit v0.12


From e4902b4f25ca9c1ecff99609dbe376b407d9c6c5 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen 
Date: Tue, 11 May 2010 16:02:16 +0200
Subject: New Pad Nagivator example implementation.

The old implementation was demo-quality and didn't really belong in
the examples section. This new code cleans up the implementation, and
also makes use of brand new features such as the state machine and
animated transitions system.

The new code is more suitable for documentation, and full docs are
coming up in the next commit.
---
 examples/graphicsview/padnavigator/backside.ui     | 208 ----------------
 .../graphicsview/padnavigator/flippablepad.cpp     |  90 +++++++
 examples/graphicsview/padnavigator/flippablepad.h  |  63 +++++
 examples/graphicsview/padnavigator/main.cpp        |  12 +-
 .../graphicsview/padnavigator/padnavigator.cpp     | 265 +++++++++++++++++++++
 examples/graphicsview/padnavigator/padnavigator.h  |  65 +++++
 .../graphicsview/padnavigator/padnavigator.pro     |  23 +-
 examples/graphicsview/padnavigator/panel.cpp       | 238 ------------------
 examples/graphicsview/padnavigator/panel.h         |  92 -------
 .../graphicsview/padnavigator/roundrectitem.cpp    | 129 +++-------
 examples/graphicsview/padnavigator/roundrectitem.h |  48 ++--
 examples/graphicsview/padnavigator/splashitem.cpp  |  44 ++--
 examples/graphicsview/padnavigator/splashitem.h    |  23 +-
 13 files changed, 577 insertions(+), 723 deletions(-)
 delete mode 100644 examples/graphicsview/padnavigator/backside.ui
 create mode 100644 examples/graphicsview/padnavigator/flippablepad.cpp
 create mode 100644 examples/graphicsview/padnavigator/flippablepad.h
 create mode 100644 examples/graphicsview/padnavigator/padnavigator.cpp
 create mode 100644 examples/graphicsview/padnavigator/padnavigator.h
 delete mode 100644 examples/graphicsview/padnavigator/panel.cpp
 delete mode 100644 examples/graphicsview/padnavigator/panel.h

diff --git a/examples/graphicsview/padnavigator/backside.ui b/examples/graphicsview/padnavigator/backside.ui
deleted file mode 100644
index afa488c..0000000
--- a/examples/graphicsview/padnavigator/backside.ui
+++ /dev/null
@@ -1,208 +0,0 @@
-
- BackSide
- 
-  
-   
-    0
-    0
-    378
-    385
-   
-  
-  
-   BackSide
-  
-  
-   
-    
-     
-      Settings
-     
-     
-      true
-     
-     
-      true
-     
-     
-      
-       
-        
-         Title:
-        
-       
-      
-      
-       
-        
-         Pad Navigator Example
-        
-       
-      
-      
-       
-        
-         Modified:
-        
-       
-      
-      
-       
-        
-         Extent
-        
-       
-      
-      
-       
-        
-         
-          
-           42
-          
-          
-           Qt::Horizontal
-          
-         
-        
-        
-         
-          
-           42
-          
-         
-        
-       
-      
-      
-       
-      
-     
-    
-   
-   
-    
-     
-      Other input
-     
-     
-      true
-     
-     
-      true
-     
-     
-      
-       
-        
-         
-          Widgets On Graphics View
-         
-        
-        
-         
-          QGraphicsProxyWidget
-         
-         
-          
-           QGraphicsWidget
-          
-          
-           
-            QObject
-           
-          
-          
-           
-            QGraphicsItem
-           
-          
-          
-           
-            QGraphicsLayoutItem
-           
-          
-         
-        
-        
-         
-          QGraphicsGridLayout
-         
-         
-          
-           QGraphicsLayout
-          
-          
-           
-            QGraphicsLayoutItem
-           
-          
-         
-        
-        
-         
-          QGraphicsLinearLayout
-         
-         
-          
-           QGraphicsLayout
-          
-          
-           
-            QGraphicsLayoutItem
-           
-          
-         
-        
-       
-      
-     
-    
-   
-  
- 
- 
-  groupBox
-  hostName
-  dateTimeEdit
-  horizontalSlider
-  spinBox
-  groupBox_2
-  treeWidget
- 
- 
- 
-  
-   horizontalSlider
-   valueChanged(int)
-   spinBox
-   setValue(int)
-   
-    
-     184
-     125
-    
-    
-     275
-     127
-    
-   
-  
-  
-   spinBox
-   valueChanged(int)
-   horizontalSlider
-   setValue(int)
-   
-    
-     272
-     114
-    
-    
-     190
-     126
-    
-   
-  
- 
-
diff --git a/examples/graphicsview/padnavigator/flippablepad.cpp b/examples/graphicsview/padnavigator/flippablepad.cpp
new file mode 100644
index 0000000..61f421f
--- /dev/null
+++ b/examples/graphicsview/padnavigator/flippablepad.cpp
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 "flippablepad.h"
+
+#include 
+
+static QRectF boundsFromSize(const QSize &size)
+{
+    return QRectF((-size.width() / 2.0) * 150, (-size.height() / 2.0) * 150,
+                  size.width() * 150, size.height() * 150);
+}
+
+static QPointF posForLocation(int x, int y, const QSize &size)
+{
+    return QPointF(x * 150, y * 150)
+        - QPointF((size.width() - 1) * 75, (size.height() - 1) * 75);
+}
+
+FlippablePad::FlippablePad(const QSize &size, QGraphicsItem *parent)
+    : RoundRectItem(boundsFromSize(size), QColor(226, 255, 92, 64), parent)
+{
+    columns = size.width();
+
+    int numIcons = size.width() * size.height();
+    QList pixmaps;
+    QDirIterator it(":/images", QStringList() << "*.png");
+    while (it.hasNext() && pixmaps.size() < numIcons)
+        pixmaps << it.next();
+
+    const QRectF iconRect(-54, -54, 108, 108);
+    const QColor iconColor(214, 240, 110, 128);
+
+    iconGrid.resize(size.height());
+
+    int n = 0;
+    for (int y = 0; y < size.height(); ++y) {
+        iconGrid[y].resize(columns);
+        for (int x = 0; x < size.width(); ++x) {
+            RoundRectItem *rect = new RoundRectItem(iconRect, iconColor, this);
+            rect->setZValue(1);
+            rect->setPos(posForLocation(x, y, size));
+            rect->setPixmap(pixmaps.at(n++ % pixmaps.size()));
+            iconGrid[y][x] = rect;
+        }
+    }
+}
+
+RoundRectItem *FlippablePad::iconAt(int x, int y) const
+{
+    return iconGrid[y][x];
+}
diff --git a/examples/graphicsview/padnavigator/flippablepad.h b/examples/graphicsview/padnavigator/flippablepad.h
new file mode 100644
index 0000000..9adb18b
--- /dev/null
+++ b/examples/graphicsview/padnavigator/flippablepad.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 FLIPPABLEPAD_H
+#define FLIPPABLEPAD_H
+
+#include "roundrectitem.h"
+
+#include 
+#include 
+#include 
+
+class FlippablePad : public RoundRectItem
+{
+public:
+    FlippablePad(const QSize &size, QGraphicsItem *parent = 0);
+
+    RoundRectItem *iconAt(int x, int y) const;
+
+private:
+    int columns;
+    QVector > iconGrid;
+};
+
+#endif // FLIPPABLEPAD_H
diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp
index fb6c120..6d148bb 100644
--- a/examples/graphicsview/padnavigator/main.cpp
+++ b/examples/graphicsview/padnavigator/main.cpp
@@ -39,21 +39,17 @@
 **
 ****************************************************************************/
 
-#include 
-#ifndef QT_NO_OPENGL
-#  include 
-#endif
+#include "padnavigator.h"
 
-#include "panel.h"
+#include 
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Q_INIT_RESOURCE(padnavigator);
 
-    Panel panel(3, 3);
-    panel.setFocus();
-    panel.show();
+    PadNavigator navigator(QSize(3, 3));
+    navigator.show();
 
     return app.exec();
 }
diff --git a/examples/graphicsview/padnavigator/padnavigator.cpp b/examples/graphicsview/padnavigator/padnavigator.cpp
new file mode 100644
index 0000000..456b3f4
--- /dev/null
+++ b/examples/graphicsview/padnavigator/padnavigator.cpp
@@ -0,0 +1,265 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "flippablepad.h"
+#include "padnavigator.h"
+#include "splashitem.h"
+#include "ui_form.h"
+
+#include 
+#ifndef QT_NO_OPENGL
+#include 
+#endif
+
+PadNavigator::PadNavigator(const QSize &size, QWidget *parent)
+    : QGraphicsView(parent)
+{
+    // Prepare splash item
+    SplashItem *splash = new SplashItem;
+    splash->setZValue(1);
+
+    // Prepare pad item
+    FlippablePad *pad = new FlippablePad(size);
+    QGraphicsRotation *flipRotation = new QGraphicsRotation(pad);
+    flipRotation->setAxis(Qt::YAxis);
+    QGraphicsRotation *xRotation = new QGraphicsRotation(pad);
+    xRotation->setAxis(Qt::YAxis);
+    QGraphicsRotation *yRotation = new QGraphicsRotation(pad);
+    yRotation->setAxis(Qt::XAxis);
+    pad->setTransformations(QList()
+                            << flipRotation
+                            << xRotation << yRotation);
+
+    // Prepare backitem
+    form = new Ui_Form;
+    QWidget *widget = new QWidget;
+    form->setupUi(widget);
+    form->hostName->setFocus();
+    QGraphicsProxyWidget *backItem = new QGraphicsProxyWidget(pad);
+    backItem->setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    backItem->setWidget(widget);
+    backItem->setTransform(QTransform()
+                           .rotate(180, Qt::YAxis)
+                           .translate(-backItem->rect().width()/2, -backItem->rect().height()/2));
+    backItem->setFocus();
+    backItem->setVisible(false);
+
+    // Prepare selection item
+    RoundRectItem *selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120),
+                                                     Qt::gray, pad);
+    selectionItem->setZValue(0.5);
+
+    // Selection animation setup
+    QPropertyAnimation *smoothXSelection = new QPropertyAnimation(selectionItem, "x");
+    smoothXSelection->setDuration(125);
+    smoothXSelection->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *smoothYSelection = new QPropertyAnimation(selectionItem, "y");
+    smoothYSelection->setDuration(125);
+    smoothYSelection->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *smoothXRotation = new QPropertyAnimation(xRotation, "angle");
+    smoothXRotation->setDuration(125);
+    smoothXRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *smoothYRotation = new QPropertyAnimation(yRotation, "angle");
+    smoothYRotation->setDuration(125);
+    smoothYRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *smoothScale = new QPropertyAnimation(pad, "scale");
+    smoothScale->setDuration(500);
+    smoothScale->setKeyValueAt(0, qVariantValue(1.0));
+    smoothScale->setKeyValueAt(0.5, qVariantValue(0.7));
+    smoothScale->setKeyValueAt(1, qVariantValue(1.0));
+    smoothScale->setEasingCurve(QEasingCurve::InOutQuad);
+
+    // Flip animation setup
+    QPropertyAnimation *smoothFlipRotation = new QPropertyAnimation(flipRotation, "angle");
+    smoothFlipRotation->setDuration(500);
+    smoothFlipRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *flipSmoothXRotation = new QPropertyAnimation(xRotation, "angle");
+    flipSmoothXRotation->setDuration(500);
+    flipSmoothXRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *flipSmoothYRotation = new QPropertyAnimation(yRotation, "angle");
+    flipSmoothYRotation->setDuration(500);
+    flipSmoothYRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    QPropertyAnimation *setBackItemVisibleAnim = new QPropertyAnimation(backItem, "visible");
+    setBackItemVisibleAnim->setDuration(0);
+    QPropertyAnimation *setSelectionItemVisibleAnim = new QPropertyAnimation(selectionItem, "visible");
+    setSelectionItemVisibleAnim->setDuration(0);
+    QPropertyAnimation *setFillAnim = new QPropertyAnimation(pad, "fill");
+    setFillAnim->setDuration(0);
+    QSequentialAnimationGroup *setVisibleAnimation = new QSequentialAnimationGroup;
+    setVisibleAnimation->addPause(250);
+    setVisibleAnimation->addAnimation(setBackItemVisibleAnim);
+    setVisibleAnimation->addAnimation(setSelectionItemVisibleAnim);
+    setVisibleAnimation->addAnimation(setFillAnim);
+    QParallelAnimationGroup *flipAnimation = new QParallelAnimationGroup(this);
+    flipAnimation->addAnimation(smoothFlipRotation);
+    flipAnimation->addAnimation(smoothScale);
+    flipAnimation->addAnimation(flipSmoothXRotation);
+    flipAnimation->addAnimation(flipSmoothYRotation);
+    flipAnimation->addAnimation(setVisibleAnimation);
+
+    QPropertyAnimation *smoothSplashMove = new QPropertyAnimation(splash, "y");
+    smoothSplashMove->setEasingCurve(QEasingCurve::InQuad);
+    smoothSplashMove->setDuration(250);
+    QPropertyAnimation *smoothSplashOpacity = new QPropertyAnimation(splash, "opacity");
+    smoothSplashOpacity->setDuration(250);
+
+    // Build the state machine
+    QStateMachine *stateMachine = new QStateMachine(this);
+    QState *splashState = new QState(stateMachine);
+    QState *frontState = new QState(stateMachine);
+    QHistoryState *historyState = new QHistoryState(frontState);
+    QState *backState = new QState(stateMachine);
+    frontState->assignProperty(splash, "opacity", 0.0);
+    frontState->assignProperty(flipRotation, "angle", qVariantValue(0.0));
+    frontState->assignProperty(backItem, "visible", false);
+    frontState->assignProperty(selectionItem, "visible", true);
+    frontState->assignProperty(pad, "fill", false);
+    backState->assignProperty(flipRotation, "angle", qVariantValue(180.0));
+    backState->assignProperty(xRotation, "angle", qVariantValue(0.0));
+    backState->assignProperty(yRotation, "angle", qVariantValue(0.0));
+    backState->assignProperty(selectionItem, "visible", false);
+    backState->assignProperty(backItem, "visible", true);
+    backState->assignProperty(pad, "fill", true);
+    stateMachine->addDefaultAnimation(smoothXRotation);
+    stateMachine->addDefaultAnimation(smoothYRotation);
+    stateMachine->addDefaultAnimation(smoothXSelection);
+    stateMachine->addDefaultAnimation(smoothYSelection);
+    stateMachine->setInitialState(splashState);
+
+    // Transitions
+    QEventTransition *anyKeyTransition = new QEventTransition(this, QEvent::KeyPress, splashState);
+    anyKeyTransition->setTargetState(frontState);
+    anyKeyTransition->addAnimation(smoothSplashMove);
+    anyKeyTransition->addAnimation(smoothSplashOpacity);
+
+    QKeyEventTransition *enterTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Enter, backState);
+    enterTransition->setTargetState(historyState);
+    QKeyEventTransition *returnTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Return, backState);
+    returnTransition->setTargetState(historyState);
+    QKeyEventTransition *backEnterTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Enter, frontState);
+    backEnterTransition->setTargetState(backState);
+    QKeyEventTransition *backReturnTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Return, frontState);
+    backReturnTransition->setTargetState(backState);
+    enterTransition->addAnimation(flipAnimation);
+    returnTransition->addAnimation(flipAnimation);
+    backEnterTransition->addAnimation(flipAnimation);
+    backReturnTransition->addAnimation(flipAnimation);
+
+    // Substates, one for each icon
+    int columns = size.width();
+    int rows = size.height();
+    QVector< QVector< QState * > > stateGrid;
+    stateGrid.resize(rows);
+    for (int y = 0; y < rows; ++y) {
+        stateGrid[y].resize(columns);
+        for (int x = 0; x < columns; ++x) {
+            QState *state = new QState(frontState);
+            stateGrid[y][x] = state;
+        }
+    }
+    frontState->setInitialState(stateGrid[0][0]);
+    selectionItem->setPos(pad->iconAt(0, 0)->pos());
+
+    // Enable key navigation using state transitions
+    for (int y = 0; y < rows; ++y) {
+        for (int x = 0; x < columns; ++x) {
+            QState *state = stateGrid[y][x];
+            QKeyEventTransition *rightTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Right, state);
+            rightTransition->setTargetState(stateGrid[y][(x + 1) % columns]);
+            QKeyEventTransition *leftTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Left, state);
+            leftTransition->setTargetState(stateGrid[y][((x - 1) + columns) % columns]);
+            QKeyEventTransition *downTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Down, state);
+            downTransition->setTargetState(stateGrid[(y + 1) % rows][x]);
+            QKeyEventTransition *upTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Up, state);
+            upTransition->setTargetState(stateGrid[((y - 1) + rows) % rows][x]);
+
+            RoundRectItem *icon = pad->iconAt(x, y);
+            state->assignProperty(xRotation, "angle", -icon->x() / 6.0);
+            state->assignProperty(yRotation, "angle", icon->y() / 6.0);
+            state->assignProperty(selectionItem, "x", icon->x());
+            state->assignProperty(selectionItem, "y", icon->y());
+            frontState->assignProperty(icon, "visible", true);
+            backState->assignProperty(icon, "visible", false);
+
+            QPropertyAnimation *setVisibleAnim = new QPropertyAnimation(icon, "visible");
+            setVisibleAnim->setDuration(0);
+            setVisibleAnimation->addAnimation(setVisibleAnim);
+        }
+    }
+
+    // Setup scene
+    QGraphicsScene *scene = new QGraphicsScene(this);
+    scene->setBackgroundBrush(QPixmap(":/images/blue_angle_swirl.jpg"));
+    scene->setItemIndexMethod(QGraphicsScene::NoIndex);
+    scene->addItem(pad);
+    scene->setSceneRect(scene->itemsBoundingRect());
+    setScene(scene);
+
+    // Adjust splash item
+    splash->setPos(-splash->boundingRect().width() / 2, scene->sceneRect().top());
+    frontState->assignProperty(splash, "y", splash->y() - 100.0);
+    scene->addItem(splash);
+
+    // Setup view
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setMinimumSize(50, 50);
+    setViewportUpdateMode(FullViewportUpdate);
+    setCacheMode(CacheBackground);
+    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform
+                   | QPainter::TextAntialiasing);
+#ifndef QT_NO_OPENGL
+    setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
+#endif
+
+    stateMachine->start();
+}
+
+PadNavigator::~PadNavigator()
+{
+    delete form;
+}
+
+void PadNavigator::resizeEvent(QResizeEvent *event)
+{
+    QGraphicsView::resizeEvent(event);
+    fitInView(scene()->sceneRect(), Qt::KeepAspectRatio);
+}
diff --git a/examples/graphicsview/padnavigator/padnavigator.h b/examples/graphicsview/padnavigator/padnavigator.h
new file mode 100644
index 0000000..c79a13c
--- /dev/null
+++ b/examples/graphicsview/padnavigator/padnavigator.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PADNAVIGATOR_H
+#define PADNAVIGATOR_H
+
+#include 
+
+class QState;
+class QStateMachine;
+class Ui_Form;
+
+class PadNavigator : public QGraphicsView
+{
+    Q_OBJECT
+public:
+    explicit PadNavigator(const QSize &size, QWidget *parent = 0);
+    ~PadNavigator();
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+
+private:
+    Ui_Form *form;
+};
+
+#endif // PADNAVIGATOR_H
diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro
index d6f536c..93ea293 100644
--- a/examples/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/graphicsview/padnavigator/padnavigator.pro
@@ -1,19 +1,20 @@
-HEADERS += \
-        panel.h \
-        roundrectitem.h \
-        splashitem.h
+SOURCES += main.cpp \
+    roundrectitem.cpp \
+    flippablepad.cpp \
+    padnavigator.cpp \
+    splashitem.cpp
 
-SOURCES += \
-        panel.cpp \
-        roundrectitem.cpp \
-        splashitem.cpp \
-        main.cpp
+HEADERS += \
+    roundrectitem.h \
+    flippablepad.h \
+    padnavigator.h \
+    splashitem.h
 
 RESOURCES += \
-        padnavigator.qrc
+    padnavigator.qrc
 
 FORMS += \
-        backside.ui
+    form.ui
 
 contains(QT_CONFIG, opengl):QT += opengl
 
diff --git a/examples/graphicsview/padnavigator/panel.cpp b/examples/graphicsview/padnavigator/panel.cpp
deleted file mode 100644
index c4a5cd9..0000000
--- a/examples/graphicsview/padnavigator/panel.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "panel.h"
-#include "roundrectitem.h"
-#include "splashitem.h"
-#include "ui_backside.h"
-
-#ifndef QT_NO_OPENGL
-#include 
-#else
-#endif
-#include 
-
-#include 
-
-Panel::Panel(int width, int height)
-    : selectedX(0),
-      selectedY(0),
-      width(width),
-      height(height),
-      flipped(false),
-      flipLeft(true)
-{
-    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    setCacheMode(CacheBackground);
-    setViewportUpdateMode(FullViewportUpdate);
-    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform
-                   | QPainter::TextAntialiasing);
-    setBackgroundBrush(QPixmap(":/images/blue_angle_swirl.jpg"));
-#ifndef QT_NO_OPENGL
-    setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
-#endif
-    setMinimumSize(50, 50);
-
-    selectionTimeLine = new QTimeLine(150, this);
-    flipTimeLine = new QTimeLine(500, this);
-
-    QRectF bounds((-width / 2.0) * 150, (-height / 2.0) * 150, width * 150, height * 150);
-
-    scene = new QGraphicsScene(bounds, this);
-    scene->setItemIndexMethod(QGraphicsScene::NoIndex);
-    setScene(scene);
-
-    baseItem = new RoundRectItem(bounds, QColor(226, 255, 92, 64));
-    scene->addItem(baseItem);
-
-    QWidget *embed = new QWidget;
-    ui = new Ui_BackSide;
-    ui->setupUi(embed);
-    ui->hostName->setFocus();
-
-    backItem = new RoundRectItem(bounds, embed->palette().window(), embed);
-    backItem->setTransform(QTransform().rotate(180, Qt::YAxis));
-    backItem->setParentItem(baseItem);
-        
-    selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120), Qt::gray);
-    selectionItem->setParentItem(baseItem);
-    selectionItem->setZValue(-1);
-    selectionItem->setPos(posForLocation(0, 0));
-    startPos = selectionItem->pos();
-
-    grid = new QGraphicsItem **[height];
-        
-    for (int y = 0; y < height; ++y) {
-        grid[y] = new QGraphicsItem *[width];
-
-        for (int x = 0; x < width; ++x) {
-            RoundRectItem *item = new RoundRectItem(QRectF(-54, -54, 108, 108),
-                                                    QColor(214, 240, 110, 128));
-            item->setPos(posForLocation(x, y));
-                
-            item->setParentItem(baseItem);
-            item->setFlag(QGraphicsItem::ItemIsFocusable);
-            grid[y][x] = item;
-
-            switch (qrand() % 9) {
-            case 0: item->setPixmap(QPixmap(":/images/kontact_contacts.png")); break;
-            case 1: item->setPixmap(QPixmap(":/images/kontact_journal.png")); break;
-            case 2: item->setPixmap(QPixmap(":/images/kontact_notes.png")); break;
-            case 3: item->setPixmap(QPixmap(":/images/kopeteavailable.png")); break;
-            case 4: item->setPixmap(QPixmap(":/images/metacontact_online.png")); break;
-            case 5: item->setPixmap(QPixmap(":/images/minitools.png")); break;
-            case 6: item->setPixmap(QPixmap(":/images/kontact_journal.png")); break;
-            case 7: item->setPixmap(QPixmap(":/images/kontact_contacts.png")); break;
-            case 8: item->setPixmap(QPixmap(":/images/kopeteavailable.png")); break;
-            default:
-                break;
-            }
-
-            connect(item, SIGNAL(activated()), this, SLOT(flip()));
-        }
-    }
-
-    grid[0][0]->setFocus();
-
-    connect(backItem, SIGNAL(activated()),
-            this, SLOT(flip()));
-    connect(selectionTimeLine, SIGNAL(valueChanged(qreal)),
-            this, SLOT(updateSelectionStep(qreal)));
-    connect(flipTimeLine, SIGNAL(valueChanged(qreal)),
-            this, SLOT(updateFlipStep(qreal)));
-
-    splash = new SplashItem;
-    splash->setZValue(5);
-    splash->setPos(-splash->rect().width() / 2, scene->sceneRect().top());
-    scene->addItem(splash);
-
-    splash->grabKeyboard();
-    
-    updateSelectionStep(0);
-
-    setWindowTitle(tr("Pad Navigator Example"));
-}
-
-Panel::~Panel()
-{
-    for (int y = 0; y < height; ++y)
-        delete [] grid[y];
-    delete [] grid;
-}
-    
-void Panel::keyPressEvent(QKeyEvent *event)
-{
-    if (splash->isVisible() || event->key() == Qt::Key_Return || flipped) {
-        QGraphicsView::keyPressEvent(event);
-        return;
-    }
-
-    selectedX = (selectedX + width + (event->key() == Qt::Key_Right) - (event->key() == Qt::Key_Left)) % width;
-    selectedY = (selectedY + height + (event->key() == Qt::Key_Down) - (event->key() == Qt::Key_Up)) % height;
-    grid[selectedY][selectedX]->setFocus();
-    
-    selectionTimeLine->stop();
-    startPos = selectionItem->pos();
-    endPos = posForLocation(selectedX, selectedY);
-    selectionTimeLine->start();
-}
-
-void Panel::resizeEvent(QResizeEvent *event)
-{
-    QGraphicsView::resizeEvent(event);
-    fitInView(scene->sceneRect(), Qt::KeepAspectRatio);
-}
-
-void Panel::updateSelectionStep(qreal val)
-{
-    QPointF newPos(startPos.x() + (endPos - startPos).x() * val,
-                   startPos.y() + (endPos - startPos).y() * val);
-    selectionItem->setPos(newPos);
-    
-    QTransform transform;
-    yrot = newPos.x() / 6.0;
-    xrot = newPos.y() / 6.0;
-    transform.rotate(newPos.x() / 6.0, Qt::YAxis);
-    transform.rotate(newPos.y() / 6.0, Qt::XAxis);
-    baseItem->setTransform(transform);
-}
-
-void Panel::updateFlipStep(qreal val)
-{
-    qreal finalxrot = xrot - xrot * val;
-    qreal finalyrot;
-    if (flipLeft)
-        finalyrot = yrot - yrot * val - 180 * val;
-    else
-        finalyrot = yrot - yrot * val + 180 * val;
-    QTransform transform;
-    transform.rotate(finalyrot, Qt::YAxis);
-    transform.rotate(finalxrot, Qt::XAxis);
-    qreal scale = 1 - sin(3.14 * val) * 0.3;
-    transform.scale(scale, scale);
-    baseItem->setTransform(transform);
-    if (val == 0)
-        grid[selectedY][selectedX]->setFocus();
-}
-
-void Panel::flip()
-{
-    if (flipTimeLine->state() == QTimeLine::Running)
-        return;
-
-    if (flipTimeLine->currentValue() == 0) {
-        flipTimeLine->setDirection(QTimeLine::Forward);
-        flipTimeLine->start();
-        flipped = true;
-        flipLeft = selectionItem->pos().x() < 0;
-    } else {
-        flipTimeLine->setDirection(QTimeLine::Backward);
-        flipTimeLine->start();
-        flipped = false;
-    }
-}
-
-QPointF Panel::posForLocation(int x, int y) const
-{
-    return QPointF(x * 150, y * 150)
-        - QPointF((width - 1) * 75, (height - 1) * 75);
-}
diff --git a/examples/graphicsview/padnavigator/panel.h b/examples/graphicsview/padnavigator/panel.h
deleted file mode 100644
index 908092b..0000000
--- a/examples/graphicsview/padnavigator/panel.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-
-QT_BEGIN_NAMESPACE
-class QTimeLine;
-class Ui_BackSide;
-QT_END_NAMESPACE
-
-class RoundRectItem;
-
-class Panel : public QGraphicsView
-{
-    Q_OBJECT
-public:
-    Panel(int width, int height);
-    ~Panel();
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-    void resizeEvent(QResizeEvent *event);
-
-private Q_SLOTS:
-    void updateSelectionStep(qreal val);
-    void updateFlipStep(qreal val);
-    void flip();
-
-private:
-    QPointF posForLocation(int x, int y) const;
-
-    QGraphicsScene *scene;
-    RoundRectItem *selectionItem;
-    RoundRectItem *baseItem;
-    RoundRectItem *backItem;
-    QGraphicsWidget *splash;
-    QTimeLine *selectionTimeLine;
-    QTimeLine *flipTimeLine;
-    int selectedX, selectedY;
-
-    QGraphicsItem ***grid;
-    
-    QPointF startPos;
-    QPointF endPos;
-    qreal xrot, yrot;
-    qreal xrot2, yrot2;
-
-    int width;
-    int height;
-    bool flipped;
-    bool flipLeft;
-
-    Ui_BackSide *ui;
-};
diff --git a/examples/graphicsview/padnavigator/roundrectitem.cpp b/examples/graphicsview/padnavigator/roundrectitem.cpp
index d53eea4..2141e9a 100644
--- a/examples/graphicsview/padnavigator/roundrectitem.cpp
+++ b/examples/graphicsview/padnavigator/roundrectitem.cpp
@@ -43,122 +43,61 @@
 
 #include 
 
-RoundRectItem::RoundRectItem(const QRectF &rect, const QBrush &brush, QWidget *embeddedWidget)
-    : QGraphicsRectItem(rect),
-      brush(brush),
-      timeLine(75),
-      lastVal(0),
-      opa(1),
-      proxyWidget(0)
+RoundRectItem::RoundRectItem(const QRectF &bounds, const QColor &color,
+                             QGraphicsItem *parent)
+    : QGraphicsObject(parent), fillRect(false), color(color), bounds(bounds)
 {
-    connect(&timeLine, SIGNAL(valueChanged(qreal)),
-            this, SLOT(updateValue(qreal)));
-    
-    if (embeddedWidget) {
-        proxyWidget = new QGraphicsProxyWidget(this);
-        proxyWidget->setFocusPolicy(Qt::StrongFocus);
-        proxyWidget->setWidget(embeddedWidget);
-        proxyWidget->setGeometry(boundingRect().adjusted(25, 25, -25, -25));
-    }
-}
+    gradient.setStart(bounds.topLeft());
+    gradient.setFinalStop(bounds.bottomRight());
+    gradient.setColorAt(0, color);
+    gradient.setColorAt(1, color.dark(200));
 
-void RoundRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-{
-    QTransform x = painter->worldTransform();
-
-    QLineF unit = x.map(QLineF(0, 0, 1, 1));
-    if (unit.p1().x() > unit.p2().x() || unit.p1().y() > unit.p2().y()) {
-        if (proxyWidget && proxyWidget->isVisible()) {
-            proxyWidget->hide();
-            proxyWidget->setGeometry(rect());
-        }
-        return;
-    }
-
-    if (proxyWidget && !proxyWidget->isVisible()) {
-        proxyWidget->show();
-        proxyWidget->setFocus();
-    }
-    if (proxyWidget && proxyWidget->pos() != QPoint())
-        proxyWidget->setGeometry(boundingRect().adjusted(25, 25, -25, -25));
-
-    painter->setOpacity(opacity());
-    painter->setPen(Qt::NoPen);
-    painter->setBrush(QColor(0, 0, 0, 64));
-    painter->drawRoundRect(rect().translated(2, 2));
-
-    if (!proxyWidget) {
-        QLinearGradient gradient(rect().topLeft(), rect().bottomRight());
-        const QColor col = brush.color();
-        gradient.setColorAt(0, col);
-        gradient.setColorAt(1, col.dark(int(200 + lastVal * 50)));
-        painter->setBrush(gradient);
-    } else {
-        painter->setBrush(brush);
-    }
-
-    painter->setPen(QPen(Qt::black, 1));
-    painter->drawRoundRect(rect());
-    if (!pix.isNull()) {
-        painter->scale(1.95, 1.95);
-        painter->drawPixmap(-pix.width() / 2, -pix.height() / 2, pix);;
-    }
+    setCacheMode(ItemCoordinateCache);
 }
 
-QRectF RoundRectItem::boundingRect() const
+QPixmap RoundRectItem::pixmap() const
 {
-    qreal penW = 0.5;
-    qreal shadowW = 2.0;
-    return rect().adjusted(-penW, -penW, penW + shadowW, penW + shadowW);
+    return pix;
 }
 
 void RoundRectItem::setPixmap(const QPixmap &pixmap)
 {
     pix = pixmap;
-    if (scene() && isVisible())
-        update();
-}
-
-qreal RoundRectItem::opacity() const
-{
-    RoundRectItem *parent = parentItem() ? (RoundRectItem *)parentItem() : 0;
-    return opa + (parent ? parent->opacity() : 0);
+    update();
 }
 
-void RoundRectItem::setOpacity(qreal opacity)
+QRectF RoundRectItem::boundingRect() const
 {
-    opa = opacity;
-    update();
+    return bounds.adjusted(0, 0, 2, 2);
 }
 
-void RoundRectItem::keyPressEvent(QKeyEvent *event)
+void RoundRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                          QWidget *widget)
 {
-    if (event->isAutoRepeat() || event->key() != Qt::Key_Return
-        || (timeLine.state() == QTimeLine::Running && timeLine.direction() == QTimeLine::Forward)) {
-        QGraphicsRectItem::keyPressEvent(event);
-        return;
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(QColor(0, 0, 0, 64));
+    painter->drawRoundRect(bounds.translated(2, 2));
+    if (fillRect)
+        painter->setBrush(QApplication::palette().brush(QPalette::Window));
+    else
+        painter->setBrush(gradient);
+    painter->setPen(QPen(Qt::black, 1));
+    painter->drawRoundRect(bounds);
+    if (!pix.isNull()) {
+        painter->scale(1.95, 1.95);
+        painter->drawPixmap(-pix.width() / 2, -pix.height() / 2, pix);
     }
-
-    timeLine.stop();
-    timeLine.setDirection(QTimeLine::Forward);
-    timeLine.start();
-    emit activated();
 }
 
-void RoundRectItem::keyReleaseEvent(QKeyEvent *event)
+bool RoundRectItem::fill() const
 {
-    if (event->key() != Qt::Key_Return) {
-        QGraphicsRectItem::keyReleaseEvent(event);
-        return;
-    }
-    timeLine.stop();
-    timeLine.setDirection(QTimeLine::Backward);
-    timeLine.start();
+    return fillRect;
 }
 
-void RoundRectItem::updateValue(qreal value)
+void RoundRectItem::setFill(bool fill)
 {
-    lastVal = value;
-    if (!proxyWidget)
-        setTransform(QTransform().scale(1 - value / 10.0, 1 - value / 10.0));
+    fillRect = fill;
+    update();
 }
diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h
index 683c09f..ae5fb4c 100644
--- a/examples/graphicsview/padnavigator/roundrectitem.h
+++ b/examples/graphicsview/padnavigator/roundrectitem.h
@@ -39,45 +39,35 @@
 **
 ****************************************************************************/
 
-#include 
-#include 
-#include 
-#include 
+#ifndef ROUNDRECTITEM_H
+#define ROUNDRECTITEM_H
 
-QT_BEGIN_NAMESPACE
-class QGraphicsProxyWidget;
-QT_END_NAMESPACE
+#include 
+#include 
 
-class RoundRectItem : public QObject, public QGraphicsRectItem
+class RoundRectItem : public QGraphicsObject
 {
     Q_OBJECT
+    Q_PROPERTY(bool fill READ fill WRITE setFill)
 public:
-    RoundRectItem(const QRectF &rect, const QBrush &brush, QWidget *embeddedWidget = 0);
-
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *);
-    QRectF boundingRect() const;
+    RoundRectItem(const QRectF &bounds, const QColor &color,
+                  QGraphicsItem *parent = 0);
 
+    QPixmap pixmap() const;
     void setPixmap(const QPixmap &pixmap);
 
-    qreal opacity() const;
-    void setOpacity(qreal opacity);
-
-Q_SIGNALS:
-    void activated();
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *event);
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
-private slots:
-    void updateValue(qreal value);
+    bool fill() const;
+    void setFill(bool fill);
 
 private:
-    QBrush brush;
     QPixmap pix;
-    QTimeLine timeLine;
-    qreal lastVal;
-    qreal opa;
-
-    QGraphicsProxyWidget *proxyWidget;
+    bool fillRect;
+    QColor color;
+    QRectF bounds;
+    QLinearGradient gradient;
 };
+
+#endif // ROUNDRECTITEM_H
diff --git a/examples/graphicsview/padnavigator/splashitem.cpp b/examples/graphicsview/padnavigator/splashitem.cpp
index b5b03d4..e609656 100644
--- a/examples/graphicsview/padnavigator/splashitem.cpp
+++ b/examples/graphicsview/padnavigator/splashitem.cpp
@@ -43,31 +43,31 @@
 
 #include 
 
-SplashItem::SplashItem(QGraphicsItem *parent)
-    : QGraphicsWidget(parent)
+SplashItem::SplashItem(QGraphicsItem *parent) :
+    QGraphicsObject(parent)
 {
-    opacity = 1.0;
-
-    
-    timeLine = new QTimeLine(350);
-    timeLine->setCurveShape(QTimeLine::EaseInCurve);
-    connect(timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(setValue(qreal)));
-
     text = tr("Welcome to the Pad Navigator Example. You can use the"
               " keyboard arrows to navigate the icons, and press enter"
-              " to activate an item. Please press any key to continue.");
-    resize(400, 175);
+              " to activate an item. Press any key to begin.");
+    setCacheMode(DeviceCoordinateCache);
+}
+
+QRectF SplashItem::boundingRect() const
+{
+    return QRectF(0, 0, 400, 175);
 }
 
-void SplashItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+void SplashItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                       QWidget *widget)
 {
-    painter->setOpacity(opacity);
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
     painter->setPen(QPen(Qt::black, 2));
     painter->setBrush(QColor(245, 245, 255, 220));
-    painter->setClipRect(rect());
+    painter->setClipRect(boundingRect());
     painter->drawRoundRect(3, -100 + 3, 400 - 6, 250 - 6);
 
-    QRectF textRect = rect().adjusted(10, 10, -10, -10);
+    QRectF textRect = boundingRect().adjusted(10, 10, -10, -10);
     int flags = Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap;
 
     QFont font;
@@ -76,17 +76,3 @@ void SplashItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWid
     painter->setFont(font);
     painter->drawText(textRect, flags, text);
 }
-
-void SplashItem::keyPressEvent(QKeyEvent * /* event */)
-{
-    if (timeLine->state() == QTimeLine::NotRunning)
-        timeLine->start();
-}
-
-void SplashItem::setValue(qreal value)
-{
-    opacity = 1 - value;
-    setPos(x(), scene()->sceneRect().top() - rect().height() * value);
-    if (value == 1)
-        hide();
-}
diff --git a/examples/graphicsview/padnavigator/splashitem.h b/examples/graphicsview/padnavigator/splashitem.h
index 7a33bee..9d57653 100644
--- a/examples/graphicsview/padnavigator/splashitem.h
+++ b/examples/graphicsview/padnavigator/splashitem.h
@@ -39,25 +39,22 @@
 **
 ****************************************************************************/
 
-#include 
-#include 
-#include 
+#ifndef SPLASHITEM_H
+#define SPLASHITEM_H
 
-class SplashItem : public QGraphicsWidget
+#include 
+
+class SplashItem : public QGraphicsObject
 {
     Q_OBJECT
 public:
-    SplashItem(QGraphicsItem *parent = 0);
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-
-protected:
-    void keyPressEvent(QKeyEvent *event);
+    explicit SplashItem(QGraphicsItem *parent = 0);
 
-private Q_SLOTS:
-    void setValue(qreal value);
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 
 private:
-    QTimeLine *timeLine;
     QString text;
-    qreal opacity;
 };
+
+#endif // SPLASHITEM_H
-- 
cgit v0.12


From 812f78e55aa3db4d51ec8617320358d80c4a71d5 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen 
Date: Wed, 12 May 2010 16:32:12 +0200
Subject: Documentation for the Pad Navigator Example.

This also does a few touch-ups on the source code.
---
 doc/src/examples/padnavigator.qdoc                 | 552 ++++++++++++++++++++-
 doc/src/getting-started/examples.qdoc              |   1 +
 .../graphicsview/padnavigator/flippablepad.cpp     |  27 +-
 examples/graphicsview/padnavigator/flippablepad.h  |   5 +-
 examples/graphicsview/padnavigator/main.cpp        |   2 +
 .../graphicsview/padnavigator/padnavigator.cpp     | 218 ++++----
 examples/graphicsview/padnavigator/padnavigator.h  |   6 +-
 .../graphicsview/padnavigator/roundrectitem.cpp    |  19 +-
 examples/graphicsview/padnavigator/roundrectitem.h |   5 +-
 examples/graphicsview/padnavigator/splashitem.cpp  |  10 +-
 examples/graphicsview/padnavigator/splashitem.h    |   2 +
 11 files changed, 736 insertions(+), 111 deletions(-)

diff --git a/doc/src/examples/padnavigator.qdoc b/doc/src/examples/padnavigator.qdoc
index 70e131e..e29a3b2 100644
--- a/doc/src/examples/padnavigator.qdoc
+++ b/doc/src/examples/padnavigator.qdoc
@@ -43,9 +43,555 @@
     \example graphicsview/padnavigator
     \title Pad Navigator Example
 
-    The Pad Navigator Example shows how you can use Graphics View
-    together with embedded widgets to create a simple but useful
-    dynamic user interface for embedded devices.
+    The Pad Navigator Example shows how you can use Graphics View together with
+    embedded widgets and Qt's \l{State Machine Framework} to create a simple
+    but useful, dynamic, animated user interface.
 
     \image padnavigator-example.png
+
+    The interface consists of a flippable, rotating pad with icons that can be
+    selected using the arrow keys on your keyboard or keypad. Pressing enter
+    will flip the pad around and reveal its back side, which has a form
+    embedded into a QGraphicsProxyWidget. You can interact with the form, and
+    press the enter key to flip back to the front side of the pad at any time.
+
+    Graphics View provides the QGraphicsScene class for managing and
+    interacting with a large number of custom-made 2D graphical items derived
+    from the QGraphicsItem class, and a QGraphicsView widget for visualizing
+    the items, with support for zooming and rotation.
+
+    This example consists of a \c RoundRectItem class, a \c FlippablePad class,
+    a \c PadNavigator class, a \c SplashItem class, and a \c main() function.
+
+    \section1 RoundRectItem Class Definition
+
+    The \c RoundRectItem class is used by itself to diplay the icons on the
+    pad, and as a base class for \c FlippablePad, the class for the pad itself.
+    The role of the class is to paint a round rectangle of a specified size and
+    gradient color, and optionally to paint a pixmap icon on top. To support \c
+    FlippablePad it also allows filling its contents with a plain window
+    background color.
+
+    Let's start by reviewing the \c RoundRectItem class declaration.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.h 0
+
+    \c RoundRectItem inherits QGraphicsObject, which makes it easy to control
+    its properties using QPropertyAnimation. Its constructor takes a rectangle
+    to determine its bounds, and a color.
+
+    Besides implementing the mandatory \l{QGraphicsItem::paint()}{paint()} and
+    \l{QGraphicsItem::boundingRect()}{boundingRect()} pure virtual functions,
+    it also provides the \c pixmap and \c fill properties.
+
+    The \c pixmap property sets an optional pixmap that is drawn on top of the
+    round rectangle. The \c fill property will, when true, fill the round
+    rectangle contents with a fixed QPalette::Window background color.
+    Otherwise the contents are filled using a gradient based on the color
+    passed to \c RoundRectItem's constructor.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.h 1
+
+    The private data members are:
+
+    \list
+    \o \c pix: The optional pixmap that is drawn on top of the rectangle.
+    \o \c fillRect: Corresponds to the \c fill property.
+    \o \c color: The configurable gradient color fill of the rectangle.
+    \o \c bounds: The bounds of the rectangle.
+    \o \c gradient: A precalculated gradient used to fill the rectangle.
+    \endlist
+
+    We will now review the \c RoundRectItem implementation. Let's start by
+    looking at its constructor:
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 0
+
+    The constructor initializes its member variables and forwards the \c parent
+    argument to QGraphicsObject's constructor. It then constructs the linear
+    gradient that is used in \l{QGraphicsItem::paint()}{paint()} to draw the
+    round rectangle's gradient background. The linear gradient's starting point
+    is at the top-left corner of the bounds, and the end is at the bottom-left
+    corner. The start color is identical to the color passed as an argument,
+    and a slightly darker color is chosen for the final stop.
+
+    We store this gradient as a member variable to avoid having to recreate the
+    gradient every time the item is repainted.
+
+    Finally we set the cache mode
+    \l{QGraphicsItem::ItemCoordinateCache}{ItemCoordinateCache}. This mode
+    causes the item's rendering to be cached into an off-screen pixmap that
+    remains persistent as we move and transform the item. This mode is ideal
+    for this example, and works particularily well with OpenGL and OpenGL ES.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 1
+
+    The \c pixmap property implementation simple returns the member pixmap, or
+    sets it and then calls \l{QGraphicsItem::update()}{update()}.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 2
+
+    As the \l{QGraphicsItem::paint()}{paint()} implementation below draws a
+    simple drop shadow down and to the right of the item, we return a slightly
+    adjusted rectangle from \l{QGraphicsItem::boundingRect()}{boundingRect()}.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 3
+
+    The \l{QGraphicsItem::paint()}{paint()} implementation starts by rendering
+    a semi transparent black round rectangle drop shadow, two units down and to
+    the right of the main item.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 4
+
+    We then draw the "foreground" round rectangle itself. The fill depends on
+    the \c fill property; if true, we will with a plain QPalette::Window color.
+    We get the corrent brush from QApplication::palette(). We assign a single
+    unit wide pen for the stroke, assign the brush, and then draw the
+    rectangle.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 5
+
+    If a pixmap has been assigned to the \e pixmap property, we draw this
+    pixmap in the center of the rectangle item. The pixmaps are scaled to match
+    the size of the icons; in arguably a better approach would have been to
+    store the icons with the right size in the first places.
+
+    \snippet examples/graphicsview/padnavigator/roundrectitem.cpp 6
+
+    Finally, for completeness we include the \c fill property implementation.
+    It returns the \c fill member variable's value, and when assigned to, it
+    calls \l{QGraphicsItem::update()}{update()}.
+
+    As mentioned already, \c RoundRectItem is the base class for \c
+    FlippablePad, which is the class representing the tilting pad itself. We
+    will proceed to reviewing \c FlippablePad.
+
+    \section1 FlippablePad Class Definition
+
+    \c FlippablePad is, in addition to its inherited \c RoundRectItem
+    responsibilities, responsible for creating and managing a grid of icons.
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.h 0
+
+    Its declaration is very simple: It inherits \c RoundRectItem and does not
+    need any special polymorphic behavior. It's suitable to declare its own
+    constructor, and a getter-function that allows \c PadNavigator to access
+    the icons in the grid by (row, column).
+
+    The example has no "real" behavior or logic of any kind, and because of
+    that, the icons do not need to provide any \e behavior or special
+    interactions management. In a real application, however, it would be
+    natural for the \c FlippablePad and its icons to handle more of the
+    navigation logic. In this example, we have chosen to leave this to
+    the \c PadNavigator class, which we will get back to below.
+
+    We will now review the \c FlippablePad implementation. This implementation
+    starts with two helper functions: \c boundsFromSize() and \c
+    posForLocation():
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.cpp 0
+
+    \c boundsForSize() takes a QSize argument, and returns the bounding
+    rectangle of the flippable pad item. The QSize determines how many rows and
+    columns the icon grid should have. Each icon is given 150x150 units of
+    space, and this determines the bounds.
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.cpp 1
+
+    \c posForLocation() returns the position of an icon given its row and
+    column position. Like \c boundsForSize(), the function assumes each icon is
+    given 150x150 units of space, and that all icons are centered around the
+    flippable pad item's origin (0, 0).
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.cpp 2
+
+    The \c FlippablePad constructor passes suitable bounds (using \c
+    boundsForSize()) and specific color to \c RoundRectItem's constructor.
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.cpp 3
+
+    It then loads pixmaps from compiled-in resources to use for its icons.
+    QDirIterator is very useful in this context, as it allows us to fetch all
+    resource "*.png" files inside the \c :/images directory without explicitly
+    naming the files.
+
+    We also make sure not to load more pixmaps than we need.
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.cpp 4
+
+    Now that we have the pixmaps, we can create icons, position then and assign
+    pixmaps. We start by finding a suitable size and color for the icons, and
+    initializing a convenient grid structure for storing the icons. This \c
+    iconGrid is also used later to find the icon for a specific (column, row)
+    location.
+
+    For each row and column in our grid, we proceed to constructing each icon
+    as an instance of \c RoundRectItem. The item is placed by using the \c
+    posForLocation() helper function. To make room for the slip-behind
+    selection item, we give each icon a \l{QGraphicsItem::zValue()}{Z-value} of
+    1. The pixmaps are distributed to the icons in round-robin fasion.
+
+    Again, this approach is only suitable for example purposes. In a real-life
+    application where each icon represents a specific action, it would be more
+    natural to assign the pixmaps directly, or that the icons themselves
+    provide suitable pixmaps.
+
+    \snippet examples/graphicsview/padnavigator/flippablepad.cpp 5
+
+    Finally, the \c iconAt() function returns a pointer to the icon at a
+    specific row and column. It makes a somewhat bold assumption that the input
+    is valid, which is fair because the \c PadNavigator class only calls this
+    function with correct input.
+
+    We will now review the \c SplashItem class.
+
+    \section1 SplashItem Class Definition
+
+    The \c SplashItem class represents the "splash window", a semitransparent
+    white overlay with text that appears immediately after the application has
+    started, and disappears after pressing any key. The animation is controlled
+    by \c PadNavigator; this class is very simple by itself.
+
+    \snippet examples/graphicsview/padnavigator/splashitem.h 0
+
+    The class declaration shows that \c SplashItem inherits QGraphicsObject to
+    allow it to be controlled by QPropertyAnimation. It reimplements the
+    mandatory \l{QGraphicsItem::paint()}{paint()} and
+    \l{QGraphicsItem::boundingRect()}{boundingRect()} pure virtual functions,
+    and keeps a \c text member variable which will contain the information text
+    displayed on this splash item.
+
+    Let's look at its implementation.
+
+    \snippet examples/graphicsview/padnavigator/splashitem.cpp 0
+
+    The constructor forwards to QGraphicsObject as expected, assigns a text
+    message to the \c text member variable, and enables
+    \l{QGraphicsItem::DeviceCoordinateCache}{DeviceCoordinateCache}. This cache
+    mode is suitable because the splash item only moves and is never
+    transformed, and because it contains text, it's important that it has a
+    pixel perfect visual appearance (in constrast to
+    \l{QGraphicsItem::ItemCoordinateCache}{ItemCoordinateCache}, where the
+    visual appearance is not as good).
+
+    We use caching to avoid having to relayout and rerender the text for each
+    frame. An alterative approach would be to use the new QStaticText class.
+
+    \snippet examples/graphicsview/padnavigator/splashitem.cpp 1
+
+    \c SplashItem's bounding rectangle is fixed at (400x175).
+
+    \snippet examples/graphicsview/padnavigator/splashitem.cpp 2
+
+    The \l{QGraphicsItem::paint()}{paint()} implementation draws a clipped
+    round rectangle with a thick 2-unit border and a semi-transparent white
+    background. It proceeds to finding a suitable text area by adjusting the
+    splash item's bounding rectangle with 10 units in each side. The text is
+    rendered inside this rectangle, with top-left alignment, and with word
+    wrapping enabled.
+
+    The main class now remains. We will proceed to reviewing \c PadNavigator.
+
+    \section1 PadNavigator Class Definition
+
+    \c PadNavigator represents the main window of our Pad Navigator Example
+    application. It creates and controls a somewhat complex state machine, and
+    several animations. Its class declaration is very simple:
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.h 0
+
+    It inherits QGraphicsView and reimplements only one function:
+    \l{QGraphicsView::resizeEvent()}{resizeEvent()}, to ensure the scene is
+    scaled to fit inside the view when resizing the main window.
+
+    The \c PadNavigator constructor takes a QSize argument that determines the
+    number or rows and columns in the grid.
+
+    It also keeps a private member instance, \c form, which is the generated
+    code for the pad's back side item's QGraphicsProxyWidget-embedded form.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 0
+
+    \c PadNavigator's constructor is a bit long. In short, its job is to create
+    all items, including the \c FlippablePad, the \c SplashItem and the
+    QGraphicsProxyWidget \c backItem, and then to set up all animations, states
+    and transitions that control the behavior of the application.
+
+    It starts out simple, by forwarding to QGraphicsView's constructor.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 1
+
+    The first item to be created is \c SplashItem. This is going to be a top-level
+    item in the scene, next to \c FlippablePad, and stacked on top of it, so we
+    assign it a \l{QGraphicsItem::zValue()}{Z-value} of 1.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 2
+
+    Now we construct the \c FlippablePad item, passing its column-row count to
+    its constructor.
+
+    The pad is constrolled by three transformations, and we create one
+    QGraphicsRotation object for each of these.
+
+    \list
+    \o \c flipRotation: Rotates the grid around its Qt::YAxis. This rotation is
+    animated from 0 to 180, and eventually back, when enter is pressed on the
+    keyboard, flipping the pad around.
+    \o \c xRotation: Rotates the grid around its Qt::XAxis. This is used to
+    tilt the pad vertically corresponding to which item is currently selected.
+    This way, the selected item is always kept in front.
+    \o \c yRotation: Rotates the grid around its Qt::YAxis. This is used to
+    tilt the pad horizontally corresponding to which item is selected. This
+    way, the selected item is always kept in front.
+    \endlist
+
+    The combination of all three rotations is assigned via
+    QGraphicsItem::setTransformations().
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 3
+
+    Now we construct the QGraphicsProxyWidget-embedded \c backItem. The proxy
+    widget is created as a child of the pad. We create a new QWidget and
+    populate it with the \c form member. To ensure the \c hostName line edit is
+    the first to receive input focus when this item is shown, we call
+    \l{QWidget::setFocus()}{setFocus()} immediately. This will not give the
+    widget focus right away; it will only prepare the item to automatically
+    receive focus once it is shown.
+
+    The QWidget based form is embedded into the proxy widget. The proxy is
+    hidden initially; we only want to show it when the pad is rotated at least
+    90 degrees, and we also rotate the proxy itself by 180 degrees. This way we
+    give the impression that the proxy widget is "behind" the flipped pad, when
+    in fact, it's actually \e{on top of it}.
+
+    We enable \l{QGraphicsItem::ItemCoordinateCache}{ItemCoordinateCache} to
+    ensure the flip animation can run smoothly.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 4
+
+    We now create the selection item. This is simply another instance of \c
+    RoundRectItem that is slightly larger than the icons on the pad. We create
+    it as an immediate child of the \c FlippablePad, so the selection item is a
+    sibling to all the icons. By giving it a
+    \l{QGraphicsItem::zValue()}{Z-value} of 0.5 we ensure it will slide beteen
+    the pad and its icons.
+
+    What follows now is a series of animation initializations.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 5
+
+    We begin with the animations that apply to the splash item. The first
+    animation, \c smoothSplashMove, ensures that the "y" property of \c splash
+    will be animated with a 250-millisecond duration
+    \l{QEasingCurve::InQuad}{InQuad} easing function. \c smoothSplashOpacity
+    ensures the opacity of \c splash eases in and out in 250 milliseconds.
+
+    The values are assigned by \c PadNavigator's state machine, which is
+    created later.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 6
+
+    These are the animations that control the selection item's movement and the
+    \c xRotation and \c yRotation QGraphicsRotation objects that tilt the pad.
+    All animations have a duration of 125 milliseconds, and they all use the
+    \l{QEasingCurve::InOutQuad}{InOutQuad} easing function.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 7
+
+    We now create the animations that control the flip-effect when you press
+    the enter key. The main goal is to rotate the pad by 180 degrees or back,
+    but we also need to make sure the selection item's tilt rotations are reset
+    back to 0 when the pad is flipped, and restored back to their original
+    values when flipped back:
+
+    \list
+    \o \c smoothFlipRotation: Animates the main 180 degree rotation of the pad.
+    \o \c smoothFlipScale: Scales the pad out and then in again while the pad is rotating.
+    \o \c smoothFlipXRotation: Animates the selection item's X-tilt to 0 and back.
+    \o \c smoothFlipYRotation: Animates the selection item's Y-tilt to 0 and back.
+    \o \c flipAnimation: A parallel animation group that ensures all the above animations are run in parallel.
+    \endlist
+
+    All animations are given a 500 millisecond duration and an
+    \l{QEasingCurve::InOutQuad}{InOutQuad} easing function.
+
+    It's worth taking a close look at \c smoothFlipScale. This animation's
+    start and end values are both 1.0, but at animation step 0.5 the
+    animation's value is 0.7. This means that after 50% of the animation's
+    duration, or 250 milliseconds, the pad will be scaled down to 0.7x of its
+    original size, which gives a great visual effect while flipping.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 8
+
+    This section uses a trick to ensure that certain properties are assigned
+    precisely when the flip animation passes 50%, or 90 degrees, rotation. In
+    short, the pad's icons and selection item are all hidden, the pad's \c fill
+    property is enabled, and \c backItem is shown when flipping over. When
+    flipping back, the reverse properties are applied.
+
+    The way this is achieved is by running a sequential animation in parallel
+    to the other animations. This sequence, dubbed \c setVariablesSequence,
+    starts with a 250 millisecond pause, and then executes several animations
+    with a duration of 0. Each animation will ensure that properties are set
+    immediate at this point.
+
+    This approach can also be used to call functions or set any other
+    properties at a specific time while an animation is running.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 9
+
+    We will now create the state machine. The whole \c PadNavigator state
+    machinery is controlled by one single state machine that has a
+    straight-forward state structure. The state engine itself is created
+    as a child of the \c PadNavigator itself. We then create three top level
+    states:
+
+    \list
+    \o \c splashState: The initial state where the splash item is visible.
+    \o \c frontState: The base state where the splash is gone and we can see
+    the front side of the pad, and navigate the selection item.
+    \o \c backState: The flipped state where the \c backItem is visible, and we
+    can interact with the QGraphicsProxyWidget-embedded form.
+    \endlist
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 10
+
+    Each state assigns specific properties to objects on entry. Most
+    interesting perhaps is the assignment of the value 0.0 to the pad's \c
+    flipRotation angle property when in \c frontState, and 180.0 when in \c
+    backState. At the end of this section we register default animations with
+    the state engine; these animations will apply to their respective objects
+    and properties for any state transition. Otherwise it's common to assign
+    animations to specific transitions.
+
+    The \c splashState state is set as the initial state. This is required
+    before we start the state engine. We proceed with creating some
+    transitions.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 11
+
+    QEventTransition defines a very flexible transition type. You can use this
+    class to trigger a transition based on an object receiving an event of a
+    specific type. In this case, we would like to transition from \c
+    splashState into \c frontState if \c PadNavigator receives any key press
+    event (QEvent::KeyPress).
+
+    We register the \c splashItem's animations to this transition to ensure they
+    are used to animate the item's movement and opacity.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 12
+
+    We use QKeyEventTransition to capture specific key events. In this case, we
+    detect that the user presses Qt::Key_Return or Qt::Key_Enter, and use this
+    to trigger transitions between \c frontState and backState. We register \c
+    flipAnimation, our complex parallel animation group, with these
+    transitions.
+
+    We continue by defining the states for each of the icons in the grid.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 13
+
+    We will use state groups to control transitions between icons. Each icon
+    represents a \e substate of \c frontState. We will then define transitions
+    between the states by detecting key presses, using QKeyEventTransition.
+
+    We start by creating all the substates, and at the same time we create a
+    temporary grid structure for the states to make it easier to find which
+    states represents icons that are up, down, left and to the right each
+    other.
+
+    Once the first substate is known, we set this up as the initial substate of
+    \c frontState. We will use the (0, 0), or top-left, icon for the initial
+    substate. We initialze the selection item's position to be exactly where
+    the top-left icon is.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 14
+
+    We can now create four transitions for each icon. Each transition ensures
+    that we move to the state corresponding to which arrow key has been
+    pressed. It's clear from this techinique that we could design any other
+    specific transitions to and from each of the sub states depending on these
+    and other keys.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 15
+
+    Also, for each of the icons, we assign suitable values to the \c xRotation
+    and \c yRotation objects' "angle"-properties. If you recall, these
+    properties "tilt" the pad corresponding to which item is currently
+    selected. We ensure each icon is invisible when the pad is flipped, and
+    visible when the pad is not flipped. To ensure the visible property is
+    assigned at the right time, we add property-controlling animations to the
+    \c setVariableSequence animation defined earlier.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 16
+
+    We are now finished with all states, transitions, and animations. We now
+    create the scene that will contain all our items. The scene gets a defined
+    background pixmap, and we disable item indexing (as most items in this
+    scene are animated). We add our \c pad item to the scene, and use its
+    bounding rectangle to fixate the scene rectangle. This rectangle is used by
+    the view to find a suitable size for the application window.
+
+    Then the scene is assigned to the view, or in our case, \c PadNavigator
+    itself.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 17
+
+    Now that the scene has received its final size, we can position the splash
+    item at the very top, find its fade-out position, and add it to the scene.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 18
+
+    The view toggles a few necessary properties:
+
+    \list
+    \o It disables its scroll bars - this application has no use for scroll bars.
+    \o It assigns a minimum size. This is necessary to avoid numerical errors
+    in our fit-in-view \c resizeEvent() implementation.
+    \o It sets \l{QGraphicsView::FullViewportUpdate}{FullViewportUpdate}, to
+    ensure QGraphicsView doesn't spend time figuring out precisely what needs
+    to be redrawn. This application is very simple - if anything changes,
+    everything is updated.
+    \o It enables background caching - this makes no performance difference
+    with OpenGL, but without OpenGL it avoids unnecessary re-scaling of the
+    background pixmap.
+    \o It sets render hints that increase rendering quality.
+    \o If OpenGL is supported, a QGLWidget viewport is assigned to the view.
+    \endlist
+
+    Finally, we start the state engine.
+
+    \snippet examples/graphicsview/padnavigator/padnavigator.cpp 19
+
+    The \l{QGraphicsView::resizeEvent()}{resizeEvent()} implementation calls
+    the base implementation, and then calls QGraphicsView::fitInView() to scale
+    the scene so that it fits perfectly inside the view.
+
+    By resizing the main application window, you can see this effect yourself.
+    The scene contents grow when you make the window larger, and shrink when
+    you make it smaller, while keeping the aspect ratio intact.
+
+    \section1 The main() Function
+
+    \snippet examples/graphicsview/padnavigator/main.cpp 0
+
+    The \c main function creates the QApplication instance, uses
+    Q_INIT_RESOURCE to ensure our compiled-in resources aren't removed by the
+    linker, and then creates a 3x3 \c PadNavigator instance and shows it.
+
+    Our flippable pad shows up with a suitable splash item once control returns
+    to the event loop.
+
+    \section1 Performance Notes
+
+    The example uses OpenGL if this is available, to achieve optimal
+    performance; otherwise perspective tranformations can be quite costly.
+
+    Although this example does use QGraphicsProxyWidget to demonstrate
+    integration of Qt widget components integrated into Graphics View, using
+    QGraphicsProxyWidget comes with a performance penalty, and is therefore not
+    recommended for embedded development.
+
+    This example uses extensive item caching to avoid rerendering of static
+    elements, at the expense of graphics memory.
 */
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 542f672..f511cd6 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -651,6 +651,7 @@
     \o \l{graphicsview/diagramscene}{Diagram Scene}\raisedaster
     \o \l{graphicsview/dragdroprobot}{Drag and Drop Robot}\raisedaster
     \o \l{graphicsview/elasticnodes}{Elastic Nodes}\raisedaster
+    \o \l{graphicsview/padnavigator}{Pad Navigator}\raisedaster
     \o \l{graphicsview/portedasteroids}{Ported Asteroids}
     \o \l{graphicsview/portedcanvas}{Ported Canvas}
     \endlist
diff --git a/examples/graphicsview/padnavigator/flippablepad.cpp b/examples/graphicsview/padnavigator/flippablepad.cpp
index 61f421f..58aea00 100644
--- a/examples/graphicsview/padnavigator/flippablepad.cpp
+++ b/examples/graphicsview/padnavigator/flippablepad.cpp
@@ -43,37 +43,43 @@
 
 #include 
 
+//! [0]
 static QRectF boundsFromSize(const QSize &size)
 {
     return QRectF((-size.width() / 2.0) * 150, (-size.height() / 2.0) * 150,
                   size.width() * 150, size.height() * 150);
 }
+//! [0]
 
-static QPointF posForLocation(int x, int y, const QSize &size)
+//! [1]
+static QPointF posForLocation(int column, int row, const QSize &size)
 {
-    return QPointF(x * 150, y * 150)
+    return QPointF(column * 150, row * 150)
         - QPointF((size.width() - 1) * 75, (size.height() - 1) * 75);
 }
+//! [1]
 
+//! [2]
 FlippablePad::FlippablePad(const QSize &size, QGraphicsItem *parent)
     : RoundRectItem(boundsFromSize(size), QColor(226, 255, 92, 64), parent)
 {
-    columns = size.width();
-
+//! [2]
+//! [3]
     int numIcons = size.width() * size.height();
     QList pixmaps;
     QDirIterator it(":/images", QStringList() << "*.png");
     while (it.hasNext() && pixmaps.size() < numIcons)
         pixmaps << it.next();
+//! [3]
 
+//! [4]
     const QRectF iconRect(-54, -54, 108, 108);
     const QColor iconColor(214, 240, 110, 128);
-
     iconGrid.resize(size.height());
-
     int n = 0;
+
     for (int y = 0; y < size.height(); ++y) {
-        iconGrid[y].resize(columns);
+        iconGrid[y].resize(size.width());
         for (int x = 0; x < size.width(); ++x) {
             RoundRectItem *rect = new RoundRectItem(iconRect, iconColor, this);
             rect->setZValue(1);
@@ -83,8 +89,11 @@ FlippablePad::FlippablePad(const QSize &size, QGraphicsItem *parent)
         }
     }
 }
+//! [4]
 
-RoundRectItem *FlippablePad::iconAt(int x, int y) const
+//! [5]
+RoundRectItem *FlippablePad::iconAt(int column, int row) const
 {
-    return iconGrid[y][x];
+    return iconGrid[row][column];
 }
+//! [5]
diff --git a/examples/graphicsview/padnavigator/flippablepad.h b/examples/graphicsview/padnavigator/flippablepad.h
index 9adb18b..7d99536 100644
--- a/examples/graphicsview/padnavigator/flippablepad.h
+++ b/examples/graphicsview/padnavigator/flippablepad.h
@@ -48,16 +48,17 @@
 #include 
 #include 
 
+//! [0]
 class FlippablePad : public RoundRectItem
 {
 public:
     FlippablePad(const QSize &size, QGraphicsItem *parent = 0);
 
-    RoundRectItem *iconAt(int x, int y) const;
+    RoundRectItem *iconAt(int column, int row) const;
 
 private:
-    int columns;
     QVector > iconGrid;
 };
+//! [0]
 
 #endif // FLIPPABLEPAD_H
diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp
index 6d148bb..984b976 100644
--- a/examples/graphicsview/padnavigator/main.cpp
+++ b/examples/graphicsview/padnavigator/main.cpp
@@ -43,6 +43,7 @@
 
 #include 
 
+//! [0]
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
@@ -53,3 +54,4 @@ int main(int argc, char *argv[])
 
     return app.exec();
 }
+//! [0]
diff --git a/examples/graphicsview/padnavigator/padnavigator.cpp b/examples/graphicsview/padnavigator/padnavigator.cpp
index 456b3f4..b1d19f6 100644
--- a/examples/graphicsview/padnavigator/padnavigator.cpp
+++ b/examples/graphicsview/padnavigator/padnavigator.cpp
@@ -42,175 +42,213 @@
 #include "flippablepad.h"
 #include "padnavigator.h"
 #include "splashitem.h"
-#include "ui_form.h"
 
 #include 
 #ifndef QT_NO_OPENGL
 #include 
 #endif
 
+//! [0]
 PadNavigator::PadNavigator(const QSize &size, QWidget *parent)
     : QGraphicsView(parent)
 {
-    // Prepare splash item
+//! [0]
+//! [1]
+    // Splash item
     SplashItem *splash = new SplashItem;
     splash->setZValue(1);
+//! [1]
 
-    // Prepare pad item
+//! [2]
+    // Pad item
     FlippablePad *pad = new FlippablePad(size);
     QGraphicsRotation *flipRotation = new QGraphicsRotation(pad);
-    flipRotation->setAxis(Qt::YAxis);
     QGraphicsRotation *xRotation = new QGraphicsRotation(pad);
-    xRotation->setAxis(Qt::YAxis);
     QGraphicsRotation *yRotation = new QGraphicsRotation(pad);
+    flipRotation->setAxis(Qt::YAxis);
+    xRotation->setAxis(Qt::YAxis);
     yRotation->setAxis(Qt::XAxis);
     pad->setTransformations(QList()
                             << flipRotation
                             << xRotation << yRotation);
+//! [2]
 
-    // Prepare backitem
-    form = new Ui_Form;
-    QWidget *widget = new QWidget;
-    form->setupUi(widget);
-    form->hostName->setFocus();
+//! [3]
+    // Back (proxy widget) item
     QGraphicsProxyWidget *backItem = new QGraphicsProxyWidget(pad);
-    backItem->setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    QWidget *widget = new QWidget;
+    form.setupUi(widget);
+    form.hostName->setFocus();
     backItem->setWidget(widget);
+    backItem->setVisible(false);
+    backItem->setFocus();
+    backItem->setCacheMode(QGraphicsItem::ItemCoordinateCache);
+    const QRectF r = backItem->rect();
     backItem->setTransform(QTransform()
                            .rotate(180, Qt::YAxis)
-                           .translate(-backItem->rect().width()/2, -backItem->rect().height()/2));
-    backItem->setFocus();
-    backItem->setVisible(false);
+                           .translate(-r.width()/2, -r.height()/2));
+//! [3]
 
-    // Prepare selection item
+//! [4]
+    // Selection item
     RoundRectItem *selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120),
                                                      Qt::gray, pad);
     selectionItem->setZValue(0.5);
+//! [4]
 
-    // Selection animation setup
+//! [5]
+    // Splash animations
+    QPropertyAnimation *smoothSplashMove = new QPropertyAnimation(splash, "y");
+    QPropertyAnimation *smoothSplashOpacity = new QPropertyAnimation(splash, "opacity");
+    smoothSplashMove->setEasingCurve(QEasingCurve::InQuad);
+    smoothSplashMove->setDuration(250);
+    smoothSplashOpacity->setDuration(250);
+//! [5]
+
+//! [6]
+    // Selection animation
     QPropertyAnimation *smoothXSelection = new QPropertyAnimation(selectionItem, "x");
-    smoothXSelection->setDuration(125);
-    smoothXSelection->setEasingCurve(QEasingCurve::InOutQuad);
     QPropertyAnimation *smoothYSelection = new QPropertyAnimation(selectionItem, "y");
-    smoothYSelection->setDuration(125);
-    smoothYSelection->setEasingCurve(QEasingCurve::InOutQuad);
     QPropertyAnimation *smoothXRotation = new QPropertyAnimation(xRotation, "angle");
-    smoothXRotation->setDuration(125);
-    smoothXRotation->setEasingCurve(QEasingCurve::InOutQuad);
     QPropertyAnimation *smoothYRotation = new QPropertyAnimation(yRotation, "angle");
+    smoothXSelection->setDuration(125);
+    smoothYSelection->setDuration(125);
+    smoothXRotation->setDuration(125);
     smoothYRotation->setDuration(125);
+    smoothXSelection->setEasingCurve(QEasingCurve::InOutQuad);
+    smoothYSelection->setEasingCurve(QEasingCurve::InOutQuad);
+    smoothXRotation->setEasingCurve(QEasingCurve::InOutQuad);
     smoothYRotation->setEasingCurve(QEasingCurve::InOutQuad);
-    QPropertyAnimation *smoothScale = new QPropertyAnimation(pad, "scale");
-    smoothScale->setDuration(500);
-    smoothScale->setKeyValueAt(0, qVariantValue(1.0));
-    smoothScale->setKeyValueAt(0.5, qVariantValue(0.7));
-    smoothScale->setKeyValueAt(1, qVariantValue(1.0));
-    smoothScale->setEasingCurve(QEasingCurve::InOutQuad);
+//! [6]
 
+//! [7]
     // Flip animation setup
     QPropertyAnimation *smoothFlipRotation = new QPropertyAnimation(flipRotation, "angle");
+    QPropertyAnimation *smoothFlipScale = new QPropertyAnimation(pad, "scale");
+    QPropertyAnimation *smoothFlipXRotation = new QPropertyAnimation(xRotation, "angle");
+    QPropertyAnimation *smoothFlipYRotation = new QPropertyAnimation(yRotation, "angle");
+    QParallelAnimationGroup *flipAnimation = new QParallelAnimationGroup(this);
+    smoothFlipScale->setDuration(500);
     smoothFlipRotation->setDuration(500);
+    smoothFlipXRotation->setDuration(500);
+    smoothFlipYRotation->setDuration(500);
+    smoothFlipScale->setEasingCurve(QEasingCurve::InOutQuad);
     smoothFlipRotation->setEasingCurve(QEasingCurve::InOutQuad);
-    QPropertyAnimation *flipSmoothXRotation = new QPropertyAnimation(xRotation, "angle");
-    flipSmoothXRotation->setDuration(500);
-    flipSmoothXRotation->setEasingCurve(QEasingCurve::InOutQuad);
-    QPropertyAnimation *flipSmoothYRotation = new QPropertyAnimation(yRotation, "angle");
-    flipSmoothYRotation->setDuration(500);
-    flipSmoothYRotation->setEasingCurve(QEasingCurve::InOutQuad);
-    QPropertyAnimation *setBackItemVisibleAnim = new QPropertyAnimation(backItem, "visible");
-    setBackItemVisibleAnim->setDuration(0);
-    QPropertyAnimation *setSelectionItemVisibleAnim = new QPropertyAnimation(selectionItem, "visible");
-    setSelectionItemVisibleAnim->setDuration(0);
-    QPropertyAnimation *setFillAnim = new QPropertyAnimation(pad, "fill");
-    setFillAnim->setDuration(0);
-    QSequentialAnimationGroup *setVisibleAnimation = new QSequentialAnimationGroup;
-    setVisibleAnimation->addPause(250);
-    setVisibleAnimation->addAnimation(setBackItemVisibleAnim);
-    setVisibleAnimation->addAnimation(setSelectionItemVisibleAnim);
-    setVisibleAnimation->addAnimation(setFillAnim);
-    QParallelAnimationGroup *flipAnimation = new QParallelAnimationGroup(this);
+    smoothFlipXRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    smoothFlipYRotation->setEasingCurve(QEasingCurve::InOutQuad);
+    smoothFlipScale->setKeyValueAt(0, qVariantValue(1.0));
+    smoothFlipScale->setKeyValueAt(0.5, qVariantValue(0.7));
+    smoothFlipScale->setKeyValueAt(1, qVariantValue(1.0));
     flipAnimation->addAnimation(smoothFlipRotation);
-    flipAnimation->addAnimation(smoothScale);
-    flipAnimation->addAnimation(flipSmoothXRotation);
-    flipAnimation->addAnimation(flipSmoothYRotation);
-    flipAnimation->addAnimation(setVisibleAnimation);
+    flipAnimation->addAnimation(smoothFlipScale);
+    flipAnimation->addAnimation(smoothFlipXRotation);
+    flipAnimation->addAnimation(smoothFlipYRotation);
+//! [7]
 
-    QPropertyAnimation *smoothSplashMove = new QPropertyAnimation(splash, "y");
-    smoothSplashMove->setEasingCurve(QEasingCurve::InQuad);
-    smoothSplashMove->setDuration(250);
-    QPropertyAnimation *smoothSplashOpacity = new QPropertyAnimation(splash, "opacity");
-    smoothSplashOpacity->setDuration(250);
+//! [8]
+    // Flip animation delayed property assignment
+    QSequentialAnimationGroup *setVariablesSequence = new QSequentialAnimationGroup;
+    QPropertyAnimation *setFillAnimation = new QPropertyAnimation(pad, "fill");
+    QPropertyAnimation *setBackItemVisibleAnimation = new QPropertyAnimation(backItem, "visible");
+    QPropertyAnimation *setSelectionItemVisibleAnimation = new QPropertyAnimation(selectionItem, "visible");
+    setFillAnimation->setDuration(0);
+    setBackItemVisibleAnimation->setDuration(0);
+    setSelectionItemVisibleAnimation->setDuration(0);
+    setVariablesSequence->addPause(250);
+    setVariablesSequence->addAnimation(setBackItemVisibleAnimation);
+    setVariablesSequence->addAnimation(setSelectionItemVisibleAnimation);
+    setVariablesSequence->addAnimation(setFillAnimation);
+    flipAnimation->addAnimation(setVariablesSequence);
+//! [8]
 
+//! [9]
     // Build the state machine
     QStateMachine *stateMachine = new QStateMachine(this);
     QState *splashState = new QState(stateMachine);
     QState *frontState = new QState(stateMachine);
     QHistoryState *historyState = new QHistoryState(frontState);
     QState *backState = new QState(stateMachine);
+//! [9]
+//! [10]
+    frontState->assignProperty(pad, "fill", false);
     frontState->assignProperty(splash, "opacity", 0.0);
-    frontState->assignProperty(flipRotation, "angle", qVariantValue(0.0));
     frontState->assignProperty(backItem, "visible", false);
+    frontState->assignProperty(flipRotation, "angle", qVariantValue(0.0));
     frontState->assignProperty(selectionItem, "visible", true);
-    frontState->assignProperty(pad, "fill", false);
-    backState->assignProperty(flipRotation, "angle", qVariantValue(180.0));
+    backState->assignProperty(pad, "fill", true);
+    backState->assignProperty(backItem, "visible", true);
     backState->assignProperty(xRotation, "angle", qVariantValue(0.0));
     backState->assignProperty(yRotation, "angle", qVariantValue(0.0));
+    backState->assignProperty(flipRotation, "angle", qVariantValue(180.0));
     backState->assignProperty(selectionItem, "visible", false);
-    backState->assignProperty(backItem, "visible", true);
-    backState->assignProperty(pad, "fill", true);
     stateMachine->addDefaultAnimation(smoothXRotation);
     stateMachine->addDefaultAnimation(smoothYRotation);
     stateMachine->addDefaultAnimation(smoothXSelection);
     stateMachine->addDefaultAnimation(smoothYSelection);
     stateMachine->setInitialState(splashState);
+//! [10]
 
+//! [11]
     // Transitions
     QEventTransition *anyKeyTransition = new QEventTransition(this, QEvent::KeyPress, splashState);
     anyKeyTransition->setTargetState(frontState);
     anyKeyTransition->addAnimation(smoothSplashMove);
     anyKeyTransition->addAnimation(smoothSplashOpacity);
+//! [11]
 
-    QKeyEventTransition *enterTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Enter, backState);
+//! [12]
+    QKeyEventTransition *enterTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                   Qt::Key_Enter, backState);
+    QKeyEventTransition *returnTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                    Qt::Key_Return, backState);
+    QKeyEventTransition *backEnterTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                       Qt::Key_Enter, frontState);
+    QKeyEventTransition *backReturnTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                        Qt::Key_Return, frontState);
     enterTransition->setTargetState(historyState);
-    QKeyEventTransition *returnTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Return, backState);
     returnTransition->setTargetState(historyState);
-    QKeyEventTransition *backEnterTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Enter, frontState);
     backEnterTransition->setTargetState(backState);
-    QKeyEventTransition *backReturnTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Return, frontState);
     backReturnTransition->setTargetState(backState);
     enterTransition->addAnimation(flipAnimation);
     returnTransition->addAnimation(flipAnimation);
     backEnterTransition->addAnimation(flipAnimation);
     backReturnTransition->addAnimation(flipAnimation);
+//! [12]
 
-    // Substates, one for each icon
+//! [13]
+    // Create substates for each icon; store in temporary grid.
     int columns = size.width();
     int rows = size.height();
     QVector< QVector< QState * > > stateGrid;
     stateGrid.resize(rows);
     for (int y = 0; y < rows; ++y) {
         stateGrid[y].resize(columns);
-        for (int x = 0; x < columns; ++x) {
-            QState *state = new QState(frontState);
-            stateGrid[y][x] = state;
-        }
+        for (int x = 0; x < columns; ++x)
+            stateGrid[y][x] = new QState(frontState);
     }
     frontState->setInitialState(stateGrid[0][0]);
     selectionItem->setPos(pad->iconAt(0, 0)->pos());
+//! [13]
 
+//! [14]
     // Enable key navigation using state transitions
     for (int y = 0; y < rows; ++y) {
         for (int x = 0; x < columns; ++x) {
             QState *state = stateGrid[y][x];
-            QKeyEventTransition *rightTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Right, state);
+            QKeyEventTransition *rightTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                           Qt::Key_Right, state);
+            QKeyEventTransition *leftTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                          Qt::Key_Left, state);
+            QKeyEventTransition *downTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                          Qt::Key_Down, state);
+            QKeyEventTransition *upTransition = new QKeyEventTransition(this, QEvent::KeyPress,
+                                                                        Qt::Key_Up, state);
             rightTransition->setTargetState(stateGrid[y][(x + 1) % columns]);
-            QKeyEventTransition *leftTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Left, state);
             leftTransition->setTargetState(stateGrid[y][((x - 1) + columns) % columns]);
-            QKeyEventTransition *downTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Down, state);
             downTransition->setTargetState(stateGrid[(y + 1) % rows][x]);
-            QKeyEventTransition *upTransition = new QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Up, state);
             upTransition->setTargetState(stateGrid[((y - 1) + rows) % rows][x]);
-
+//! [14]
+//! [15]
             RoundRectItem *icon = pad->iconAt(x, y);
             state->assignProperty(xRotation, "angle", -icon->x() / 6.0);
             state->assignProperty(yRotation, "angle", icon->y() / 6.0);
@@ -219,47 +257,51 @@ PadNavigator::PadNavigator(const QSize &size, QWidget *parent)
             frontState->assignProperty(icon, "visible", true);
             backState->assignProperty(icon, "visible", false);
 
-            QPropertyAnimation *setVisibleAnim = new QPropertyAnimation(icon, "visible");
-            setVisibleAnim->setDuration(0);
-            setVisibleAnimation->addAnimation(setVisibleAnim);
+            QPropertyAnimation *setIconVisibleAnimation = new QPropertyAnimation(icon, "visible");
+            setIconVisibleAnimation->setDuration(0);
+            setVariablesSequence->addAnimation(setIconVisibleAnimation);
         }
     }
+//! [15]
 
-    // Setup scene
+//! [16]
+    // Scene
     QGraphicsScene *scene = new QGraphicsScene(this);
     scene->setBackgroundBrush(QPixmap(":/images/blue_angle_swirl.jpg"));
     scene->setItemIndexMethod(QGraphicsScene::NoIndex);
     scene->addItem(pad);
     scene->setSceneRect(scene->itemsBoundingRect());
     setScene(scene);
+//! [16]
 
-    // Adjust splash item
-    splash->setPos(-splash->boundingRect().width() / 2, scene->sceneRect().top());
+//! [17]
+    // Adjust splash item to scene contents
+    const QRectF sbr = splash->boundingRect();
+    splash->setPos(-sbr.width() / 2, scene->sceneRect().top() - 2);
     frontState->assignProperty(splash, "y", splash->y() - 100.0);
     scene->addItem(splash);
+//! [17]
 
-    // Setup view
+//! [18]
+    // View
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setMinimumSize(50, 50);
     setViewportUpdateMode(FullViewportUpdate);
     setCacheMode(CacheBackground);
-    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform
-                   | QPainter::TextAntialiasing);
+    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
 #ifndef QT_NO_OPENGL
     setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers)));
 #endif
 
     stateMachine->start();
+//! [18]
 }
 
-PadNavigator::~PadNavigator()
-{
-    delete form;
-}
-
+//! [19]
 void PadNavigator::resizeEvent(QResizeEvent *event)
 {
     QGraphicsView::resizeEvent(event);
     fitInView(scene()->sceneRect(), Qt::KeepAspectRatio);
 }
+//! [19]
diff --git a/examples/graphicsview/padnavigator/padnavigator.h b/examples/graphicsview/padnavigator/padnavigator.h
index c79a13c..03a1ea2 100644
--- a/examples/graphicsview/padnavigator/padnavigator.h
+++ b/examples/graphicsview/padnavigator/padnavigator.h
@@ -43,23 +43,25 @@
 #define PADNAVIGATOR_H
 
 #include 
+#include "ui_form.h"
 
 class QState;
 class QStateMachine;
 class Ui_Form;
 
+//! [0]
 class PadNavigator : public QGraphicsView
 {
     Q_OBJECT
 public:
     explicit PadNavigator(const QSize &size, QWidget *parent = 0);
-    ~PadNavigator();
 
 protected:
     void resizeEvent(QResizeEvent *event);
 
 private:
-    Ui_Form *form;
+    Ui_Form form;
 };
+//! [0]
 
 #endif // PADNAVIGATOR_H
diff --git a/examples/graphicsview/padnavigator/roundrectitem.cpp b/examples/graphicsview/padnavigator/roundrectitem.cpp
index 2141e9a..7a0b279 100644
--- a/examples/graphicsview/padnavigator/roundrectitem.cpp
+++ b/examples/graphicsview/padnavigator/roundrectitem.cpp
@@ -43,34 +43,39 @@
 
 #include 
 
+//! [0]
 RoundRectItem::RoundRectItem(const QRectF &bounds, const QColor &color,
                              QGraphicsItem *parent)
-    : QGraphicsObject(parent), fillRect(false), color(color), bounds(bounds)
+    : QGraphicsObject(parent), fillRect(false), bounds(bounds)
 {
     gradient.setStart(bounds.topLeft());
     gradient.setFinalStop(bounds.bottomRight());
     gradient.setColorAt(0, color);
     gradient.setColorAt(1, color.dark(200));
-
     setCacheMode(ItemCoordinateCache);
 }
+//! [0]
 
+//! [1]
 QPixmap RoundRectItem::pixmap() const
 {
     return pix;
 }
-
 void RoundRectItem::setPixmap(const QPixmap &pixmap)
 {
     pix = pixmap;
     update();
 }
+//! [1]
 
+//! [2]
 QRectF RoundRectItem::boundingRect() const
 {
     return bounds.adjusted(0, 0, 2, 2);
 }
+//! [2]
 
+//! [3]
 void RoundRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                           QWidget *widget)
 {
@@ -79,25 +84,31 @@ void RoundRectItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt
     painter->setPen(Qt::NoPen);
     painter->setBrush(QColor(0, 0, 0, 64));
     painter->drawRoundRect(bounds.translated(2, 2));
+//! [3]
+//! [4]
     if (fillRect)
         painter->setBrush(QApplication::palette().brush(QPalette::Window));
     else
         painter->setBrush(gradient);
     painter->setPen(QPen(Qt::black, 1));
     painter->drawRoundRect(bounds);
+//! [4]
+//! [5]
     if (!pix.isNull()) {
         painter->scale(1.95, 1.95);
         painter->drawPixmap(-pix.width() / 2, -pix.height() / 2, pix);
     }
 }
+//! [5]
 
+//! [6]
 bool RoundRectItem::fill() const
 {
     return fillRect;
 }
-
 void RoundRectItem::setFill(bool fill)
 {
     fillRect = fill;
     update();
 }
+//! [6]
diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h
index ae5fb4c..bc58cec 100644
--- a/examples/graphicsview/padnavigator/roundrectitem.h
+++ b/examples/graphicsview/padnavigator/roundrectitem.h
@@ -45,6 +45,7 @@
 #include 
 #include 
 
+//! [0]
 class RoundRectItem : public QGraphicsObject
 {
     Q_OBJECT
@@ -61,13 +62,15 @@ public:
 
     bool fill() const;
     void setFill(bool fill);
+//! [0]
 
+//! [1]
 private:
     QPixmap pix;
     bool fillRect;
-    QColor color;
     QRectF bounds;
     QLinearGradient gradient;
 };
+//! [1]
 
 #endif // ROUNDRECTITEM_H
diff --git a/examples/graphicsview/padnavigator/splashitem.cpp b/examples/graphicsview/padnavigator/splashitem.cpp
index e609656..cd7074a 100644
--- a/examples/graphicsview/padnavigator/splashitem.cpp
+++ b/examples/graphicsview/padnavigator/splashitem.cpp
@@ -43,20 +43,25 @@
 
 #include 
 
-SplashItem::SplashItem(QGraphicsItem *parent) :
-    QGraphicsObject(parent)
+//! [0]
+SplashItem::SplashItem(QGraphicsItem *parent)
+    : QGraphicsObject(parent)
 {
     text = tr("Welcome to the Pad Navigator Example. You can use the"
               " keyboard arrows to navigate the icons, and press enter"
               " to activate an item. Press any key to begin.");
     setCacheMode(DeviceCoordinateCache);
 }
+//! [0]
 
+//! [1]
 QRectF SplashItem::boundingRect() const
 {
     return QRectF(0, 0, 400, 175);
 }
+//! [1]
 
+//! [2]
 void SplashItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                        QWidget *widget)
 {
@@ -76,3 +81,4 @@ void SplashItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
     painter->setFont(font);
     painter->drawText(textRect, flags, text);
 }
+//! [2]
diff --git a/examples/graphicsview/padnavigator/splashitem.h b/examples/graphicsview/padnavigator/splashitem.h
index 9d57653..98c4a1f 100644
--- a/examples/graphicsview/padnavigator/splashitem.h
+++ b/examples/graphicsview/padnavigator/splashitem.h
@@ -44,6 +44,7 @@
 
 #include 
 
+//! [0]
 class SplashItem : public QGraphicsObject
 {
     Q_OBJECT
@@ -56,5 +57,6 @@ public:
 private:
     QString text;
 };
+//! [0]
 
 #endif // SPLASHITEM_H
-- 
cgit v0.12


From 5987412720498aa22202a1bcca3cb988a9cf5606 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen 
Date: Wed, 12 May 2010 17:00:46 +0200
Subject: Doc: Adding loading image to search textbox

---
 doc/src/template/images/spinner.gif         | Bin 0 -> 2037 bytes
 doc/src/template/scripts/functions.js       |  14 +++++++++++---
 doc/src/template/style/style.css            |   4 ++++
 tools/qdoc3/test/qt-html-templates.qdocconf |   6 +++---
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 doc/src/template/images/spinner.gif

diff --git a/doc/src/template/images/spinner.gif b/doc/src/template/images/spinner.gif
new file mode 100644
index 0000000..1ed786f
Binary files /dev/null and b/doc/src/template/images/spinner.gif differ
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 09b7de3..7d93486 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -40,6 +40,7 @@ var exampleCount = 0;
 var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
 
 function processNokiaData(response){
+$('.sidebar .search form input').addClass('loading');
 	// debug $('.content').prepend('
    • handling search results
      • '); // debuging
 	var propertyTags = response.getElementsByTagName('page');
 	
@@ -92,7 +93,8 @@ function processNokiaData(response){
 		} 
 	}	
 	 
-	if(lookupCount == 0){$('#ul001').prepend('
    • Found no result
      • ');$('#ul001 li').css('display','block');}
+	if(lookupCount == 0){$('#ul001').prepend('
    • Found no result
      • ');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');
+}
     if(articleCount == 0){$('#ul002').prepend('
    • Found no result
      • ');$('#ul002 li').css('display','block');}
 	if(exampleCount == 0){$('#ul003').prepend('
    • Found no result
      • ');$('#ul003 li').css('display','block');}
 	// reset count variables;
@@ -119,8 +121,14 @@ function CheckEmptyAndLoadList()
 	 $('.defaultLink').css('display','none');
 	}
 }
-
-
+/*
+$(window).resize(function(){
+if($(window).width()<400)
+	$('body').addClass('offline');
+else
+	$('body').removeClass('offline');
+	});
+	*/
 // Loads on doc ready
 	$(document).ready(function () {
 	var pageTitle = $('title').html();
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index d87b11f..5ad90e3 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1131,6 +1131,10 @@
         visibility: hidden;
     }
 	
+.sidebar .search form input.loading
+{
+        background:url("../images/spinner.gif") no-repeat scroll right center transparent;
+}
 
     /* end of screen media */
 
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 31fc414..9af2f92 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -105,7 +105,7 @@ HTML.postpostheader     = "            \n" \
 			  "        
      \n"
 
 HTML.footer             = "        \n" \
-			  "        
      \n" \
+			  "        
      \n" \
 			  "          [+] Documentation Feedback
      \n" \
 			  "      
      \n" \
 			  "    
      \n" \
@@ -124,12 +124,12 @@ HTML.footer             = "        \n" \
 			  "  
      \n" \
 			  "  
      \n" \
 			  "      
      \n" \
-			  "        X\n" \
+			  "        X\n" \
 			  "      
      \n" \
 			  "    \n" \
 			  "      
      \n" \
 			  "      \n" \
-			  "      
      \n" \
 			  "    \n" \
 			  "  
      \n" \
-- 
cgit v0.12


From 0fd9d9ca457aa3e400188214f79830cd853e6348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= 
Date: Wed, 12 May 2010 17:10:58 +0200
Subject: Remove an unnecessary assert.

Reviewed-by: Kim
---
 src/opengl/qgl.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index a3c1bac..7c457de 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1723,7 +1723,6 @@ QGLTextureCache::QGLTextureCache()
 
 QGLTextureCache::~QGLTextureCache()
 {
-    Q_ASSERT(size() == 0);
     QImagePixmapCleanupHooks::instance()->removePixmapDataModificationHook(cleanupTexturesForPixampData);
     QImagePixmapCleanupHooks::instance()->removePixmapDataDestructionHook(cleanupBeforePixmapDestruction);
     QImagePixmapCleanupHooks::instance()->removeImageHook(cleanupTexturesForCacheKey);
@@ -2888,7 +2887,7 @@ void QGLContext::drawTexture(const QPointF &point, GLuint textureId, GLenum text
     glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_WIDTH, &textureWidth);
     glGetTexLevelParameteriv(textureTarget, 0, GL_TEXTURE_HEIGHT, &textureHeight);
 
-    if (d_ptr->active_engine && 
+    if (d_ptr->active_engine &&
         d_ptr->active_engine->type() == QPaintEngine::OpenGL2) {
         QGL2PaintEngineEx *eng = static_cast(d_ptr->active_engine);
         if (!eng->isNativePaintingActive()) {
-- 
cgit v0.12


From 770a2428357f030d4efad8c64ceb381ce50c9fb9 Mon Sep 17 00:00:00 2001
From: Kim Motoyoshi Kalland 
Date: Wed, 12 May 2010 17:36:04 +0200
Subject: Compile fix on Windows.

Reviewed-by: Trond
---
 src/gui/painting/qstroker_p.h      | 2 +-
 src/gui/painting/qtransform.cpp    | 2 +-
 src/opengl/qpaintengine_opengl.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h
index 0f133ef..d646135 100644
--- a/src/gui/painting/qstroker_p.h
+++ b/src/gui/painting/qstroker_p.h
@@ -125,7 +125,7 @@ typedef void (*qStrokerCubicToHook)(qfixed c1x, qfixed c1y,
                                     void *data);
 
 // qtransform.cpp
-extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
+Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
 
 class Q_GUI_EXPORT QStrokerOps
 {
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index c72a08e..aaa241f 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1545,7 +1545,7 @@ static inline bool lineTo_clipped(QPainterPath &path, const QTransform &transfor
 
     return true;
 }
-bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
+Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale);
 
 static inline bool cubicTo_clipped(QPainterPath &path, const QTransform &transform, const QPointF &a, const QPointF &b, const QPointF &c, const QPointF &d, bool needsMoveTo)
 {
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index d2b0d4f..08a50cb 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -3950,7 +3950,7 @@ void QOpenGLPaintEnginePrivate::strokeLines(const QPainterPath &path)
     enableClipping();
 }
 
-extern bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
+Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); // qtransform.cpp
 
 void QOpenGLPaintEnginePrivate::strokePath(const QPainterPath &path, bool use_cache)
 {
-- 
cgit v0.12


From 476414a53a02d99c0887acdb18c96dd65ad9ffa4 Mon Sep 17 00:00:00 2001
From: x29a <0.x29a.0@gmail.com>
Date: Wed, 12 May 2010 23:22:41 +0200
Subject: Set the pictures for the examples of multitouch

Changed filenames in multitouch examples to follow the format of existing examples.
Added a picture for the fingerpaint example using a selfbuilt table and the qTUIO library.

Merge-request: 608
Reviewed-by: Benjamin Poulain 
---
 doc/src/examples/fingerpaint.qdoc                 |   2 +-
 doc/src/examples/pinchzoom.qdoc                   |   2 +-
 doc/src/images/multitouch-fingerpaint-example.png | Bin 0 -> 17026 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 doc/src/images/multitouch-fingerpaint-example.png

diff --git a/doc/src/examples/fingerpaint.qdoc b/doc/src/examples/fingerpaint.qdoc
index e5eb4ef..7eb1512 100644
--- a/doc/src/examples/fingerpaint.qdoc
+++ b/doc/src/examples/fingerpaint.qdoc
@@ -46,5 +46,5 @@
     The Finger Paint example shows the use of multi-touch with a custom widget
     to create a simple painting application.
 
-    \image multitouch-fingerpaint.png
+    \image multitouch-fingerpaint-example.png
 */
diff --git a/doc/src/examples/pinchzoom.qdoc b/doc/src/examples/pinchzoom.qdoc
index 726b1b3..867b2b3 100644
--- a/doc/src/examples/pinchzoom.qdoc
+++ b/doc/src/examples/pinchzoom.qdoc
@@ -46,5 +46,5 @@
     The Pinch Zoom example shows how to use low-level multi-touch information
     to recognize a gesture.
 
-    \image multitouch-pinchzoom.png
+    \image multitouch-pinchzoom-example.png
 */
diff --git a/doc/src/images/multitouch-fingerpaint-example.png b/doc/src/images/multitouch-fingerpaint-example.png
new file mode 100644
index 0000000..c741b65
Binary files /dev/null and b/doc/src/images/multitouch-fingerpaint-example.png differ
-- 
cgit v0.12


From 386b658ce39bfab16ea14b232c61ad4703f11619 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Thu, 13 May 2010 10:08:48 +1000
Subject: Fix broken benchmarks.

---
 src/declarative/qml/qdeclarativeengine.cpp                 | 11 ++++++-----
 tests/benchmarks/declarative/creation/tst_creation.cpp     |  4 ++--
 tests/benchmarks/declarative/painting/painting.pro         |  1 +
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp            |  6 +++---
 .../benchmarks/declarative/script/data/slot_complex_js.js  |  8 ++++++++
 .../benchmarks/declarative/script/data/slot_complex_js.qml | 14 ++------------
 tests/benchmarks/declarative/script/data/slot_simple_js.js |  3 +++
 .../benchmarks/declarative/script/data/slot_simple_js.qml  | 10 ++--------
 8 files changed, 27 insertions(+), 30 deletions(-)
 create mode 100644 tests/benchmarks/declarative/script/data/slot_complex_js.js
 create mode 100644 tests/benchmarks/declarative/script/data/slot_simple_js.js

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 9f5cafe..94e6771 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -327,11 +327,12 @@ Q_GLOBAL_STATIC(QDeclarativeEngineDebugServer, qmlEngineDebugServer);
 void QDeclarativePrivate::qdeclarativeelement_destructor(QObject *o)
 {
     QObjectPrivate *p = QObjectPrivate::get(o);
-    Q_ASSERT(p->declarativeData);
-    QDeclarativeData *d = static_cast(p->declarativeData);
-    if (d->ownContext && d->context) {
-        d->context->destroy();
-        d->context = 0;
+    if (p->declarativeData) {
+        QDeclarativeData *d = static_cast(p->declarativeData);
+        if (d->ownContext && d->context) {
+            d->context->destroy();
+            d->context = 0;
+        }
     }
 }
 
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 6f00473..99324f4 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -203,7 +203,7 @@ void tst_creation::qobject_10tree_cpp()
 
 void tst_creation::qobject_qmltype()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/QtObject", 4, 6);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/QtObject", 4, 7);
 
     QBENCHMARK {
         QObject *obj = t->create();
@@ -347,7 +347,7 @@ void tst_creation::elements_data()
 void tst_creation::elements()
 {
     QFETCH(QByteArray, type);
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 4, 6);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 4, 7);
     if (!t || !t->isCreatable())
         QSKIP("Non-creatable type", SkipSingle);
 
diff --git a/tests/benchmarks/declarative/painting/painting.pro b/tests/benchmarks/declarative/painting/painting.pro
index 2f98e8b..a228ea7 100644
--- a/tests/benchmarks/declarative/painting/painting.pro
+++ b/tests/benchmarks/declarative/painting/painting.pro
@@ -11,3 +11,4 @@ INCLUDEPATH += .
 SOURCES += paintbenchmark.cpp
 QT += opengl
 CONFIG += console
+macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 4bba022..e2e8c8a 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -68,7 +68,7 @@ private:
 void tst_qmlgraphicsimage::qmlgraphicsimage()
 {
     int x = 0;
-    QUrl url("image.png");
+    QUrl url(SRCDIR "/image.png");
     QBENCHMARK {
         QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
         QDeclarativeImage *image = new QDeclarativeImage;
@@ -80,7 +80,7 @@ void tst_qmlgraphicsimage::qmlgraphicsimage()
 void tst_qmlgraphicsimage::qmlgraphicsimage_file()
 {
     int x = 0;
-    QUrl url("image.png");
+    QUrl url(SRCDIR "/image.png");
     QBENCHMARK {
         QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
         QDeclarativeImage *image = new QDeclarativeImage;
@@ -93,7 +93,7 @@ void tst_qmlgraphicsimage::qmlgraphicsimage_file()
 void tst_qmlgraphicsimage::qmlgraphicsimage_url()
 {
     int x = 0;
-    QUrl url("image.png");
+    QUrl url(SRCDIR "/image.png");
     QBENCHMARK {
         QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
         QDeclarativeImage *image = new QDeclarativeImage;
diff --git a/tests/benchmarks/declarative/script/data/slot_complex_js.js b/tests/benchmarks/declarative/script/data/slot_complex_js.js
new file mode 100644
index 0000000..64a1f65
--- /dev/null
+++ b/tests/benchmarks/declarative/script/data/slot_complex_js.js
@@ -0,0 +1,8 @@
+function myCustomFunction(n) {
+    var a = 1;
+    while (n > 0) {
+        a = a * n;
+        n--;
+    }
+    return a;
+}
diff --git a/tests/benchmarks/declarative/script/data/slot_complex_js.qml b/tests/benchmarks/declarative/script/data/slot_complex_js.qml
index ed4f78b..7bda48b 100644
--- a/tests/benchmarks/declarative/script/data/slot_complex_js.qml
+++ b/tests/benchmarks/declarative/script/data/slot_complex_js.qml
@@ -1,18 +1,8 @@
 import Qt.test 1.0
+import "slot_complex_js.js" as Logic
 
 TestObject {
-    Script {
-        function myCustomFunction(n) {
-            var a = 1;
-            while (n > 0) {
-                a = a * n;
-                n--; 
-            }
-            return a;
-        }
-    }
-
-    onMySignal: { for (var ii = 0; ii < 10000; ++ii) { myCustomFunction(10); } }
+    onMySignal: { for (var ii = 0; ii < 10000; ++ii) { Logic.myCustomFunction(10); } }
 }
 
 
diff --git a/tests/benchmarks/declarative/script/data/slot_simple_js.js b/tests/benchmarks/declarative/script/data/slot_simple_js.js
new file mode 100644
index 0000000..d6e6060
--- /dev/null
+++ b/tests/benchmarks/declarative/script/data/slot_simple_js.js
@@ -0,0 +1,3 @@
+function myCustomFunction() {
+    return 0;
+}
diff --git a/tests/benchmarks/declarative/script/data/slot_simple_js.qml b/tests/benchmarks/declarative/script/data/slot_simple_js.qml
index a88265c..7ea3177 100644
--- a/tests/benchmarks/declarative/script/data/slot_simple_js.qml
+++ b/tests/benchmarks/declarative/script/data/slot_simple_js.qml
@@ -1,13 +1,7 @@
 import Qt.test 1.0
+import "slot_simple_js.js" as Logic
 
 TestObject {
-
-    Script {
-        function myCustomFunction() {
-            return 0;
-        }
-    }
-
-    onMySignal: { for (var ii = 0; ii < 10000; ++ii) { myCustomFunction(); } }
+    onMySignal: { for (var ii = 0; ii < 10000; ++ii) { Logic.myCustomFunction(); } }
 }
 
-- 
cgit v0.12


From f17c706db16aae93f024e88208e139063f5b2c7c Mon Sep 17 00:00:00 2001
From: Joona Petrell 
Date: Wed, 12 May 2010 16:28:57 +1000
Subject: Fix for graphics widget in the background stealing declarative item's
 focus

Task-number: QTBUG-10584
Reviewed-by: Warwick Allison
---
 src/gui/graphicsview/qgraphicsscene.cpp            |  4 +--
 .../qdeclarativeitem/data/mouseFocus.qml           | 20 ++++++++++++
 .../qdeclarativeitem/tst_qdeclarativeitem.cpp      | 37 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index dacdbfe..7abd5f6 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -1320,10 +1320,10 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou
             setFocus = true;
             break;
         }
-        if (item->isEnabled() && ((item->flags() & QGraphicsItem::ItemIsFocusable) && item->d_ptr->mouseSetsFocus)) {
+        if (item->isEnabled() && ((item->flags() & QGraphicsItem::ItemIsFocusable))) {
             if (!item->isWidget() || ((QGraphicsWidget *)item)->focusPolicy() & Qt::ClickFocus) {
                 setFocus = true;
-                if (item != q->focusItem())
+                if (item != q->focusItem() && item->d_ptr->mouseSetsFocus)
                     q->setFocusItem(item, Qt::MouseFocusReason);
                 break;
             }
diff --git a/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml b/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml
new file mode 100644
index 0000000..a562b8b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml
@@ -0,0 +1,20 @@
+import Qt 4.7
+
+QGraphicsWidget {
+    size: "200x100"
+    focusPolicy: QGraphicsWidget.ClickFocus
+    Item {
+        objectName: "declarativeItem"
+        id: item
+        width: 200
+        height: 100
+        MouseArea {
+            anchors.fill: parent
+            onPressed: {
+                if (!item.focus) {
+                    item.focus = true;
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index e0ca746..f4edeb2 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include "../../../shared/util.h"
 
 class tst_QDeclarativeItem : public QObject
 
@@ -67,6 +68,7 @@ private slots:
 
     void childrenProperty();
     void resourcesProperty();
+    void mouseFocus();
 
 private:
     template
@@ -466,6 +468,41 @@ void tst_QDeclarativeItem::resourcesProperty()
     delete o;
 }
 
+void tst_QDeclarativeItem::mouseFocus()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    QVERIFY(canvas);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/mouseFocus.qml"));
+    canvas->show();
+    QVERIFY(canvas->rootObject());
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas));
+
+    QDeclarativeItem *item = findItem(canvas->rootObject(), "declarativeItem");
+    QVERIFY(item);
+    QSignalSpy focusSpy(item, SIGNAL(focusChanged(bool)));
+
+    QTest::mouseClick(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(item->scenePos()));
+    QApplication::processEvents();
+    QCOMPARE(focusSpy.count(), 1);
+    QVERIFY(item->hasFocus());
+
+    // make sure focusable graphics widget underneath does not steal focus
+    QTest::mouseClick(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(item->scenePos()));
+    QApplication::processEvents();
+    QCOMPARE(focusSpy.count(), 1);
+    QVERIFY(item->hasFocus());
+
+    item->setFocus(false);
+    QVERIFY(!item->hasFocus());
+    QCOMPARE(focusSpy.count(), 2);
+    item->setFocus(true);
+    QCOMPARE(focusSpy.count(), 3);
+
+    delete canvas;
+}
+
 void tst_QDeclarativeItem::propertyChanges()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
-- 
cgit v0.12


From d45c45432ccd0a74c67e70ce5fc3a09f35923c26 Mon Sep 17 00:00:00 2001
From: Joona Petrell 
Date: Wed, 12 May 2010 18:20:18 +1000
Subject: Fix TextEdit and TextInput input panel support for mode
 RSIP_OnMouseClickAndAlreadyFocused

Task-number:
Reviewed-by: Warwick Allison
---
 src/declarative/graphicsitems/qdeclarativetextedit.cpp   | 11 ++++++++---
 src/declarative/graphicsitems/qdeclarativetextedit_p_p.h |  3 ++-
 src/declarative/graphicsitems/qdeclarativetextinput.cpp  | 16 ++++++++++++----
 .../graphicsitems/qdeclarativetextinput_p_p.h            |  3 ++-
 .../qdeclarativelistview/tst_qdeclarativelistview.cpp    |  2 --
 .../qdeclarativetextedit/tst_qdeclarativetextedit.cpp    | 11 ++++++++---
 .../qdeclarativetextinput/tst_qdeclarativetextinput.cpp  | 11 ++++++++---
 7 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 6d86e58..db20da8 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -899,6 +899,7 @@ Handles the given mouse \a event.
 void QDeclarativeTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextEdit);
+    bool hadFocus = hasFocus();
     if (d->focusOnPress){
         QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
         while(p) {
@@ -910,6 +911,8 @@ void QDeclarativeTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
         }
         setFocus(true);
     }
+    if (!hadFocus && hasFocus())
+        d->clickCausedFocus = true;
     d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
         QDeclarativePaintedItem::mousePressEvent(event);
@@ -924,11 +927,12 @@ void QDeclarativeTextEdit::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     Q_D(QDeclarativeTextEdit);
     QWidget *widget = event->widget();
     if (widget && (d->control->textInteractionFlags() & Qt::TextEditable) && boundingRect().contains(event->pos()))
-        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->focusOnPress);
+        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->clickCausedFocus);
+    d->clickCausedFocus = false;
 
     d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
-        QDeclarativePaintedItem::mousePressEvent(event);
+        QDeclarativePaintedItem::mouseReleaseEvent(event);
 }
 
 /*!
@@ -952,7 +956,8 @@ void QDeclarativeTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     Q_D(QDeclarativeTextEdit);
     d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
-        QDeclarativePaintedItem::mousePressEvent(event);
+        QDeclarativePaintedItem::mouseMoveEvent(event);
+    event->setAccepted(true);
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index 8d4b611..5e19c3d 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -70,7 +70,7 @@ public:
     QDeclarativeTextEditPrivate()
       : color("black"), hAlign(QDeclarativeTextEdit::AlignLeft), vAlign(QDeclarativeTextEdit::AlignTop),
       imgDirty(true), dirty(false), richText(false), cursorVisible(false), focusOnPress(true),
-      persistentSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
+      persistentSelection(true), clickCausedFocus(false), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
       cursorComponent(0), cursor(0), format(QDeclarativeTextEdit::AutoText), document(0),
       wrapMode(QDeclarativeTextEdit::NoWrap)
     {
@@ -100,6 +100,7 @@ public:
     bool cursorVisible : 1;
     bool focusOnPress : 1;
     bool persistentSelection : 1;
+    bool clickCausedFocus : 1;
     qreal textMargin;
     int lastSelectionStart;
     int lastSelectionEnd;
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 8f86aa0..afbaaac 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -882,6 +882,7 @@ void QDeclarativeTextInput::keyPressEvent(QKeyEvent* ev)
 void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextInput);
+    bool hadFocus = hasFocus();
     if(d->focusOnPress){
         QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
         while(p) {
@@ -893,15 +894,20 @@ void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
         }
         setFocus(true);
     }
+    if (!hadFocus && hasFocus())
+        d->clickCausedFocus = true;
+
     bool mark = event->modifiers() & Qt::ShiftModifier;
     int cursor = d->xToPos(event->pos().x());
     d->control->moveCursor(cursor, mark);
+    event->setAccepted(true);
 }
 
 void QDeclarativeTextInput::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextInput);
     d->control->moveCursor(d->xToPos(event->pos().x()), true);
+    event->setAccepted(true);
 }
 
 /*!
@@ -913,8 +919,10 @@ void QDeclarativeTextInput::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     Q_D(QDeclarativeTextInput);
     QWidget *widget = event->widget();
     if (widget && !d->control->isReadOnly() && boundingRect().contains(event->pos()))
-        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->focusOnPress);
-    d->control->processEvent(event);
+        qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), d->clickCausedFocus);
+    d->clickCausedFocus = false;
+    if (!event->isAccepted())
+        QDeclarativePaintedItem::mouseReleaseEvent(event);
 }
 
 bool QDeclarativeTextInput::event(QEvent* ev)
@@ -935,8 +943,8 @@ bool QDeclarativeTextInput::event(QEvent* ev)
                 updateSize();
     }
     if(!handled)
-        return QDeclarativePaintedItem::event(ev);
-    return true;
+        handled = QDeclarativePaintedItem::event(ev);
+    return handled;
 }
 
 void QDeclarativeTextInput::geometryChanged(const QRectF &newGeometry,
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 26cf78c..99866b8 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -72,7 +72,7 @@ public:
                  color((QRgb)0), style(QDeclarativeText::Normal),
                  styleColor((QRgb)0), hAlign(QDeclarativeTextInput::AlignLeft),
                  hscroll(0), oldScroll(0), focused(false), focusOnPress(true),
-                 cursorVisible(false), autoScroll(true)
+                 cursorVisible(false), autoScroll(true), clickCausedFocus(false)
     {
     }
 
@@ -116,6 +116,7 @@ public:
     bool focusOnPress;
     bool cursorVisible;
     bool autoScroll;
+    bool clickCausedFocus;
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 22eb734..ec2afae 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -1432,8 +1432,6 @@ void tst_QDeclarativeListView::QTBUG_9791()
 {
     QDeclarativeView *canvas = createView();
 
-    QDeclarativeContext *ctxt = canvas->rootContext();
-
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/strictlyenforcerange.qml"));
     qApp->processEvents();
 
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index b92024f..c65c883 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -793,8 +793,6 @@ void tst_qdeclarativetextedit::sendRequestSoftwareInputPanelEvent()
     view.viewport()->setInputContext(&ic);
     QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
             view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
-    if ((behavior != QStyle::RSIP_OnMouseClick))
-        QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
     QDeclarativeTextEdit edit;
     edit.setText("Hello world");
     edit.setPos(0, 0);
@@ -806,7 +804,14 @@ void tst_qdeclarativetextedit::sendRequestSoftwareInputPanelEvent()
     QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(edit.scenePos()));
     QApplication::processEvents();
-    QCOMPARE(ic.softwareInputPanelEventReceived, true);
+    if (behavior == QStyle::RSIP_OnMouseClickAndAlreadyFocused) {
+        QCOMPARE(ic.softwareInputPanelEventReceived, false);
+        QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(edit.scenePos()));
+        QApplication::processEvents();
+        QCOMPARE(ic.softwareInputPanelEventReceived, true);
+    } else if (behavior == QStyle::RSIP_OnMouseClick) {
+        QCOMPARE(ic.softwareInputPanelEventReceived, true);
+    }
 }
 
 void tst_qdeclarativetextedit::geometrySignals()
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index c00390d..ac80edb 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -743,8 +743,6 @@ void tst_qdeclarativetextinput::sendRequestSoftwareInputPanelEvent()
     view.viewport()->setInputContext(&ic);
     QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
             view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
-    if ((behavior != QStyle::RSIP_OnMouseClick))
-        QSKIP("This test need to have a style with RSIP_OnMouseClick", SkipSingle);
     QDeclarativeTextInput input;
     input.setText("Hello world");
     input.setPos(0, 0);
@@ -756,7 +754,14 @@ void tst_qdeclarativetextinput::sendRequestSoftwareInputPanelEvent()
     QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view));
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(input.scenePos()));
     QApplication::processEvents();
-    QCOMPARE(ic.softwareInputPanelEventReceived, true);
+    if (behavior == QStyle::RSIP_OnMouseClickAndAlreadyFocused) {
+        QCOMPARE(ic.softwareInputPanelEventReceived, false);
+        QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, view.mapFromScene(input.scenePos()));
+        QApplication::processEvents();
+        QCOMPARE(ic.softwareInputPanelEventReceived, true);
+    } else if (behavior == QStyle::RSIP_OnMouseClick) {
+        QCOMPARE(ic.softwareInputPanelEventReceived, true);
+    }
 }
 
 class MyTextInput : public QDeclarativeTextInput
-- 
cgit v0.12


From 2555221bbcb33e0d12e786eb0b3d08bd9260eeb7 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha 
Date: Wed, 12 May 2010 11:51:56 +1000
Subject: Avoid running animation when loopCount == 0

Task-number: QTBUG-10654
Reviewed-by: Thierry Bastian
---
 src/corelib/animation/qabstractanimation.cpp       |  3 +++
 .../qpropertyanimation/tst_qpropertyanimation.cpp  | 24 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 01570ad..04342e7 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -369,6 +369,9 @@ void QAbstractAnimationPrivate::setState(QAbstractAnimation::State newState)
     if (state == newState)
         return;
 
+    if (loopCount == 0)
+        return;
+
     QAbstractAnimation::State oldState = state;
     int oldCurrentTime = currentTime;
     int oldCurrentLoop = currentLoop;
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index 849b8b2..ea527de 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -133,6 +133,7 @@ private slots:
     void twoAnimations();
     void deletedInUpdateCurrentTime();
     void totalDuration();
+    void zeroLoopCount();
 };
 
 tst_QPropertyAnimation::tst_QPropertyAnimation()
@@ -1214,6 +1215,29 @@ void tst_QPropertyAnimation::totalDuration()
     QCOMPARE(anim.totalDuration(), 0);
 }
 
+void tst_QPropertyAnimation::zeroLoopCount()
+{
+    DummyPropertyAnimation* anim;
+    anim = new DummyPropertyAnimation;
+    anim->setStartValue(0);
+    anim->setDuration(20);
+    anim->setLoopCount(0);
+
+    QSignalSpy runningSpy(anim, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State)));
+    QSignalSpy finishedSpy(anim, SIGNAL(finished()));
+
+    QCOMPARE(anim->state(), QAnimationGroup::Stopped);
+    QCOMPARE(anim->currentValue().toInt(), 0);
+    QCOMPARE(runningSpy.count(), 0);
+    QCOMPARE(finishedSpy.count(), 0);
+
+    anim->start();
+
+    QCOMPARE(anim->state(), QAnimationGroup::Stopped);
+    QCOMPARE(anim->currentValue().toInt(), 0);
+    QCOMPARE(runningSpy.count(), 0);
+    QCOMPARE(finishedSpy.count(), 0);
+}
 
 QTEST_MAIN(tst_QPropertyAnimation)
 #include "tst_qpropertyanimation.moc"
-- 
cgit v0.12


From 6c19bdb8552f3cc6ced2a20868f1f1952f94a69c Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Thu, 13 May 2010 13:19:35 +1000
Subject: Dates and variants are not considered nested objects

---
 src/declarative/util/qdeclarativelistmodel.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 0985a6b..a8a445a 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -999,7 +999,8 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash *ro
     QScriptValueIterator it(value);
     while (it.hasNext()) {
         it.next();
-        if (it.value().isObject()) {
+        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";
             return false;
         }
-- 
cgit v0.12


From 72094648438d8214dcaabddf4d94d9d7e346675a Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Thu, 13 May 2010 14:32:19 +1000
Subject: Fix crash on remote content. Breakage was actually quite bad, just
 hard to reproduce.

Task-number: QTBUG-10565
---
 src/declarative/qml/qdeclarativecompositetypemanager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
index 0ea198d..6014b10 100644
--- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp
+++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
@@ -509,7 +509,9 @@ void QDeclarativeCompositeTypeManager::checkComplete(QDeclarativeCompositeTypeDa
                     unit->errors = u->errors;
                     doComplete(unit);
                     return;
-                } else if (u->status == QDeclarativeCompositeTypeData::Waiting) {
+                } else if (u->status == QDeclarativeCompositeTypeData::Waiting
+                        || u->status == QDeclarativeCompositeTypeData::WaitingResources)
+                {
                     waiting++;
                 }
             }
-- 
cgit v0.12


From ae8e4afcadc9ff084e1d1859c29fbc8b629e3392 Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Thu, 13 May 2010 15:07:21 +1000
Subject: Add an example spinner. Also add missing
 increment/decrementCurrentIndex() slots to PathView, and tweak the number of
 points cached along a Path.

---
 examples/declarative/declarative.pro               |   1 +
 examples/declarative/spinner/content/Spinner.qml   |  25 ++++++++++++++++
 .../declarative/spinner/content/spinner-bg.png     | Bin 0 -> 345 bytes
 .../declarative/spinner/content/spinner-select.png | Bin 0 -> 320 bytes
 examples/declarative/spinner/main.qml              |  18 +++++++++++
 examples/declarative/spinner/spinner.qmlproject    |  16 ++++++++++
 src/declarative/graphicsitems/qdeclarativepath.cpp |   4 ++-
 .../graphicsitems/qdeclarativepathview.cpp         |  33 +++++++++++++++++++--
 .../graphicsitems/qdeclarativepathview_p.h         |   4 +++
 .../tst_qdeclarativepathview.cpp                   |  30 +++++++++++++++++--
 10 files changed, 125 insertions(+), 6 deletions(-)
 create mode 100644 examples/declarative/spinner/content/Spinner.qml
 create mode 100644 examples/declarative/spinner/content/spinner-bg.png
 create mode 100644 examples/declarative/spinner/content/spinner-select.png
 create mode 100644 examples/declarative/spinner/main.qml
 create mode 100644 examples/declarative/spinner/spinner.qmlproject

diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index ba9b628..913b2b0 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -37,6 +37,7 @@ sources.files = \
    scrollbar \
    searchbox \
    slideswitch \
+   spinner \
    sql \
    states \
    tabwidget \
diff --git a/examples/declarative/spinner/content/Spinner.qml b/examples/declarative/spinner/content/Spinner.qml
new file mode 100644
index 0000000..8145a28
--- /dev/null
+++ b/examples/declarative/spinner/content/Spinner.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+
+Image {
+    property alias model: view.model
+    property alias delegate: view.delegate
+    property alias currentIndex: view.currentIndex
+    property real itemHeight: 30
+    source: "spinner-bg.png"
+    clip: true
+    PathView {
+        id: view
+        anchors.fill: parent
+        pathItemCount: height/itemHeight
+        preferredHighlightBegin: 0.5
+        preferredHighlightEnd: 0.5
+        highlight: Image { source: "spinner-select.png"; width: view.width; height: itemHeight+4 }
+        dragMargin: view.width/2
+        path: Path {
+            startX: view.width/2; startY: -itemHeight/2
+            PathLine { x: view.width/2; y: view.pathItemCount*itemHeight + itemHeight }
+        }
+    }
+    Keys.onDownPressed: view.incrementCurrentIndex()
+    Keys.onUpPressed: view.decrementCurrentIndex()
+}
diff --git a/examples/declarative/spinner/content/spinner-bg.png b/examples/declarative/spinner/content/spinner-bg.png
new file mode 100644
index 0000000..b3556f1
Binary files /dev/null and b/examples/declarative/spinner/content/spinner-bg.png differ
diff --git a/examples/declarative/spinner/content/spinner-select.png b/examples/declarative/spinner/content/spinner-select.png
new file mode 100644
index 0000000..95a17a1
Binary files /dev/null and b/examples/declarative/spinner/content/spinner-select.png differ
diff --git a/examples/declarative/spinner/main.qml b/examples/declarative/spinner/main.qml
new file mode 100644
index 0000000..6be567a
--- /dev/null
+++ b/examples/declarative/spinner/main.qml
@@ -0,0 +1,18 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    width: 240; height: 320
+    Column {
+        y: 20; x: 20; spacing: 20
+        Spinner {
+            id: spinner
+            width: 200; height: 240
+            focus: true
+            model: 20
+            itemHeight: 30
+            delegate: Text { font.pixelSize: 25; text: index; height: 30 }
+        }
+        Text { text: "Current item index: " + spinner.currentIndex }
+    }
+}
diff --git a/examples/declarative/spinner/spinner.qmlproject b/examples/declarative/spinner/spinner.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/spinner/spinner.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index 3d0df87..2d08c7c 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -377,7 +377,9 @@ void QDeclarativePath::createPointCache() const
 {
     Q_D(const QDeclarativePath);
     qreal pathLength = d->_path.length();
-    const int points = int(pathLength*2);
+    // more points means less jitter between items as they move along the
+    // path, but takes longer to generate
+    const int points = int(pathLength*5);
     const int lastElement = d->_path.elementCount() - 1;
     d->_pointCache.resize(points+1);
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 503d096..207cc25 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -49,6 +49,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 QT_BEGIN_NAMESPACE
@@ -279,8 +280,8 @@ void QDeclarativePathViewPrivate::updateItem(QDeclarativeItem *item, qreal perce
             att->setValue(attr.toUtf8(), path->attributeAt(attr, percent));
     }
     QPointF pf = path->pointAt(percent);
-    item->setX(pf.x() - item->width()*item->scale()/2);
-    item->setY(pf.y() - item->height()*item->scale()/2);
+    item->setX(qRound(pf.x() - item->width()*item->scale()/2));
+    item->setY(qRound(pf.y() - item->height()*item->scale()/2));
 }
 
 void QDeclarativePathViewPrivate::regenerate()
@@ -527,6 +528,33 @@ void QDeclarativePathView::setCurrentIndex(int idx)
 }
 
 /*!
+    \qmlmethod PathView::incrementCurrentIndex()
+
+    Increments the current index.
+*/
+void QDeclarativePathView::incrementCurrentIndex()
+{
+    setCurrentIndex(currentIndex()+1);
+}
+
+
+/*!
+    \qmlmethod PathView::decrementCurrentIndex()
+
+    Decrements the current index.
+*/
+void QDeclarativePathView::decrementCurrentIndex()
+{
+    Q_D(QDeclarativePathView);
+    if (d->model && d->model->count()) {
+        int idx = currentIndex()-1;
+        if (idx < 0)
+            idx = d->model->count() - 1;
+        setCurrentIndex(idx);
+    }
+}
+
+/*!
     \qmlproperty real PathView::offset
 
     The offset specifies how far along the path the items are from their initial positions.
@@ -1312,6 +1340,7 @@ int QDeclarativePathViewPrivate::calcCurrentIndex()
         if (offset < 0)
             offset += model->count();
         current = qRound(qAbs(qmlMod(model->count() - offset, model->count())));
+        current = current % model->count();
     }
 
     return current;
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index 85f47fd..349a01c 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -132,6 +132,10 @@ public:
 
     static QDeclarativePathViewAttached *qmlAttachedProperties(QObject *);
 
+public Q_SLOTS:
+    void incrementCurrentIndex();
+    void decrementCurrentIndex();
+
 Q_SIGNALS:
     void currentIndexChanged();
     void offsetChanged();
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 62d0b89..0e16f66 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -438,7 +438,8 @@ void tst_QDeclarativePathView::pathMoved()
 
     for(int i=0; i(pathview, "wrapper", i);
-        QCOMPARE(curItem->pos() + offset, path->pointAt(0.25 + i*0.25));
+        QPointF itemPos(path->pointAt(0.25 + i*0.25));
+        QCOMPARE(curItem->pos() + offset, QPointF(qRound(itemPos.x()), qRound(itemPos.y())));
     }
 
     pathview->setOffset(0.0);
@@ -479,13 +480,36 @@ void tst_QDeclarativePathView::setCurrentIndex()
     QCOMPARE(canvas->rootObject()->property("currentB").toInt(), 0);
 
     pathview->setCurrentIndex(2);
-    QTest::qWait(1000);
 
     firstItem = findItem(pathview, "wrapper", 2);
-    QCOMPARE(firstItem->pos() + offset, start);
+    QTRY_COMPARE(firstItem->pos() + offset, start);
     QCOMPARE(canvas->rootObject()->property("currentA").toInt(), 2);
     QCOMPARE(canvas->rootObject()->property("currentB").toInt(), 2);
 
+    pathview->decrementCurrentIndex();
+    QTRY_COMPARE(pathview->currentIndex(), 1);
+    firstItem = findItem(pathview, "wrapper", 1);
+    QVERIFY(firstItem);
+    QTRY_COMPARE(firstItem->pos() + offset, start);
+
+    pathview->decrementCurrentIndex();
+    QTRY_COMPARE(pathview->currentIndex(), 0);
+    firstItem = findItem(pathview, "wrapper", 0);
+    QVERIFY(firstItem);
+    QTRY_COMPARE(firstItem->pos() + offset, start);
+
+    pathview->decrementCurrentIndex();
+    QTRY_COMPARE(pathview->currentIndex(), 3);
+    firstItem = findItem(pathview, "wrapper", 3);
+    QVERIFY(firstItem);
+    QTRY_COMPARE(firstItem->pos() + offset, start);
+
+    pathview->incrementCurrentIndex();
+    QTRY_COMPARE(pathview->currentIndex(), 0);
+    firstItem = findItem(pathview, "wrapper", 0);
+    QVERIFY(firstItem);
+    QTRY_COMPARE(firstItem->pos() + offset, start);
+
     delete canvas;
 }
 
-- 
cgit v0.12


From 5220b879a19b4fa1e28829e724c1ad12e85566f4 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Thu, 13 May 2010 15:21:38 +1000
Subject: ListModel::get() should return undefined if bad index specified

---
 src/declarative/util/qdeclarativelistmodel.cpp     | 28 ++++++++++++++--------
 .../tst_qdeclarativelistmodel.cpp                  |  4 +++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index a8a445a..a8e1be8 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -537,10 +537,9 @@ void QDeclarativeListModel::append(const QScriptValue& valuemap)
 */
 QScriptValue QDeclarativeListModel::get(int index) const
 {
-    if (index >= count() || index < 0) {
+    // the internal flat/nested class takes care of return value for bad index
+    if (index >= count() || index < 0) 
         qmlInfo(this) << tr("get: index %1 out of range").arg(index);
-        return 0;
-    }
 
     return m_flat ? m_flat->get(index) : m_nested->get(index);
 }
@@ -930,13 +929,14 @@ bool FlatListModel::insert(int index, const QScriptValue &value)
 
 QScriptValue FlatListModel::get(int index) const
 {
-    Q_ASSERT(index >= 0 && index < m_values.count());
-
     QScriptEngine *scriptEngine = m_scriptEngine ? m_scriptEngine : QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(m_listModel));
 
-    if (!scriptEngine)
+    if (!scriptEngine) 
         return 0;
 
+    if (index < 0 || index >= m_values.count())
+        return scriptEngine->undefinedValue();
+
     QScriptValue rv = scriptEngine->newObject();
 
     QHash row = m_values.at(index);
@@ -1183,13 +1183,21 @@ bool NestedListModel::append(const QScriptValue& valuemap)
 }
 
 QScriptValue NestedListModel::get(int index) const
-{
-    ModelNode *node = qvariant_cast(_root->values.at(index));
-    if (!node)
-        return 0;
+{   
     QDeclarativeEngine *eng = qmlEngine(m_listModel);
     if (!eng) 
         return 0;
+
+    if (index < 0 || index >= count()) {
+        QScriptEngine *seng = QDeclarativeEnginePrivate::getScriptEngine(eng);
+        if (seng)
+            return seng->undefinedValue();
+        return 0;
+    }
+
+    ModelNode *node = qvariant_cast(_root->values.at(index));
+    if (!node)
+        return 0;
     
     return QDeclarativeEnginePrivate::qmlScriptObject(node->object(this), eng);
 }
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index ec97461..aed4781 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -282,7 +282,9 @@ void tst_qdeclarativelistmodel::dynamic()
     int actual = e.evaluate().toInt();
     if (e.hasError())
         qDebug() << e.error(); // errors not expected
-    QVERIFY(!e.hasError());
+
+    if (QTest::currentDataTag() != QLatin1String("clear3") && QTest::currentDataTag() != QLatin1String("remove3"))
+        QVERIFY(!e.hasError());
     QCOMPARE(actual,result);
 }
 
-- 
cgit v0.12


From 2e04552969f925f7e32e2757dc2ebb3e93936a03 Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Thu, 13 May 2010 15:23:23 +1000
Subject: Follow-up on Flickable changes.

- flicking and moving properties will not be removed
- onMovement* and onFlick* signals are back in

Reviewed-by: Martin Jones
---
 src/declarative/QmlChanges.txt                     |  5 +-
 .../graphicsitems/qdeclarativeflickable.cpp        | 80 ++++++++++++++++++----
 .../graphicsitems/qdeclarativeflickable_p.h        | 16 +++--
 .../graphicsitems/qdeclarativegridview.cpp         | 19 +++--
 .../graphicsitems/qdeclarativelistview.cpp         | 18 +++--
 5 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 9ab3f08..604c14c 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -3,10 +3,9 @@ The changes below are pre Qt 4.7.0 RC
 
 Flickable:
    - overShoot is replaced by boundsBehavior enumeration
-   - flicking is replaced by flickingHorizontally and flickingVertically
-   - moving is replaced by movingHorizontally and movingVertically
+   - flickingHorizontally and flickingVertically properties added
+   - movingHorizontally and movingVertically properties added
    - flickDirection is renamed flickableDirection
-   - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed
 Component: isReady, isLoading, isError and isNull properties removed, use
     status property instead
 QList models no longer provide properties in model object.  The
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index a7a8983..a03a51d 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -230,13 +230,17 @@ void QDeclarativeFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal
         timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
         if (!flickingHorizontally && q->xflick()) {
             flickingHorizontally = true;
-            emit q->flickingChanged(); // deprecated
+            emit q->flickingChanged();
             emit q->flickingHorizontallyChanged();
+            if (!flickingVertically)
+                emit q->flickStarted();
         }
         if (!flickingVertically && q->yflick()) {
             flickingVertically = true;
-            emit q->flickingChanged(); // deprecated
+            emit q->flickingChanged();
             emit q->flickingVerticallyChanged();
+            if (!flickingHorizontally)
+                emit q->flickStarted();
         }
     } else {
         timeline.reset(data.move);
@@ -365,6 +369,37 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
 */
 
 /*!
+    \qmlsignal Flickable::onMovementStarted()
+
+    This handler is called when the view begins moving due to user
+    interaction.
+*/
+
+/*!
+    \qmlsignal Flickable::onMovementEnded()
+
+    This handler is called when the view stops moving due to user
+    interaction.  If a flick was generated, this handler will
+    be triggered once the flick stops.  If a flick was not
+    generated, the handler will be triggered when the
+    user stops dragging - i.e. a mouse or touch release.
+*/
+
+/*!
+    \qmlsignal Flickable::onFlickStarted()
+
+    This handler is called when the view is flicked.  A flick
+    starts from the point that the mouse or touch is released,
+    while still in motion.
+*/
+
+/*!
+    \qmlsignal Flickable::onFlickEnded()
+
+    This handler is called when the view stops moving due to a flick.
+*/
+
+/*!
     \qmlproperty real Flickable::visibleArea.xPosition
     \qmlproperty real Flickable::visibleArea.widthRatio
     \qmlproperty real Flickable::visibleArea.yPosition
@@ -474,9 +509,10 @@ void QDeclarativeFlickable::setInteractive(bool interactive)
             d->vTime = d->timeline.time();
             d->flickingHorizontally = false;
             d->flickingVertically = false;
-            emit flickingChanged(); // deprecated
+            emit flickingChanged();
             emit flickingHorizontallyChanged();
             emit flickingVerticallyChanged();
+            emit flickEnded();
         }
         emit interactiveChanged();
     }
@@ -799,8 +835,10 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
             d->vData.velocity = qMin(event->delta() - d->vData.smoothVelocity.value(), qreal(-250.0));
         d->flickingVertically = false;
         d->flickY(d->vData.velocity);
-        if (d->flickingVertically)
+        if (d->flickingVertically) {
+            d->vMoved = true;
             movementStarting();
+        }
         event->accept();
     } else if (xflick()) {
         if (event->delta() > 0)
@@ -809,8 +847,10 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
             d->hData.velocity = qMin(event->delta() - d->hData.smoothVelocity.value(), qreal(-250.0));
         d->flickingHorizontally = false;
         d->flickX(d->hData.velocity);
-        if (d->flickingHorizontally)
+        if (d->flickingHorizontally) {
+            d->hMoved = true;
             movementStarting();
+        }
         event->accept();
     } else {
         QDeclarativeItem::wheelEvent(event);
@@ -1269,11 +1309,11 @@ void QDeclarativeFlickable::setFlickDeceleration(qreal deceleration)
 bool QDeclarativeFlickable::isFlicking() const
 {
     Q_D(const QDeclarativeFlickable);
-    qmlInfo(this) << "'flicking' is deprecated. Please use 'flickingHorizontally' and 'flickingVertically' instead.";
     return d->flickingHorizontally ||  d->flickingVertically;
 }
 
 /*!
+    \qmlproperty bool Flickable::flicking
     \qmlproperty bool Flickable::flickingHorizontally
     \qmlproperty bool Flickable::flickingVertically
 
@@ -1322,11 +1362,11 @@ void QDeclarativeFlickable::setPressDelay(int delay)
 bool QDeclarativeFlickable::isMoving() const
 {
     Q_D(const QDeclarativeFlickable);
-    qmlInfo(this) << "'moving' is deprecated. Please use 'movingHorizontally' or 'movingVertically' instead.";
     return d->movingHorizontally || d->movingVertically;
 }
 
 /*!
+    \qmlproperty bool Flickable::moving
     \qmlproperty bool Flickable::movingHorizontally
     \qmlproperty bool Flickable::movingVertically
 
@@ -1350,13 +1390,17 @@ void QDeclarativeFlickable::movementStarting()
     Q_D(QDeclarativeFlickable);
     if (d->hMoved && !d->movingHorizontally) {
         d->movingHorizontally = true;
-        emit movingChanged(); // deprecated
+        emit movingChanged();
         emit movingHorizontallyChanged();
+        if (!d->movingVertically)
+            emit movementStarted();
     }
-    if (d->vMoved && !d->movingVertically) {
+    else if (d->vMoved && !d->movingVertically) {
         d->movingVertically = true;
-        emit movingChanged(); // deprecated
+        emit movingChanged();
         emit movingVerticallyChanged();
+        if (!d->movingHorizontally)
+            emit movementStarted();
     }
 }
 
@@ -1365,25 +1409,33 @@ void QDeclarativeFlickable::movementEnding()
     Q_D(QDeclarativeFlickable);
     if (d->flickingHorizontally) {
         d->flickingHorizontally = false;
-        emit flickingChanged(); // deprecated
+        emit flickingChanged();
         emit flickingHorizontallyChanged();
+        if (!d->flickingVertically)
+           emit flickEnded();
     }
     if (d->flickingVertically) {
         d->flickingVertically = false;
-        emit flickingChanged(); // deprecated
+        emit flickingChanged();
         emit flickingVerticallyChanged();
+        if (!d->flickingHorizontally)
+           emit flickEnded();
     }
     if (d->movingHorizontally) {
         d->movingHorizontally = false;
         d->hMoved = false;
-        emit movingChanged(); // deprecated
+        emit movingChanged();
         emit movingHorizontallyChanged();
+        if (!d->movingVertically)
+            emit movementEnded();
     }
     if (d->movingVertically) {
         d->movingVertically = false;
         d->vMoved = false;
-        emit movingChanged(); // deprecated
+        emit movingChanged();
         emit movingVerticallyChanged();
+        if (!d->movingHorizontally)
+            emit movementEnded();
     }
     d->hData.smoothVelocity.setValue(0);
     d->vData.smoothVelocity.setValue(0);
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index 7944e2b..05887b8 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -68,10 +68,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem
     Q_PROPERTY(BoundsBehavior boundsBehavior READ boundsBehavior WRITE setBoundsBehavior NOTIFY boundsBehaviorChanged)
     Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged)
     Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged)
-    Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged) // deprecated
+    Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged)
     Q_PROPERTY(bool movingHorizontally READ isMovingHorizontally NOTIFY movingHorizontallyChanged)
     Q_PROPERTY(bool movingVertically READ isMovingVertically NOTIFY movingVerticallyChanged)
-    Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) // deprecated
+    Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
     Q_PROPERTY(bool flickingHorizontally READ isFlickingHorizontally NOTIFY flickingHorizontallyChanged)
     Q_PROPERTY(bool flickingVertically READ isFlickingVertically NOTIFY flickingVerticallyChanged)
     Q_PROPERTY(FlickableDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickableDirectionChanged) // deprecated
@@ -120,10 +120,10 @@ public:
     qreal contentY() const;
     void setContentY(qreal pos);
 
-    bool isMoving() const; // deprecated
+    bool isMoving() const;
     bool isMovingHorizontally() const;
     bool isMovingVertically() const;
-    bool isFlicking() const; // deprecated
+    bool isFlicking() const;
     bool isFlickingHorizontally() const;
     bool isFlickingVertically() const;
 
@@ -160,10 +160,10 @@ Q_SIGNALS:
     void contentHeightChanged();
     void contentXChanged();
     void contentYChanged();
-    void movingChanged(); // deprecated
+    void movingChanged();
     void movingHorizontallyChanged();
     void movingVerticallyChanged();
-    void flickingChanged(); // deprecated
+    void flickingChanged();
     void flickingHorizontallyChanged();
     void flickingVerticallyChanged();
     void horizontalVelocityChanged();
@@ -177,6 +177,10 @@ Q_SIGNALS:
     void maximumFlickVelocityChanged();
     void flickDecelerationChanged();
     void pressDelayChanged();
+    void movementStarted();
+    void movementEnded();
+    void flickStarted();
+    void flickEnded();
 
 protected:
     virtual bool sceneEventFilter(QGraphicsItem *, QEvent *);
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 396acd0..fe78c84 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -347,8 +347,7 @@ public:
 void QDeclarativeGridViewPrivate::init()
 {
     Q_Q(QDeclarativeGridView);
-    QObject::connect(q, SIGNAL(movingHorizontallyChanged()), q, SLOT(animStopped()));
-    QObject::connect(q, SIGNAL(movingVerticallyChanged()), q, SLOT(animStopped()));
+    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
     q->setFlag(QGraphicsItem::ItemIsFocusScope);
     q->setFlickableDirection(QDeclarativeFlickable::VerticalFlick);
     addItemChangeListener(this, Geometry);
@@ -878,13 +877,15 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
         timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
         if (!flickingHorizontally && q->xflick()) {
             flickingHorizontally = true;
-            emit q->flickingChanged(); // deprecated
+            emit q->flickingChanged();
             emit q->flickingHorizontallyChanged();
+            emit q->flickStarted();
         }
         if (!flickingVertically && q->yflick()) {
             flickingVertically = true;
-            emit q->flickingChanged(); // deprecated
+            emit q->flickingChanged();
             emit q->flickingVerticallyChanged();
+            emit q->flickStarted();
         }
     } else {
         timeline.reset(data.move);
@@ -2311,13 +2312,9 @@ void QDeclarativeGridView::destroyingItem(QDeclarativeItem *item)
 void QDeclarativeGridView::animStopped()
 {
     Q_D(QDeclarativeGridView);
-    if ((!d->movingVertically && d->flow == QDeclarativeGridView::LeftToRight)
-        || (!d->movingHorizontally && d->flow == QDeclarativeGridView::TopToBottom))
-    {
-        d->bufferMode = QDeclarativeGridViewPrivate::NoBuffer;
-        if (d->haveHighlightRange && d->highlightRange == QDeclarativeGridView::StrictlyEnforceRange)
-            d->updateHighlight();
-    }
+    d->bufferMode = QDeclarativeGridViewPrivate::NoBuffer;
+    if (d->haveHighlightRange && d->highlightRange == QDeclarativeGridView::StrictlyEnforceRange)
+        d->updateHighlight();
 }
 
 void QDeclarativeGridView::refill()
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 20106cb..46e9ce3 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -525,8 +525,7 @@ void QDeclarativeListViewPrivate::init()
     Q_Q(QDeclarativeListView);
     q->setFlag(QGraphicsItem::ItemIsFocusScope);
     addItemChangeListener(this, Geometry);
-    QObject::connect(q, SIGNAL(movingHorizontallyChanged()), q, SLOT(animStopped()));
-    QObject::connect(q, SIGNAL(movingVerticallyChanged()), q, SLOT(animStopped()));
+    QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
     q->setFlickableDirection(QDeclarativeFlickable::VerticalFlick);
     ::memset(sectionCache, 0, sizeof(QDeclarativeItem*) * sectionCacheSize);
 }
@@ -1260,13 +1259,15 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
             timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
             if (!flickingHorizontally && q->xflick()) {
                 flickingHorizontally = true;
-                emit q->flickingChanged(); // deprecated
+                emit q->flickingChanged();
                 emit q->flickingHorizontallyChanged();
+                emit q->flickStarted();
             }
             if (!flickingVertically && q->yflick()) {
                 flickingVertically = true;
-                emit q->flickingChanged(); // deprecated
+                emit q->flickingChanged();
                 emit q->flickingVerticallyChanged();
+                emit q->flickStarted();
             }
             correctFlick = true;
         } else {
@@ -2890,12 +2891,9 @@ void QDeclarativeListView::destroyingItem(QDeclarativeItem *item)
 void QDeclarativeListView::animStopped()
 {
     Q_D(QDeclarativeListView);
-    if ((!d->movingVertically && d->orient == QDeclarativeListView::Vertical) || (!d->movingHorizontally && d->orient == QDeclarativeListView::Horizontal))
-    {
-        d->bufferMode = QDeclarativeListViewPrivate::NoBuffer;
-        if (d->haveHighlightRange && d->highlightRange == QDeclarativeListView::StrictlyEnforceRange)
-            d->updateHighlight();
-    }
+    d->bufferMode = QDeclarativeListViewPrivate::NoBuffer;
+    if (d->haveHighlightRange && d->highlightRange == QDeclarativeListView::StrictlyEnforceRange)
+        d->updateHighlight();
 }
 
 QDeclarativeListViewAttached *QDeclarativeListView::qmlAttachedProperties(QObject *obj)
-- 
cgit v0.12


From 29559bb440529e4afd766cad61578947e86fa948 Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Thu, 13 May 2010 16:41:42 +0200
Subject: Note that you need to unset a flag to create a visual item

This needs to be documented as long as its true, or else it's a common
source of confusion when writing QML items.
---
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 9433ba0..f251ba1 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1194,7 +1194,10 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec
     width and height, \l {anchor-layout}{anchoring} and key handling.
 
     You can subclass QDeclarativeItem to provide your own custom visual item that inherits
-    these features.
+    these features. Note that, because it does not draw anything, QDeclarativeItem sets the
+    QGraphicsItem::ItemHasNoContents flag. If you subclass QDeclarativeItem to create a visual
+    item, you will need to unset this flag.
+
 */
 
 /*!
-- 
cgit v0.12


From 3c1cb52aae6f7a5bd94c28a0b183e2375526724b Mon Sep 17 00:00:00 2001
From: Simon Hausmann 
Date: Mon, 10 May 2010 12:45:27 +0200
Subject: Removed dependency of QDeclarativeWebView to private Qt (Declarative)
 API

Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView
and its tiled backing store.
---
 .../webbrowser/content/FlickableWebView.qml        |  29 +--
 src/imports/webkit/qdeclarativewebview.cpp         | 237 ++++++++-------------
 src/imports/webkit/qdeclarativewebview_p.h         |  32 ++-
 3 files changed, 113 insertions(+), 185 deletions(-)

diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 7efbaa3..32d69d8 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -12,8 +12,8 @@ Flickable {
 
     id: flickable
     width: parent.width
-    contentWidth: Math.max(parent.width,webView.width*webView.scale)
-    contentHeight: Math.max(parent.height,webView.height*webView.scale)
+    contentWidth: Math.max(parent.width,webView.width)
+    contentHeight: Math.max(parent.height,webView.height)
     anchors.top: headerSpace.bottom
     anchors.bottom: parent.top
     anchors.left: parent.left
@@ -28,7 +28,6 @@ Flickable {
 
     WebView {
         id: webView
-        pixelCacheSize: 4000000
         transformOrigin: Item.TopLeft
 
         function fixUrl(url)
@@ -48,8 +47,6 @@ Flickable {
 
         url: fixUrl(webBrowser.urlString)
         smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions
-        smoothCache: true // We do want smooth rendering
-        fillColor: "white"
         focus: true
         zoomFactor: 1
 
@@ -59,14 +56,13 @@ Flickable {
         {
             if (centerX) {
                 var sc = zoom/contentsScale;
-                scaleAnim.to = sc;
+                scaleAnim.to = zoom;
                 flickVX.from = flickable.contentX
                 flickVX.to = Math.max(0,Math.min(centerX-flickable.width/2,webView.width*sc-flickable.width))
                 finalX.value = flickVX.to
                 flickVY.from = flickable.contentY
                 flickVY.to = Math.max(0,Math.min(centerY-flickable.height/2,webView.height*sc-flickable.height))
                 finalY.value = flickVY.to
-                finalZoom.value = zoom
                 quickZoom.start()
             }
         }
@@ -74,8 +70,8 @@ Flickable {
         Keys.onLeftPressed: webView.contentsScale -= 0.1
         Keys.onRightPressed: webView.contentsScale += 0.1
 
-        preferredWidth: flickable.width*zoomFactor
-        preferredHeight: flickable.height*zoomFactor
+        preferredWidth: flickable.width
+        preferredHeight: flickable.height
         contentsScale: 1/zoomFactor
         onContentsSizeChanged: {
             // zoom out
@@ -108,9 +104,8 @@ Flickable {
                 NumberAnimation {
                     id: scaleAnim
                     target: webView
-                    property: "scale"
-                    from: 1
-                    to: 0 // set before calling
+                    property: "contentsScale"
+                    // the to property is set before calling
                     easing.type: Easing.Linear
                     duration: 200
                 }
@@ -133,16 +128,6 @@ Flickable {
                     to: 0 // set before calling
                 }
             }
-            PropertyAction {
-                id: finalZoom
-                target: webView
-                property: "contentsScale"
-            }
-            PropertyAction {
-                target: webView
-                property: "scale"
-                value: 1.0
-            }
             // Have to set the contentXY, since the above 2
             // size changes may have started a correction if
             // contentsScale < 1.0.
diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 9571470..9e24007 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -42,11 +42,9 @@
 #include "qdeclarativewebview_p.h"
 #include "qdeclarativewebview_p_p.h"
 
-#include 
-
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -61,29 +59,29 @@
 #include 
 #include 
 #include 
-#include 
 
 QT_BEGIN_NAMESPACE
 
 static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system
 
-class QDeclarativeWebViewPrivate : public QDeclarativePaintedItemPrivate
+class QDeclarativeWebViewPrivate
 {
-    Q_DECLARE_PUBLIC(QDeclarativeWebView)
-
 public:
-    QDeclarativeWebViewPrivate()
-      : QDeclarativePaintedItemPrivate(), page(0), preferredwidth(0), preferredheight(0),
+    QDeclarativeWebViewPrivate(QDeclarativeWebView* qq)
+      : q(qq), page(0), preferredwidth(0), preferredheight(0),
             progress(1.0), status(QDeclarativeWebView::Null), pending(PendingNone),
             newWindowComponent(0), newWindowParent(0),
             pressTime(400),
             rendering(true)
     {
+        QObject::connect(q, SIGNAL(focusChanged(bool)), q, SLOT(propagateFocusToWebPage(bool)));
     }
-    void focusChanged(bool);
+
+    QDeclarativeWebView *q;
 
     QUrl url; // page url might be different if it has not loaded yet
     QWebPage *page;
+    QGraphicsWebView* view;
 
     int preferredwidth, preferredheight;
     qreal progress;
@@ -101,7 +99,6 @@ public:
     QPoint pressPoint;
     int pressTime; // milliseconds before it's a "hold"
 
-
     static void windowObjects_append(QDeclarativeListProperty *prop, QObject *o) {
         static_cast(prop->data)->windowObjects.append(o);
         static_cast(prop->data)->updateWindowObjects();
@@ -169,34 +166,39 @@ public:
 */
 
 QDeclarativeWebView::QDeclarativeWebView(QDeclarativeItem *parent)
-  : QDeclarativePaintedItem(*(new QDeclarativeWebViewPrivate), parent)
+  : QDeclarativeItem(parent)
 {
     init();
 }
 
 QDeclarativeWebView::~QDeclarativeWebView()
 {
-    Q_D(QDeclarativeWebView);
     delete d->page;
+    delete d;
 }
 
 void QDeclarativeWebView::init()
 {
-    Q_D(QDeclarativeWebView);
+    d = new QDeclarativeWebViewPrivate(this);
 
     QWebSettings::enablePersistentStorage();
 
     setAcceptHoverEvents(true);
     setAcceptedMouseButtons(Qt::LeftButton);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
+    setFlag(QGraphicsItem::ItemHasNoContents, true);
+    setClip(true);
 
     d->page = 0;
+    d->view = new QGraphicsWebView(this);
+    d->view->setResizesToContents(true);
+    d->view->setFlag(QGraphicsItem::ItemStacksBehindParent, true);
+    connect(d->view, SIGNAL(geometryChanged()), this, SLOT(updateDeclarativeWebViewSize()));
+    connect(d->view, SIGNAL(scaleChanged()), this, SIGNAL(contentsScaleChanged()));
 }
 
 void QDeclarativeWebView::componentComplete()
 {
-    QDeclarativePaintedItem::componentComplete();
-    Q_D(QDeclarativeWebView);
+    QDeclarativeItem::componentComplete();
     switch (d->pending) {
         case QDeclarativeWebViewPrivate::PendingUrl:
             setUrl(d->pending_url);
@@ -216,7 +218,6 @@ void QDeclarativeWebView::componentComplete()
 
 QDeclarativeWebView::Status QDeclarativeWebView::status() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->status;
 }
 
@@ -230,13 +231,11 @@ QDeclarativeWebView::Status QDeclarativeWebView::status() const
 */
 qreal QDeclarativeWebView::progress() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->progress;
 }
 
 void QDeclarativeWebView::doLoadStarted()
 {
-    Q_D(QDeclarativeWebView);
 
     if (!d->url.isEmpty()) {
         d->status = Loading;
@@ -247,7 +246,6 @@ void QDeclarativeWebView::doLoadStarted()
 
 void QDeclarativeWebView::doLoadProgress(int p)
 {
-    Q_D(QDeclarativeWebView);
     if (d->progress == p/100.0)
         return;
     d->progress = p/100.0;
@@ -256,12 +254,7 @@ void QDeclarativeWebView::doLoadProgress(int p)
 
 void QDeclarativeWebView::pageUrlChanged()
 {
-    Q_D(QDeclarativeWebView);
-
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
-    expandToWebPage();
+    updateContentsSize();
 
     if ((d->url.isEmpty() && page()->mainFrame()->url() != QUrl(QLatin1String("about:blank")))
         || (d->url != page()->mainFrame()->url() && !page()->mainFrame()->url().isEmpty()))
@@ -275,7 +268,6 @@ void QDeclarativeWebView::pageUrlChanged()
 
 void QDeclarativeWebView::doLoadFinished(bool ok)
 {
-    Q_D(QDeclarativeWebView);
 
     if (title().isEmpty())
         pageUrlChanged(); // XXX bug 232556 - pages with no title never get urlChanged()
@@ -302,21 +294,17 @@ void QDeclarativeWebView::doLoadFinished(bool ok)
 */
 QUrl QDeclarativeWebView::url() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->url;
 }
 
 void QDeclarativeWebView::setUrl(const QUrl &url)
 {
-    Q_D(QDeclarativeWebView);
     if (url == d->url)
         return;
 
     if (isComponentComplete()) {
         d->url = url;
-        page()->setViewportSize(QSize(
-            d->preferredwidth>0 ? d->preferredwidth : width(),
-            d->preferredheight>0 ? d->preferredheight : height()));
+        updateContentsSize();
         QUrl seturl = url;
         if (seturl.isEmpty())
             seturl = QUrl(QLatin1String("about:blank"));
@@ -338,16 +326,14 @@ void QDeclarativeWebView::setUrl(const QUrl &url)
 */
 int QDeclarativeWebView::preferredWidth() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->preferredwidth;
 }
 
 void QDeclarativeWebView::setPreferredWidth(int iw)
 {
-    Q_D(QDeclarativeWebView);
     if (d->preferredwidth == iw) return;
     d->preferredwidth = iw;
-    //expandToWebPage();
+    updateContentsSize();
     emit preferredWidthChanged();
 }
 
@@ -358,14 +344,14 @@ void QDeclarativeWebView::setPreferredWidth(int iw)
 */
 int QDeclarativeWebView::preferredHeight() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->preferredheight;
 }
+
 void QDeclarativeWebView::setPreferredHeight(int ih)
 {
-    Q_D(QDeclarativeWebView);
     if (d->preferredheight == ih) return;
     d->preferredheight = ih;
+    updateContentsSize();
     emit preferredHeightChanged();
 }
 
@@ -383,55 +369,45 @@ QVariant QDeclarativeWebView::evaluateJavaScript(const QString &scriptSource)
     return this->page()->mainFrame()->evaluateJavaScript(scriptSource);
 }
 
-void QDeclarativeWebViewPrivate::focusChanged(bool hasFocus)
+void QDeclarativeWebView::propagateFocusToWebPage(bool hasFocus)
 {
-    Q_Q(QDeclarativeWebView);
     QFocusEvent e(hasFocus ? QEvent::FocusIn : QEvent::FocusOut);
-    q->page()->event(&e);
-    QDeclarativeItemPrivate::focusChanged(hasFocus);
+    page()->event(&e);
 }
 
-void QDeclarativeWebView::initialLayout()
+void QDeclarativeWebView::updateDeclarativeWebViewSize()
 {
-    // nothing useful to do at this point
+    QSizeF size = d->view->geometry().size() * contentsScale();
+    setImplicitWidth(size.width());
+    setImplicitHeight(size.height());
 }
 
-void QDeclarativeWebView::noteContentsSizeChanged(const QSize&)
+void QDeclarativeWebView::initialLayout()
 {
-    expandToWebPage();
+    // nothing useful to do at this point
 }
 
-void QDeclarativeWebView::expandToWebPage()
+void QDeclarativeWebView::updateContentsSize()
 {
-    Q_D(QDeclarativeWebView);
-    QSize cs = page()->mainFrame()->contentsSize();
-    if (cs.width() < d->preferredwidth)
-        cs.setWidth(d->preferredwidth);
-    if (cs.height() < d->preferredheight)
-        cs.setHeight(d->preferredheight);
-    if (widthValid())
-        cs.setWidth(width());
-    if (heightValid())
-        cs.setHeight(height());
-    if (cs != page()->viewportSize()) {
-        page()->setViewportSize(cs);
-    }
-    if (cs != contentsSize())
-        setContentsSize(cs);
+    if (d->page)
+        d->page->setPreferredContentsSize(QSize(
+            d->preferredwidth>0 ? d->preferredwidth : width(),
+            d->preferredheight>0 ? d->preferredheight : height()));
 }
 
 void QDeclarativeWebView::geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry)
 {
-    if (newGeometry.size() != oldGeometry.size())
-        expandToWebPage();
-    QDeclarativePaintedItem::geometryChanged(newGeometry, oldGeometry);
-}
-
-void QDeclarativeWebView::paintPage(const QRect& r)
-{
-    dirtyCache(r);
-    update();
+    if (newGeometry.size() != oldGeometry.size() && d->page) {
+        QSize cs = d->page->preferredContentsSize();
+        if (widthValid())
+            cs.setWidth(width());
+        if (heightValid())
+            cs.setHeight(height());
+        if (cs != d->page->preferredContentsSize())
+            d->page->setPreferredContentsSize(cs);
+    }
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
 }
 
 /*!
@@ -473,7 +449,6 @@ void QDeclarativeWebView::paintPage(const QRect& r)
 */
 QDeclarativeListProperty QDeclarativeWebView::javaScriptWindowObjects()
 {
-    Q_D(QDeclarativeWebView);
     return QDeclarativeListProperty(this, d, &QDeclarativeWebViewPrivate::windowObjects_append);
 }
 
@@ -484,8 +459,7 @@ QDeclarativeWebViewAttached *QDeclarativeWebView::qmlAttachedProperties(QObject
 
 void QDeclarativeWebViewPrivate::updateWindowObjects()
 {
-    Q_Q(QDeclarativeWebView);
-    if (!q->isComponentComplete() || !page)
+    if (!q->isComponentCompletePublic() || !page)
         return;
 
     for (int ii = 0; ii < windowObjects.count(); ++ii) {
@@ -499,29 +473,17 @@ void QDeclarativeWebViewPrivate::updateWindowObjects()
 
 bool QDeclarativeWebView::renderingEnabled() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->rendering;
 }
 
 void QDeclarativeWebView::setRenderingEnabled(bool enabled)
 {
-    Q_D(QDeclarativeWebView);
     if (d->rendering == enabled)
         return;
     d->rendering = enabled;
     emit renderingEnabledChanged();
 
-    setCacheFrozen(!enabled);
-    if (enabled)
-        clearCache();
-}
-
-
-void QDeclarativeWebView::drawContents(QPainter *p, const QRect &r)
-{
-    Q_D(QDeclarativeWebView);
-    if (d->rendering)
-        page()->mainFrame()->render(p,r);
+    d->view->setTiledBackingStoreFrozen(!enabled);
 }
 
 QMouseEvent *QDeclarativeWebView::sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *e)
@@ -556,7 +518,6 @@ QMouseEvent *QDeclarativeWebView::sceneHoverMoveEventToMouseEvent(QGraphicsScene
     return me;
 }
 
-
 /*!
     \qmlsignal WebView::onDoubleClick(clickx,clicky)
 
@@ -588,7 +549,6 @@ void QDeclarativeWebView::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 */
 bool QDeclarativeWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom)
 {
-    Q_D(QDeclarativeWebView);
     if (contentsScale() >= maxzoom/zoomFactor())
         return false;
     qreal ozf = contentsScale();
@@ -617,13 +577,11 @@ bool QDeclarativeWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom)
 */
 int QDeclarativeWebView::pressGrabTime() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->pressTime;
 }
 
 void QDeclarativeWebView::setPressGrabTime(int ms)
 {
-    Q_D(QDeclarativeWebView);
     if (d->pressTime == ms) 
         return;
     d->pressTime = ms;
@@ -632,8 +590,6 @@ void QDeclarativeWebView::setPressGrabTime(int ms)
 
 void QDeclarativeWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D(QDeclarativeWebView);
-
     setFocus (true);
     QMouseEvent *me = sceneMouseEventToMouseEvent(event);
 
@@ -661,14 +617,12 @@ void QDeclarativeWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
         );
     delete me;
     if (!event->isAccepted()) {
-        QDeclarativePaintedItem::mousePressEvent(event);
+        QDeclarativeItem::mousePressEvent(event);
     }
 }
 
 void QDeclarativeWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D(QDeclarativeWebView);
-
     QMouseEvent *me = sceneMouseEventToMouseEvent(event);
     page()->event(me);
     d->pressTimer.stop();
@@ -685,7 +639,7 @@ void QDeclarativeWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         );
     delete me;
     if (!event->isAccepted()) {
-        QDeclarativePaintedItem::mouseReleaseEvent(event);
+        QDeclarativeItem::mouseReleaseEvent(event);
     }
     setKeepMouseGrab(false);
     ungrabMouse();
@@ -693,7 +647,6 @@ void QDeclarativeWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
 void QDeclarativeWebView::timerEvent(QTimerEvent *event)
 {
-    Q_D(QDeclarativeWebView);
     if (event->timerId() == d->pressTimer.timerId()) {
         d->pressTimer.stop();
         grabMouse();
@@ -703,8 +656,6 @@ void QDeclarativeWebView::timerEvent(QTimerEvent *event)
 
 void QDeclarativeWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    Q_D(QDeclarativeWebView);
-
     QMouseEvent *me = sceneMouseEventToMouseEvent(event);
     if (d->pressTimer.isActive()) {
         if ((me->pos() - d->pressPoint).manhattanLength() > QApplication::startDragDistance())  {
@@ -728,9 +679,9 @@ void QDeclarativeWebView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     }
     delete me;
     if (!event->isAccepted())
-        QDeclarativePaintedItem::mouseMoveEvent(event);
-
+        QDeclarativeItem::mouseMoveEvent(event);
 }
+
 void QDeclarativeWebView::hoverMoveEvent (QGraphicsSceneHoverEvent * event)
 {
     QMouseEvent *me = sceneHoverMoveEventToMouseEvent(event);
@@ -744,21 +695,7 @@ void QDeclarativeWebView::hoverMoveEvent (QGraphicsSceneHoverEvent * event)
     );
     delete me;
     if (!event->isAccepted())
-        QDeclarativePaintedItem::hoverMoveEvent(event);
-}
-
-void QDeclarativeWebView::keyPressEvent(QKeyEvent* event)
-{
-    page()->event(event);
-    if (!event->isAccepted())
-        QDeclarativePaintedItem::keyPressEvent(event);
-}
-
-void QDeclarativeWebView::keyReleaseEvent(QKeyEvent* event)
-{
-    page()->event(event);
-    if (!event->isAccepted())
-        QDeclarativePaintedItem::keyReleaseEvent(event);
+        QDeclarativeItem::hoverMoveEvent(event);
 }
 
 bool QDeclarativeWebView::sceneEvent(QEvent *event) 
@@ -773,7 +710,7 @@ bool QDeclarativeWebView::sceneEvent(QEvent *event)
             } 
         } 
     } 
-    return QDeclarativePaintedItem::sceneEvent(event); 
+    return QDeclarativeItem::sceneEvent(event);
 } 
 
 
@@ -842,15 +779,11 @@ QPixmap QDeclarativeWebView::icon() const
 */
 void QDeclarativeWebView::setZoomFactor(qreal factor)
 {
-    Q_D(QDeclarativeWebView);
     if (factor == page()->mainFrame()->zoomFactor())
         return;
 
     page()->mainFrame()->setZoomFactor(factor);
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth*factor : width()*factor,
-        d->preferredheight>0 ? d->preferredheight*factor : height()*factor));
-    expandToWebPage();
+    updateContentsSize();
 
     emit zoomFactorChanged();
 }
@@ -868,37 +801,27 @@ qreal QDeclarativeWebView::zoomFactor() const
 */
 void QDeclarativeWebView::setStatusText(const QString& s)
 {
-    Q_D(QDeclarativeWebView);
     d->statusText = s;
     emit statusTextChanged();
 }
 
 void QDeclarativeWebView::windowObjectCleared()
 {
-    Q_D(QDeclarativeWebView);
     d->updateWindowObjects();
 }
 
 QString QDeclarativeWebView::statusText() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->statusText;
 }
 
 QWebPage *QDeclarativeWebView::page() const
 {
-    Q_D(const QDeclarativeWebView);
 
     if (!d->page) {
         QDeclarativeWebView *self = const_cast(this);
         QWebPage *wp = new QDeclarativeWebPage(self);
 
-        // QML items don't default to having a background,
-        // even though most we pages will set one anyway.
-        QPalette pal = QApplication::palette();
-        pal.setBrush(QPalette::Base, QColor::fromRgbF(0, 0, 0, 0));
-        wp->setPalette(pal);
-
         wp->setNetworkAccessManager(qmlEngine(this)->networkAccessManager());
 
         self->setPage(wp);
@@ -954,14 +877,12 @@ QWebPage *QDeclarativeWebView::page() const
 */
 QDeclarativeWebSettings *QDeclarativeWebView::settingsObject() const
 {
-    Q_D(const QDeclarativeWebView);
     d->settings.s = page()->settings();
     return &d->settings;
 }
 
 void QDeclarativeWebView::setPage(QWebPage *page)
 {
-    Q_D(QDeclarativeWebView);
     if (d->page == page)
         return;
     if (d->page) {
@@ -972,18 +893,15 @@ void QDeclarativeWebView::setPage(QWebPage *page)
         }
     }
     d->page = page;
-    d->page->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
+    updateContentsSize();
     d->page->mainFrame()->setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
     d->page->mainFrame()->setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
-    connect(d->page,SIGNAL(repaintRequested(QRect)),this,SLOT(paintPage(QRect)));
     connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SLOT(pageUrlChanged()));
     connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
     connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(iconChanged()));
     connect(d->page->mainFrame(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged()));
-    connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(noteContentsSizeChanged(QSize)));
     connect(d->page->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayout()));
+    connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SIGNAL(contentsSizeChanged(QSize)));
 
     connect(d->page,SIGNAL(loadStarted()),this,SLOT(doLoadStarted()));
     connect(d->page,SIGNAL(loadProgress(int)),this,SLOT(doLoadProgress(int)));
@@ -991,6 +909,10 @@ void QDeclarativeWebView::setPage(QWebPage *page)
     connect(d->page,SIGNAL(statusBarMessage(QString)),this,SLOT(setStatusText(QString)));
 
     connect(d->page->mainFrame(),SIGNAL(javaScriptWindowObjectCleared()),this,SLOT(windowObjectCleared()));
+
+    d->page->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, true);
+
+    d->view->setPage(page);
 }
 
 /*!
@@ -1045,10 +967,7 @@ QString QDeclarativeWebView::html() const
 */
 void QDeclarativeWebView::setHtml(const QString &html, const QUrl &baseUrl)
 {
-    Q_D(QDeclarativeWebView);
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
+    updateContentsSize();
     if (isComponentComplete())
         page()->mainFrame()->setHtml(html, baseUrl);
     else {
@@ -1061,10 +980,7 @@ void QDeclarativeWebView::setHtml(const QString &html, const QUrl &baseUrl)
 
 void QDeclarativeWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
 {
-    Q_D(QDeclarativeWebView);
-    page()->setViewportSize(QSize(
-        d->preferredwidth>0 ? d->preferredwidth : width(),
-        d->preferredheight>0 ? d->preferredheight : height()));
+    updateContentsSize();
 
     if (isComponentComplete())
         page()->mainFrame()->setContent(data,mimeType,qmlContext(this)->resolvedUrl(baseUrl));
@@ -1088,7 +1004,6 @@ QWebSettings *QDeclarativeWebView::settings() const
 
 QDeclarativeWebView *QDeclarativeWebView::createWindow(QWebPage::WebWindowType type)
 {
-    Q_D(QDeclarativeWebView);
     switch (type) {
         case QWebPage::WebBrowserWindow: {
             if (!d->newWindowComponent && d->newWindowParent)
@@ -1142,13 +1057,11 @@ QDeclarativeWebView *QDeclarativeWebView::createWindow(QWebPage::WebWindowType t
 */
 QDeclarativeComponent *QDeclarativeWebView::newWindowComponent() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->newWindowComponent;
 }
 
 void QDeclarativeWebView::setNewWindowComponent(QDeclarativeComponent *newWindow)
 {
-    Q_D(QDeclarativeWebView);
     if (newWindow == d->newWindowComponent)
         return;
     d->newWindowComponent = newWindow;
@@ -1165,13 +1078,11 @@ void QDeclarativeWebView::setNewWindowComponent(QDeclarativeComponent *newWindow
 */
 QDeclarativeItem *QDeclarativeWebView::newWindowParent() const
 {
-    Q_D(const QDeclarativeWebView);
     return d->newWindowParent;
 }
 
 void QDeclarativeWebView::setNewWindowParent(QDeclarativeItem *parent)
 {
-    Q_D(QDeclarativeWebView);
     if (parent == d->newWindowParent)
         return;
     if (d->newWindowParent && parent) {
@@ -1184,6 +1095,25 @@ void QDeclarativeWebView::setNewWindowParent(QDeclarativeItem *parent)
     emit newWindowParentChanged();    
 }
 
+QSize QDeclarativeWebView::contentsSize() const
+{
+    return d->page->mainFrame()->contentsSize() * contentsScale();
+}
+
+qreal QDeclarativeWebView::contentsScale() const
+{
+    return d->view->scale();
+}
+
+void QDeclarativeWebView::setContentsScale(qreal scale)
+{
+    if (scale == d->view->scale())
+        return;
+    d->view->setScale(scale);
+    updateDeclarativeWebViewSize();
+    emit contentsScaleChanged();
+}
+
 /*!
     Returns the area of the largest element at position (\a x,\a y) that is no larger
     than \a maxwidth by \a maxheight pixels.
@@ -1280,3 +1210,4 @@ QWebPage *QDeclarativeWebPage::createWindow(WebWindowType type)
 }
 
 QT_END_NAMESPACE
+
diff --git a/src/imports/webkit/qdeclarativewebview_p.h b/src/imports/webkit/qdeclarativewebview_p.h
index 81581d8..87bd938 100644
--- a/src/imports/webkit/qdeclarativewebview_p.h
+++ b/src/imports/webkit/qdeclarativewebview_p.h
@@ -42,12 +42,13 @@
 #ifndef QDECLARATIVEWEBVIEW_H
 #define QDECLARATIVEWEBVIEW_H
 
-#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 QT_BEGIN_HEADER
 
@@ -61,6 +62,7 @@ class QDeclarativeWebSettings;
 class QDeclarativeWebViewPrivate;
 class QNetworkRequest;
 class QDeclarativeWebView;
+class QDeclarativeWebViewPrivate;
 
 class QDeclarativeWebPage : public QWebPage
 {
@@ -85,7 +87,7 @@ class QDeclarativeWebViewAttached;
 
 //### TODO: browser plugins
 
-class QDeclarativeWebView : public QDeclarativePaintedItem
+class QDeclarativeWebView : public QDeclarativeItem
 {
     Q_OBJECT
 
@@ -120,6 +122,9 @@ class QDeclarativeWebView : public QDeclarativePaintedItem
 
     Q_PROPERTY(bool renderingEnabled READ renderingEnabled WRITE setRenderingEnabled NOTIFY renderingEnabledChanged)
 
+    Q_PROPERTY(QSize contentsSize READ contentsSize NOTIFY contentsSizeChanged)
+    Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
+
 public:
     QDeclarativeWebView(QDeclarativeItem *parent=0);
     ~QDeclarativeWebView();
@@ -182,6 +187,13 @@ public:
     QDeclarativeItem *newWindowParent() const;
     void setNewWindowParent(QDeclarativeItem *newWindow);
 
+    bool isComponentCompletePublic() const { return isComponentComplete(); }
+
+    QSize contentsSize() const;
+
+    void setContentsScale(qreal scale);
+    qreal contentsScale() const;
+
 Q_SIGNALS:
     void preferredWidthChanged();
     void preferredHeightChanged();
@@ -197,6 +209,8 @@ Q_SIGNALS:
     void newWindowComponentChanged();
     void newWindowParentChanged();
     void renderingEnabledChanged();
+    void contentsSizeChanged(const QSize&);
+    void contentsScaleChanged();
 
     void loadStarted();
     void loadFinished();
@@ -212,38 +226,36 @@ public Q_SLOTS:
     QVariant evaluateJavaScript(const QString&);
 
 private Q_SLOTS:
-    void expandToWebPage();
-    void paintPage(const QRect&);
     void doLoadStarted();
     void doLoadProgress(int p);
     void doLoadFinished(bool ok);
     void setStatusText(const QString&);
     void windowObjectCleared();
     void pageUrlChanged();
-    void noteContentsSizeChanged(const QSize&);
     void initialLayout();
 
-protected:
-    void drawContents(QPainter *, const QRect &);
+    void propagateFocusToWebPage(bool);
 
+    void updateDeclarativeWebViewSize();
+
+protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
     void timerEvent(QTimerEvent *event);
     void hoverMoveEvent (QGraphicsSceneHoverEvent * event);
-    void keyPressEvent(QKeyEvent* event);
-    void keyReleaseEvent(QKeyEvent* event);
     virtual void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry);
     virtual bool sceneEvent(QEvent *event);
     QDeclarativeWebView *createWindow(QWebPage::WebWindowType type);
 
 private:
+    void updateContentsSize();
     void init();
     virtual void componentComplete();
     Q_DISABLE_COPY(QDeclarativeWebView)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeWebView)
+    QDeclarativeWebViewPrivate* d;
     QMouseEvent *sceneMouseEventToMouseEvent(QGraphicsSceneMouseEvent *);
     QMouseEvent *sceneHoverMoveEventToMouseEvent(QGraphicsSceneHoverEvent *);
     friend class QDeclarativeWebPage;
-- 
cgit v0.12


From cce4e4393277298b5b5246ab79e615173b2cb13a Mon Sep 17 00:00:00 2001
From: Alan Alpert 
Date: Thu, 13 May 2010 18:36:15 +0200
Subject: Minor declarative webview tweaks

Added a comment to the class docs, and cleaned up the visual tests a
little. However the visual tests are old and text heavy, and since we
never seem to check them we might wait on updating them for a little
longer.
---
 src/imports/webkit/qdeclarativewebview.cpp         |   7 +-
 .../qmlvisual/qfxwebview/autosize/autosize.qml     |  61 ----
 .../qfxwebview/autosize/data-X11/autosize.0.png    | Bin 6886 -> 0 bytes
 .../qfxwebview/autosize/data-X11/autosize.qml      |  83 -----
 .../qfxwebview/autosize/data/autosize.0.png        | Bin 6886 -> 0 bytes
 .../qfxwebview/autosize/data/autosize.qml          |  83 -----
 .../qmlvisual/webview/autosize/autosize.qml        |  61 ++++
 .../webview/autosize/data-X11/autosize.0.png       | Bin 0 -> 10185 bytes
 .../webview/autosize/data-X11/autosize.1.png       | Bin 0 -> 10185 bytes
 .../webview/autosize/data-X11/autosize.2.png       | Bin 0 -> 10185 bytes
 .../webview/autosize/data-X11/autosize.3.png       | Bin 0 -> 10185 bytes
 .../webview/autosize/data-X11/autosize.4.png       | Bin 0 -> 10185 bytes
 .../webview/autosize/data-X11/autosize.qml         | 115 +++++++
 .../qmlvisual/webview/autosize/data/autosize.0.png | Bin 0 -> 10185 bytes
 .../qmlvisual/webview/autosize/data/autosize.1.png | Bin 0 -> 10185 bytes
 .../qmlvisual/webview/autosize/data/autosize.2.png | Bin 0 -> 10185 bytes
 .../qmlvisual/webview/autosize/data/autosize.3.png | Bin 0 -> 10185 bytes
 .../qmlvisual/webview/autosize/data/autosize.4.png | Bin 0 -> 10185 bytes
 .../qmlvisual/webview/autosize/data/autosize.qml   | 115 +++++++
 .../qmlvisual/webview/embedding/data/nesting.0.png | Bin 5659 -> 0 bytes
 .../qmlvisual/webview/embedding/data/nesting.qml   | 363 ---------------------
 .../qmlvisual/webview/embedding/egg.qml            |  26 --
 .../qmlvisual/webview/embedding/nesting.html       |   9 -
 .../qmlvisual/webview/embedding/nesting.qml        |   9 -
 24 files changed, 296 insertions(+), 636 deletions(-)
 delete mode 100644 tests/auto/declarative/qmlvisual/qfxwebview/autosize/autosize.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.0.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.1.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.2.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.3.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.4.png
 create mode 100644 tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.0.png
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/embedding/nesting.html
 delete mode 100644 tests/auto/declarative/qmlvisual/webview/embedding/nesting.qml

diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 9e24007..36a25f6 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -126,6 +126,9 @@ public:
     dynamically adjust to a size appropriate for the content.
     This width may be large for typical online web pages.
 
+    If the width or height is explictly set, the rendered website
+    will be clipped, not scaled, to fit into the set dimensions.
+
     If the preferredWidth is set, the width will be this amount or larger,
     usually laying out the web content to fit the preferredWidth.
 
@@ -134,8 +137,8 @@ public:
 
     WebView {
         url: "http://www.nokia.com"
-        width: 490
-        height: 400
+        preferredWidth: 490
+        preferredHeight: 400
         scale: 0.5
         smooth: false
         smoothCache: true
diff --git a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/autosize.qml
deleted file mode 100644
index c4a502e..0000000
--- a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/autosize.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
-Rectangle {
-    id: rect
-    color: "white"
-    width: 200
-    height: layout.height
-    Column {
-        id: layout
-        spacing: 2
-        WebView {
-            html: "No width defined."
-            Rectangle {                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width
-            html: "The width is full."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The width is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The preferredWidth is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The_preferredWidth_is_half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The_width_is_half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.0.png b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.0.png
deleted file mode 100644
index 1f28b9a..0000000
Binary files a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.qml b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.qml
deleted file mode 100644
index f4c4e29..0000000
--- a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data-X11/autosize.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 32
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 48
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 64
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 80
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 96
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 112
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 128
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 144
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 160
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 176
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 192
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 208
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 224
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 240
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 256
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 272
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 288
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-    Frame {
-        msec: 304
-        hash: "0c70d855adc847fe33d7959ccb98bb8b"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.0.png b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.0.png
deleted file mode 100644
index 1f28b9a..0000000
Binary files a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.qml b/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.qml
deleted file mode 100644
index 273c2b0..0000000
--- a/tests/auto/declarative/qmlvisual/qfxwebview/autosize/data/autosize.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 32
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 48
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 64
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 80
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 96
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 112
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 128
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 144
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 160
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 176
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 192
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 208
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 224
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 240
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 256
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 272
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 288
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-    Frame {
-        msec: 304
-        hash: "66539e1b1983d95386b0d30d6e969904"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
new file mode 100644
index 0000000..c4a502e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml
@@ -0,0 +1,61 @@
+import Qt 4.7
+import org.webkit 1.0
+
+// The WebView size is determined by the width, height,
+// preferredWidth, and preferredHeight properties.
+Rectangle {
+    id: rect
+    color: "white"
+    width: 200
+    height: layout.height
+    Column {
+        id: layout
+        spacing: 2
+        WebView {
+            html: "No width defined."
+            Rectangle {                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            width: rect.width
+            html: "The width is full."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            width: rect.width/2
+            html: "The width is half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            preferredWidth: rect.width/2
+            html: "The preferredWidth is half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            preferredWidth: rect.width/2
+            html: "The_preferredWidth_is_half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            width: rect.width/2
+            html: "The_width_is_half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.0.png b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.0.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.1.png b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.1.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.2.png b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.2.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.3.png b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.3.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.4.png b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.4.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml
new file mode 100644
index 0000000..6122138
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/data-X11/autosize.qml
@@ -0,0 +1,115 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b2d863e57dee2a297d038e18acc70f92"
+    }
+    Frame {
+        msec: 32
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 48
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 64
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 80
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 96
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 112
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 128
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 144
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 160
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 176
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 192
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 208
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 224
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 240
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 256
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 272
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 288
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 304
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 320
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 336
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 352
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 368
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 384
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 400
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 416
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 432
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.0.png b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.0.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.0.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.1.png b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.1.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.1.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.2.png b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.2.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.2.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.3.png b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.3.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.3.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.4.png b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.4.png
new file mode 100644
index 0000000..ed87174
Binary files /dev/null and b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.4.png differ
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
new file mode 100644
index 0000000..6122138
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/autosize/data/autosize.qml
@@ -0,0 +1,115 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "b2d863e57dee2a297d038e18acc70f92"
+    }
+    Frame {
+        msec: 32
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 48
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 64
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 80
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 96
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 112
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 128
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 144
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 160
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 176
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 192
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 208
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 224
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 240
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 256
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 272
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 288
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 304
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 320
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 336
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 352
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 368
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 384
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 400
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 416
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+    Frame {
+        msec: 432
+        hash: "903a4c7e619abba5342c8c827f26a722"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.0.png b/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.0.png
deleted file mode 100644
index 57de710..0000000
Binary files a/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.0.png and /dev/null differ
diff --git a/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.qml b/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.qml
deleted file mode 100644
index 9664566..0000000
--- a/tests/auto/declarative/qmlvisual/webview/embedding/data/nesting.qml
+++ /dev/null
@@ -1,363 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        hash: "5dc8dca7a73022fbf2116b654b709244"
-    }
-    Frame {
-        msec: 32
-        hash: "5dc8dca7a73022fbf2116b654b709244"
-    }
-    Frame {
-        msec: 48
-        hash: "34079c4076ab6aadd8b64fcba7d95e15"
-    }
-    Frame {
-        msec: 64
-        hash: "5ab5fc62b49e78d0609dcb4be6c9a157"
-    }
-    Frame {
-        msec: 80
-        hash: "063cc7438bbffae717648d98006021a8"
-    }
-    Frame {
-        msec: 96
-        hash: "c5cd16663e48639cbeade82c3bfa0403"
-    }
-    Frame {
-        msec: 112
-        hash: "ea7f8df84ddbad0f683fe97ddb0a0130"
-    }
-    Frame {
-        msec: 128
-        hash: "3c353e09bdb3a1e6ff388ad6020f55ea"
-    }
-    Frame {
-        msec: 144
-        hash: "5b6de430365d0c9824337011916b0c0b"
-    }
-    Frame {
-        msec: 160
-        hash: "48d353ac9e7ee1ce41361d0a2b47e008"
-    }
-    Frame {
-        msec: 176
-        hash: "c96e4d02d343ddd78e8d3dd6aa8e0198"
-    }
-    Frame {
-        msec: 192
-        hash: "543c63d77ec635b77672ba4c5160a3d4"
-    }
-    Frame {
-        msec: 208
-        hash: "2d56ad9c2352e555fef613d625e71151"
-    }
-    Frame {
-        msec: 224
-        hash: "18e433c3e3ee64510f875f674791d51c"
-    }
-    Frame {
-        msec: 240
-        hash: "56889122c1ddacdd8ebd88310c7410bc"
-    }
-    Frame {
-        msec: 256
-        hash: "d51c85458e0109bd5bf9528b741d98d0"
-    }
-    Frame {
-        msec: 272
-        hash: "ac54137afc29a3022c6f01df7cdf2fd6"
-    }
-    Frame {
-        msec: 288
-        hash: "c7a42b389bae3b729ba9e6cba7f54530"
-    }
-    Frame {
-        msec: 304
-        hash: "7583b55841e80891652c3472c658f989"
-    }
-    Frame {
-        msec: 320
-        hash: "95a7f8d47c3788261427727f82c9ff59"
-    }
-    Frame {
-        msec: 336
-        hash: "a87bad3e2f010680e16cd1e3f5e03e99"
-    }
-    Frame {
-        msec: 352
-        hash: "e16bc51653f21819e0eec412b99a069f"
-    }
-    Frame {
-        msec: 368
-        hash: "f1e869580ac148ae207141c5f0adc185"
-    }
-    Frame {
-        msec: 384
-        hash: "7e496e44363a16d7c62e4258af9ce087"
-    }
-    Frame {
-        msec: 400
-        hash: "19e97915c84d3554c66d5a9ad3aa6a3e"
-    }
-    Frame {
-        msec: 416
-        hash: "181181b48a1085d1850f18ca9b163549"
-    }
-    Frame {
-        msec: 432
-        hash: "4637cb04595a543867bd43b0c1c829ea"
-    }
-    Frame {
-        msec: 448
-        hash: "bd0a074fed5507f8556de6110bf56aa4"
-    }
-    Frame {
-        msec: 464
-        hash: "9547618923edac6f7f9a3ff324c4f2d8"
-    }
-    Frame {
-        msec: 480
-        hash: "a2f90c88eacb7c66878d45e33c2a787d"
-    }
-    Frame {
-        msec: 496
-        hash: "d5ffd3e35d0426887c106069310f84d8"
-    }
-    Frame {
-        msec: 512
-        hash: "6bc50a5b76e2a2ef0e6bee762abeb330"
-    }
-    Frame {
-        msec: 528
-        hash: "d4439933c842ed8432434d272fea2845"
-    }
-    Frame {
-        msec: 544
-        hash: "61699e6ec476ac3f090e4f485430421d"
-    }
-    Frame {
-        msec: 560
-        hash: "02d7fa9bcd697d2cab364d0a3ca4a0e2"
-    }
-    Frame {
-        msec: 576
-        hash: "914178cbf1f6a6822cc40f81823475e4"
-    }
-    Frame {
-        msec: 592
-        hash: "280f867ea27891ee764332998567d40d"
-    }
-    Frame {
-        msec: 608
-        hash: "ea0d00fe54a172a89c24eac781f7ae6d"
-    }
-    Frame {
-        msec: 624
-        hash: "4e910fb507964a710e26f318c62227bf"
-    }
-    Frame {
-        msec: 640
-        hash: "b0c3392eb739f270dd21f552ad999c23"
-    }
-    Frame {
-        msec: 656
-        hash: "f3698c83b0972bd66a53ad95d4fc301e"
-    }
-    Frame {
-        msec: 672
-        hash: "0d303a0d6a9b626943ac93cc6f3fb230"
-    }
-    Frame {
-        msec: 688
-        hash: "ba56d49e6f51aa6f1bd2a7500e3538fd"
-    }
-    Frame {
-        msec: 704
-        hash: "273ce89d5194168e5bfd1dcefad49be2"
-    }
-    Frame {
-        msec: 720
-        hash: "c2beef4fb7996dbccdaff4f54bdc33f1"
-    }
-    Frame {
-        msec: 736
-        hash: "1e1aa7d84f27158a8e61bd8698ddbf2a"
-    }
-    Frame {
-        msec: 752
-        hash: "24e82479802e710c673133ca0413be66"
-    }
-    Frame {
-        msec: 768
-        hash: "b77e935a690bcb396e15b942d772cf1b"
-    }
-    Frame {
-        msec: 784
-        hash: "7b729c74df1d15d6b0e8e1fc19c2d710"
-    }
-    Frame {
-        msec: 800
-        hash: "fd6cbdca3e481baaf35022dfea76e74c"
-    }
-    Frame {
-        msec: 816
-        hash: "c975f6eb592793aa81895ffcb74ca577"
-    }
-    Frame {
-        msec: 832
-        hash: "677c4039a650df53b4e885f37b049ab3"
-    }
-    Frame {
-        msec: 848
-        hash: "89563aae36552cb1749ec06567e46d9d"
-    }
-    Frame {
-        msec: 864
-        hash: "01f57402874de6608cc02937aaf91794"
-    }
-    Frame {
-        msec: 880
-        hash: "50c9c4e5eaaadee1ff230975390d34e3"
-    }
-    Frame {
-        msec: 896
-        hash: "20b7d277d398afad59afdf9e6b41a57e"
-    }
-    Frame {
-        msec: 912
-        hash: "8f9ea938a2375afeba419199de66dd52"
-    }
-    Frame {
-        msec: 928
-        hash: "b96745888ba954bcf304c0840a030f93"
-    }
-    Frame {
-        msec: 944
-        hash: "f5715e931274011123160f7ad10d6c52"
-    }
-    Frame {
-        msec: 960
-        image: "nesting.0.png"
-    }
-    Frame {
-        msec: 976
-        hash: "459fe967816c795a177a3926093fae75"
-    }
-    Frame {
-        msec: 992
-        hash: "c599a26083068b6db628c8d8416bab60"
-    }
-    Frame {
-        msec: 1008
-        hash: "e0aee7d1152c971b1beee9d36542acb7"
-    }
-    Frame {
-        msec: 1024
-        hash: "2af0facdf6412f7b06979aae25e4db26"
-    }
-    Frame {
-        msec: 1040
-        hash: "f147a92cb1826f95d4fdb7d011ba79b1"
-    }
-    Frame {
-        msec: 1056
-        hash: "12a1cb894b0fb8e44152cccacf855c1a"
-    }
-    Frame {
-        msec: 1072
-        hash: "c7500cf58b74fef2c3e9820d1de8f843"
-    }
-    Frame {
-        msec: 1088
-        hash: "3a031b2206835f8b2dc9837016df6ae6"
-    }
-    Frame {
-        msec: 1104
-        hash: "7a4796b419bbc04237764dea0b1d47d5"
-    }
-    Frame {
-        msec: 1120
-        hash: "151d350f0064e2faf0bfb9c58bc3e4f2"
-    }
-    Frame {
-        msec: 1136
-        hash: "d72c20a97e678908acc1d6c1f8114d9e"
-    }
-    Frame {
-        msec: 1152
-        hash: "22da1e645640a3c31b064ff757113197"
-    }
-    Frame {
-        msec: 1168
-        hash: "401f0bf370e2ecea5a84276fb72eb1da"
-    }
-    Frame {
-        msec: 1184
-        hash: "c6e00d7b0ac14a5c3860b6a29901c915"
-    }
-    Frame {
-        msec: 1200
-        hash: "f1f7dc55d7719fcb6e97157c0ca85fc0"
-    }
-    Frame {
-        msec: 1216
-        hash: "6a112e1d79c7128c235d093e4f1f9325"
-    }
-    Frame {
-        msec: 1232
-        hash: "14a2caf8cdca8d5147261a315059b69d"
-    }
-    Frame {
-        msec: 1248
-        hash: "5645243aa3cfd12b0b32442f063bedb2"
-    }
-    Frame {
-        msec: 1264
-        hash: "c7f72534a88e33c72a54cb8580534551"
-    }
-    Frame {
-        msec: 1280
-        hash: "6cd5e2e8e0128586a682b3c649ae0631"
-    }
-    Frame {
-        msec: 1296
-        hash: "67cefb4526b52d40a31811bc0dfaeb6a"
-    }
-    Frame {
-        msec: 1312
-        hash: "fbe2a43a27bf490719c8b9e2b094e34f"
-    }
-    Frame {
-        msec: 1328
-        hash: "e028aad6f51a47d8189efcf9c5d277ee"
-    }
-    Frame {
-        msec: 1344
-        hash: "2b4cc50c37c07289fa6f9309991d36da"
-    }
-    Frame {
-        msec: 1360
-        hash: "b67b2244cd0616d07e100d7b3b00bbe2"
-    }
-    Frame {
-        msec: 1376
-        hash: "4e4690cffc98c49e91bdb600f1e94c79"
-    }
-    Frame {
-        msec: 1392
-        hash: "e5215c727836a5547a170d42363bc5c8"
-    }
-    Frame {
-        msec: 1408
-        hash: "26868e91d1794bb3f42d51f508fef613"
-    }
-    Frame {
-        msec: 1424
-        hash: "1e5f431b125a66096ac9a4d5a211a2c4"
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml b/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
deleted file mode 100644
index c569c9a..0000000
--- a/tests/auto/declarative/qmlvisual/webview/embedding/egg.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.7
-
-Item {
-    property variant period : 250
-    property variant color : "black"
-    id: root
-
-    Item {
-        x: root.width/2
-        y: root.height/2
-        Rectangle {
-            radius: width/2
-            color: root.color
-            x: -width/2
-            y: -height/2
-            width: root.width*1.5
-            height: root.height*1.5
-        }
-        rotation: NumberAnimation {
-            from: 0
-            to: 360
-            repeat: true
-            duration: root.period
-        }
-    }
-}
diff --git a/tests/auto/declarative/qmlvisual/webview/embedding/nesting.html b/tests/auto/declarative/qmlvisual/webview/embedding/nesting.html
deleted file mode 100644
index 6e81689..0000000
--- a/tests/auto/declarative/qmlvisual/webview/embedding/nesting.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Nesting
-
-
-
-
      Nesting
      
-This is a test...
-
-... with a spinning QML egg nested in it.
diff --git a/tests/auto/declarative/qmlvisual/webview/embedding/nesting.qml b/tests/auto/declarative/qmlvisual/webview/embedding/nesting.qml
deleted file mode 100644
index 9e008de..0000000
--- a/tests/auto/declarative/qmlvisual/webview/embedding/nesting.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-WebView {
-    width: 300
-    height: 200
-    url: "nesting.html"
-    settings.pluginsEnabled: true
-}
-- 
cgit v0.12


From 761a32a67bb1d4702269ab998ffcf3772fd64d06 Mon Sep 17 00:00:00 2001
From: Simon Hausmann 
Date: Thu, 13 May 2010 23:08:38 +0200
Subject: Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc

Disable the JIT on Symbian again, as it causes crashes.
---
 src/3rdparty/webkit/.tag                          |  2 +-
 src/3rdparty/webkit/JavaScriptCore/ChangeLog      | 12 ------------
 src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h |  3 ---
 src/3rdparty/webkit/VERSION                       |  2 +-
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index d8b4b32..14af7e9 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-57d10d5c05e59bbf7de8189ff47dd18d1be996dc
+5cf023650a8da206a8cf3130e9d4820b95e1bc7c
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 97176ef..1610036 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -21,18 +21,6 @@
 
         * wtf/Platform.h:
 
-2010-05-02  Laszlo Gombos  
-
-        Reviewed by Eric Seidel.
-
-        [Qt] Enable JIT for QtWebKit on Symbian
-        https://bugs.webkit.org/show_bug.cgi?id=38339
-
-        JIT on Symbian has been stable for quite some time, it
-        is time to turn it on by default.
-
-        * wtf/Platform.h:
-
 2010-04-28  Simon Hausmann  , Kent Hansen 
 
         Reviewed by Darin Adler.
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
index 8d98765..fac477e 100644
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -937,8 +937,6 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
     #define ENABLE_JIT 1
 #elif CPU(ARM_TRADITIONAL) && OS(LINUX)
     #define ENABLE_JIT 1
-#elif CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT)
-    #define ENABLE_JIT 1
 #endif
 #endif /* PLATFORM(QT) */
 
@@ -1008,7 +1006,6 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
     || (CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100) \
     || (CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100) \
     || (CPU(ARM_TRADITIONAL) && OS(LINUX)) \
-    || (CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT)) \
     || (CPU(MIPS) && OS(LINUX)) \
     || (CPU(X86) && OS(DARWIN)) \
     || (CPU(X86_64) && OS(DARWIN))
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index c8c2aa3..b8bac54 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
 
-        dc5821c3df2ef60456d85263160852f5335cf946
+        57d10d5c05e59bbf7de8189ff47dd18d1be996dc
-- 
cgit v0.12


From d7438b4761787ffdb6cee82ce0103d653d4cbd24 Mon Sep 17 00:00:00 2001
From: Peter Yard 
Date: Fri, 14 May 2010 10:13:57 +1000
Subject: Fixed documentation typo.

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

diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index 8f5b6a5..16e0c0f 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -517,7 +517,7 @@
 
     Note that some modules rely on other modules. If your application uses
     QtXmlPatterns, QtWebkit or QtScript it may still require \c NetworkServices
-    \o as these modules rely on QtNetwork to go online.
+    as these modules rely on QtNetwork to go online.
 
     For more information see the documentation of the individual Qt classes. If
     a class does not mention Symbian capabilities, it requires none.
-- 
cgit v0.12


From dcc9a7e72fe4c283df59378d08d75aecfa3b3b05 Mon Sep 17 00:00:00 2001
From: Peter Yard 
Date: Fri, 14 May 2010 10:14:25 +1000
Subject: Added snippet labels to QML Dial example.

---
 examples/declarative/dial/content/Dial.qml |  6 ++++++
 examples/declarative/dial/dial-example.qml | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/examples/declarative/dial/content/Dial.qml b/examples/declarative/dial/content/Dial.qml
index f9ab3e3..6f24801 100644
--- a/examples/declarative/dial/content/Dial.qml
+++ b/examples/declarative/dial/content/Dial.qml
@@ -8,6 +8,7 @@ Item {
 
     Image { source: "background.png" }
 
+//! [needle_shadow]
     Image {
         x: 93
         y: 35
@@ -17,6 +18,8 @@ Item {
             angle: needleRotation.angle
         }
     }
+//! [needle_shadow]
+//! [needle]
     Image {
         id: needle
         x: 95; y: 33
@@ -33,5 +36,8 @@ Item {
             }
         }
     }
+//! [needle]
+//! [overlay]
     Image { x: 21; y: 18; source: "overlay.png" }
+//! [overlay]
 }
diff --git a/examples/declarative/dial/dial-example.qml b/examples/declarative/dial/dial-example.qml
index fd899a5..dd51435 100644
--- a/examples/declarative/dial/dial-example.qml
+++ b/examples/declarative/dial/dial-example.qml
@@ -1,6 +1,7 @@
 import Qt 4.7
 import "content"
 
+//! [0]
 Rectangle {
     color: "#545454"
     width: 300; height: 300
@@ -14,7 +15,10 @@ Rectangle {
 
     Rectangle {
         id: container
-        anchors { bottom: parent.bottom; left: parent.left; right: parent.right; leftMargin: 20; rightMargin: 20; bottomMargin: 10 }
+        anchors { bottom: parent.bottom; left: parent.left
+            right: parent.right; leftMargin: 20; rightMargin: 20
+            bottomMargin: 10
+        }
         height: 16
 
         radius: 8
@@ -37,8 +41,10 @@ Rectangle {
 
             MouseArea {
                 anchors.fill: parent
-                drag.target: parent; drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: container.width - 32
+                drag.target: parent; drag.axis: "XAxis"; drag.minimumX: 2
+                drag.maximumX: container.width - 32
             }
         }
     }
 }
+//! [0]
\ No newline at end of file
-- 
cgit v0.12


From 8f800ea5611be333ae15f932dfea50bc80852c03 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Fri, 14 May 2010 10:01:07 +1000
Subject: Fix crash in ParentAnimation.

When rolling-back a parent change, the actions are in reverse order.

Task-number: QTBUG-10671
---
 src/declarative/util/qdeclarativeanimation.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 0f7c946..195939f 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2535,14 +2535,15 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                 myAction.event = vpc;
                 viaData->pc << vpc;
                 viaData->actions << myAction;
+                int index = i;
+                bool invertedIndex = (direction == QDeclarativeAbstractAnimation::Forward) && action.reverseEvent;
                 QDeclarativeAction dummyAction;
-                QDeclarativeAction &xAction = pc->xIsSet() ? actions[++i] : dummyAction;
-                QDeclarativeAction &yAction = pc->yIsSet() ? actions[++i] : dummyAction;
-                QDeclarativeAction &sAction = pc->scaleIsSet() ? actions[++i] : dummyAction;
-                QDeclarativeAction &rAction = pc->rotationIsSet() ? actions[++i] : dummyAction;
-                bool forward = (direction == QDeclarativeAbstractAnimation::Forward);
+                QDeclarativeAction &xAction = pc->xIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
+                QDeclarativeAction &yAction = pc->yIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
+                QDeclarativeAction &sAction = pc->scaleIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
+                QDeclarativeAction &rAction = pc->rotationIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
                 QDeclarativeItem *target = pc->object();
-                QDeclarativeItem *targetParent = forward ? pc->parent() : pc->originalParent();
+                QDeclarativeItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent();
 
                 //### this mirrors the logic in QDeclarativeParentChange.
                 bool ok;
@@ -2584,9 +2585,9 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                     qreal w = target->width();
                     qreal h = target->height();
                     if (pc->widthIsSet())
-                        w = actions[++i].toValue.toReal();
+                        w = actions[invertedIndex ? --index : ++i].toValue.toReal();
                     if (pc->heightIsSet())
-                        h = actions[++i].toValue.toReal();
+                        h = actions[invertedIndex ? --index : ++i].toValue.toReal();
                     const QPointF &transformOrigin
                             = d->computeTransformOrigin(target->transformOrigin(), w,h);
                     qreal tempxt = transformOrigin.x();
-- 
cgit v0.12


From 169e7558fd731abdfceed00e5b2ca03c634e8d5d Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Fri, 14 May 2010 10:06:40 +1000
Subject: Revert "Use raster graphicssystem for qml.app on OS X."

This reverts commit d412a77d1e9a1c6810e10dfa4a0a35a81391cf29.
---
 tools/qml/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 003716e..116ca71 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -184,7 +184,7 @@ int main(int argc, char ** argv)
     atexit(showWarnings);
 #endif
 
-#if defined (Q_WS_X11) || defined(Q_WS_MAC)
+#if defined (Q_WS_X11)
     //### default to using raster graphics backend for now
     bool gsSpecified = false;
     for (int i = 0; i < argc; ++i) {
-- 
cgit v0.12


From 1e395c0ab9676995419ae8b20e4d95ad3fe11f31 Mon Sep 17 00:00:00 2001
From: Joona Petrell 
Date: Fri, 30 Apr 2010 15:11:11 +1000
Subject: Symbian build fix to declarative auto and benchmark tests

Task-number: QTBUG-9491
Reviewed-by: Martin Jones
---
 tests/auto/declarative/declarative.pro             | 11 +++++---
 tests/auto/declarative/examples/examples.pro       |  9 ++++++-
 .../auto/declarative/parserstress/parserstress.pro |  9 ++++++-
 .../declarative/parserstress/tst_parserstress.cpp  |  6 ++++-
 .../qdeclarativeanchors/qdeclarativeanchors.pro    |  9 ++++++-
 .../qdeclarativeanimatedimage.pro                  |  9 ++++++-
 .../qdeclarativeanimations.pro                     |  9 ++++++-
 .../qdeclarativebehaviors.pro                      |  9 ++++++-
 .../qdeclarativebinding/qdeclarativebinding.pro    |  9 ++++++-
 .../qdeclarativeborderimage.pro                    |  9 ++++++-
 .../qdeclarativecomponent.pro                      |  6 ++++-
 .../qdeclarativeconnection.pro                     |  9 ++++++-
 .../qdeclarativecontext/qdeclarativecontext.pro    |  6 ++++-
 .../qdeclarativedom/qdeclarativedom.pro            |  9 ++++++-
 .../qdeclarativeengine/qdeclarativeengine.pro      |  6 ++++-
 .../qdeclarativeerror/qdeclarativeerror.pro        |  6 ++++-
 .../qdeclarativeflickable.pro                      |  9 ++++++-
 .../qdeclarativeflipable/qdeclarativeflipable.pro  |  9 ++++++-
 .../qdeclarativefocusscope.pro                     |  9 ++++++-
 .../qdeclarativefontloader.pro                     |  9 ++++++-
 .../qdeclarativegridview/qdeclarativegridview.pro  |  9 ++++++-
 .../qdeclarativeimage/qdeclarativeimage.pro        |  9 ++++++-
 .../qdeclarativeimageprovider.pro                  |  9 ++++++-
 .../qdeclarativeinfo/qdeclarativeinfo.pro          |  9 ++++++-
 .../qdeclarativeinstruction.pro                    |  6 ++++-
 .../qdeclarativeitem/qdeclarativeitem.pro          |  9 ++++++-
 .../qdeclarativelanguage/qdeclarativelanguage.pro  |  9 ++++++-
 .../qdeclarativelayoutitem.pro                     |  9 ++++++-
 .../qdeclarativelistmodel.pro                      |  9 ++++++-
 .../qdeclarativelistview/qdeclarativelistview.pro  |  9 ++++++-
 .../qdeclarativeloader/qdeclarativeloader.pro      |  9 ++++++-
 .../qdeclarativemetatype/qdeclarativemetatype.pro  |  6 ++++-
 .../qdeclarativemoduleplugin/plugin/plugin.pro     |  3 +++
 .../tst_qdeclarativemoduleplugin.pro               |  9 ++++++-
 .../qdeclarativemousearea.pro                      |  9 ++++++-
 .../qdeclarativeparticles.pro                      |  9 ++++++-
 .../qdeclarativepathview/qdeclarativepathview.pro  |  9 ++++++-
 .../qdeclarativepixmapcache.pro                    |  9 ++++++-
 .../qdeclarativepositioners.pro                    |  9 ++++++-
 .../qdeclarativeproperty/qdeclarativeproperty.pro  |  9 ++++++-
 .../declarative/qdeclarativeqt/qdeclarativeqt.pro  |  9 ++++++-
 .../qdeclarativerepeater/qdeclarativerepeater.pro  |  9 ++++++-
 .../qdeclarativesmoothedanimation.pro              |  9 ++++++-
 .../qdeclarativesmoothedfollow.pro                 |  9 ++++++-
 .../qdeclarativespringfollow.pro                   |  9 ++++++-
 .../qdeclarativesqldatabase.pro                    |  9 ++++++-
 .../qdeclarativestates/qdeclarativestates.pro      |  9 ++++++-
 .../qdeclarativesystempalette.pro                  |  7 +++++
 .../qdeclarativetext/qdeclarativetext.pro          |  9 ++++++-
 .../qdeclarativetextedit/qdeclarativetextedit.pro  |  9 ++++++-
 .../qdeclarativetextinput.pro                      |  9 ++++++-
 .../qdeclarativetimer/qdeclarativetimer.pro        |  6 ++++-
 .../qdeclarativevaluetypes.pro                     |  9 ++++++-
 .../qdeclarativeview/qdeclarativeview.pro          |  9 ++++++-
 .../qdeclarativeviewer/qdeclarativeviewer.pro      |  9 ++++++-
 .../qdeclarativevisualdatamodel.pro                | 10 +++++--
 .../qdeclarativewebview/qdeclarativewebview.pro    |  9 ++++++-
 .../qdeclarativeworkerscript.pro                   |  9 ++++++-
 .../qdeclarativexmlhttprequest.pro                 | 10 +++++--
 .../qdeclarativexmllistmodel.pro                   |  9 ++++++-
 tests/auto/declarative/qmlvisual/qmlvisual.pro     | 31 ++++++++++++++++++++--
 tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp |  2 +-
 .../qpacketprotocol/tst_qpacketprotocol.cpp        |  2 +-
 tests/benchmarks/declarative/binding/binding.pro   | 14 +++++-----
 tests/benchmarks/declarative/creation/creation.pro | 11 ++++----
 .../declarative/creation/tst_creation.cpp          |  6 -----
 tests/benchmarks/declarative/declarative.pro       |  5 +++-
 .../qdeclarativecomponent.pro                      | 18 +++++--------
 .../qdeclarativeimage/qdeclarativeimage.pro        | 10 ++++---
 .../qdeclarativeimage/tst_qdeclarativeimage.cpp    |  6 -----
 .../qdeclarativemetaproperty.pro                   |  9 ++++++-
 tests/benchmarks/declarative/script/script.pro     |  9 ++++---
 tests/benchmarks/declarative/script/tst_script.cpp |  6 -----
 tools/qml/qml.pri                                  |  6 +++++
 tools/qml/qml.pro                                  |  2 --
 75 files changed, 529 insertions(+), 120 deletions(-)

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 3496906..4bb3518 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,6 +1,12 @@
 TEMPLATE = subdirs
+!symbian: {
 SUBDIRS += \
            examples \
+           qdeclarativemetatype \
+           qmetaobjectbuilder
+}
+
+SUBDIRS += \
            parserstress \
            qdeclarativeanchors \
            qdeclarativeanimatedimage \
@@ -34,7 +40,6 @@ SUBDIRS += \
            qdeclarativelistreference \
            qdeclarativelistview \
            qdeclarativeloader \
-           qdeclarativemetatype \
            qdeclarativemoduleplugin \
            qdeclarativemousearea \
            qdeclarativeparticles \
@@ -64,8 +69,7 @@ SUBDIRS += \
            qdeclarativexmlhttprequest \
            qdeclarativexmllistmodel \
            qmlvisual \
-           qpacketprotocol \
-           qmetaobjectbuilder
+           qpacketprotocol
 
 contains(QT_CONFIG, webkit) {
     SUBDIRS += \
@@ -74,4 +78,3 @@ contains(QT_CONFIG, webkit) {
 
 # Tests which should run in Pulse
 PULSE_TESTS = $$SUBDIRS
-
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index 4c32524..92a16f1 100644
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -6,7 +6,14 @@ SOURCES += tst_examples.cpp
 
 include(../../../../tools/qml/qml.pri)
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path =
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro
index 8830511..a95a855 100644
--- a/tests/auto/declarative/parserstress/parserstress.pro
+++ b/tests/auto/declarative/parserstress/parserstress.pro
@@ -4,7 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_parserstress.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = ..\..\qscriptjstestsuite\tests
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp
index 294f2f7..c86908b 100644
--- a/tests/auto/declarative/parserstress/tst_parserstress.cpp
+++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp
@@ -86,12 +86,15 @@ QStringList tst_parserstress::findJSFiles(const QDir &d)
 
 void tst_parserstress::ecmascript_data()
 {
+#ifdef Q_OS_SYMBIAN    
+    QDir dir("tests");
+#else
     QDir dir(SRCDIR);
     dir.cdUp();
     dir.cdUp();
     dir.cd("qscriptjstestsuite");
     dir.cd("tests");
-
+#endif
     QStringList files = findJSFiles(dir);
 
     QTest::addColumn("file");
@@ -129,6 +132,7 @@ void tst_parserstress::ecmascript()
     QByteArray qmlData = qml.toUtf8();
 
     QDeclarativeComponent component(&engine);
+    
     component.setData(qmlData, QUrl::fromLocalFile(SRCDIR + QString("/dummy.qml")));
 
     QFileInfo info(file);
diff --git a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
index a2403f2..452ad55 100644
--- a/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
+++ b/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro
@@ -3,7 +3,14 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeanchors.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
index 74f9be0..7213abd 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro
@@ -4,7 +4,14 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativeanimatedimage.cpp ../shared/testhttpserver.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
index ce38eeb..f7ed371 100644
--- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
+++ b/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro
@@ -3,7 +3,14 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeanimations.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
index c2781b8..7137af1 100644
--- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
+++ b/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro
@@ -3,7 +3,14 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativebehaviors.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
index 04dd6f5..04535db 100644
--- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
+++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativebinding.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
index e754923..3aa2197 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
+++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro
@@ -6,7 +6,14 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativeborderimage.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
index e58c798..98c38ad 100644
--- a/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
+++ b/tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
@@ -5,7 +5,11 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativecomponent.cpp 
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
index 959354d..bbf8630 100644
--- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
+++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativeconnection.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path =
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
index 5db9a9e..0e1a5b1 100644
--- a/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
+++ b/tests/auto/declarative/qdeclarativecontext/qdeclarativecontext.pro
@@ -3,7 +3,11 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativecontext.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
index 466c563..9f1e50c 100644
--- a/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
+++ b/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro
@@ -4,7 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativedom.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
index e0ea2e5..23afd07 100644
--- a/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
+++ b/tests/auto/declarative/qdeclarativeengine/qdeclarativeengine.pro
@@ -5,7 +5,11 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativeengine.cpp 
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
index 501f32c..fae11f9 100644
--- a/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
+++ b/tests/auto/declarative/qdeclarativeerror/qdeclarativeerror.pro
@@ -3,7 +3,11 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeerror.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
index 07637c9..7a70109 100644
--- a/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
+++ b/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativeflickable.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
index 9830b55..9b4fbc9 100644
--- a/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
+++ b/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativeflipable.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro
index 687c80c..c021fcf 100644
--- a/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro
+++ b/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro
@@ -3,5 +3,12 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativefocusscope.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
index 9a8a3ff..dbe0dcb 100644
--- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
+++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro
@@ -6,7 +6,14 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativefontloader.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
index b069260..033e20e 100644
--- a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
+++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativegridview.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path =
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
index ff365ee..a8b8eca 100644
--- a/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
+++ b/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -6,7 +6,14 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativeimage.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
index 22be991..1b828a5 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
+++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro
@@ -9,7 +9,14 @@ SOURCES += tst_qdeclarativeimageprovider.cpp
 # LIBS += -lgcov
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
index bb54d6c..c6719c0 100644
--- a/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
+++ b/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro
@@ -4,7 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeinfo.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
index 0daa9e5..350f6c6 100644
--- a/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
+++ b/tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro
@@ -3,7 +3,11 @@ contains(QT_CONFIG,declarative): QT += declarative script
 SOURCES += tst_qdeclarativeinstruction.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
index e834a4e..f494ef1 100644
--- a/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
+++ b/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro
@@ -4,7 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeitem.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
index 5771469..2b7eb1c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
+++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro
@@ -11,6 +11,13 @@ INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 SOURCES += ../shared/testhttpserver.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"\"\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
index eeb784d..79954fe 100644
--- a/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
+++ b/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro
@@ -5,4 +5,11 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativelayoutitem.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
index 9f1e146..53bb9ec 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
+++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro
@@ -6,7 +6,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativelistmodel.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
index 5d962c0..b406fde 100644
--- a/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
+++ b/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro
@@ -5,6 +5,13 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativelistview.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
index 96fea5b..9334928 100644
--- a/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
+++ b/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro
@@ -7,7 +7,14 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativeloader.cpp \
            ../shared/testhttpserver.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
index cf3fa65..0d32ab8 100644
--- a/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
+++ b/tests/auto/declarative/qdeclarativemetatype/qdeclarativemetatype.pro
@@ -3,7 +3,11 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativemetatype.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
index fc77225..173a302 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
@@ -4,3 +4,6 @@ SOURCES = plugin.cpp
 QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType
 
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
index d895ed0..29a1009 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -2,4 +2,11 @@ load(qttest_p4)
 SOURCES = tst_qdeclarativemoduleplugin.cpp
 QT += declarative
 CONFIG -= app_bundle
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
index 48fe025..6f9c98c 100644
--- a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
+++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
@@ -6,7 +6,14 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativemousearea.cpp ../shared/testhttpserver.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
index 8a061c3..31172a9 100644
--- a/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
+++ b/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativeparticles.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
index 3c327d5..6bef61c 100644
--- a/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
+++ b/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativepathview.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
index 4b247fc..99a94bc 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
+++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro
@@ -9,7 +9,14 @@ INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 SOURCES += ../shared/testhttpserver.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
diff --git a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
index dbe2cbee..2c5b473 100644
--- a/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
+++ b/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro
@@ -4,7 +4,14 @@ SOURCES += tst_qdeclarativepositioners.cpp
 macx:CONFIG -= app_bundle
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
index 6910ccc..f37d952 100644
--- a/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
+++ b/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro
@@ -4,7 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeproperty.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
index 10e10a3..b381a9b 100644
--- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
+++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
@@ -3,7 +3,14 @@ contains(QT_CONFIG,declarative): QT += declarative
 SOURCES += tst_qdeclarativeqt.cpp
 macx:CONFIG -= app_bundle
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
diff --git a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
index abd36e0..51667af 100644
--- a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
+++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro
@@ -5,6 +5,13 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativerepeater.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
index 80b757d..6b98f1e 100644
--- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
+++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativesmoothedanimation.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativesmoothedfollow/qdeclarativesmoothedfollow.pro b/tests/auto/declarative/qdeclarativesmoothedfollow/qdeclarativesmoothedfollow.pro
index 7f737c2..eb7d793 100644
--- a/tests/auto/declarative/qdeclarativesmoothedfollow/qdeclarativesmoothedfollow.pro
+++ b/tests/auto/declarative/qdeclarativesmoothedfollow/qdeclarativesmoothedfollow.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativesmoothedfollow.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
index 6f400a3..6ed8924 100644
--- a/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
+++ b/tests/auto/declarative/qdeclarativespringfollow/qdeclarativespringfollow.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativespringfollow.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
index 3ff4529..9cdb884 100644
--- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
+++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
@@ -6,7 +6,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativesqldatabase.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
index 706d045..6f4ecb3 100644
--- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
+++ b/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro
@@ -5,6 +5,13 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativestates.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
index b2705fa..786bc1b 100644
--- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
+++ b/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro
@@ -4,5 +4,12 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativesystempalette.cpp
 
+# Define SRCDIR equal to test's source directory
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
index e70443e..51c7f43 100644
--- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
+++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
@@ -9,7 +9,14 @@ INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 SOURCES += ../shared/testhttpserver.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
index 2228f11..2adb2b8 100644
--- a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
+++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro
@@ -6,4 +6,11 @@ SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp
 HEADERS += ../shared/testhttpserver.h
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
index 957e75c..2953567 100644
--- a/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
+++ b/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro
@@ -5,5 +5,12 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativetextinput.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
index 42604d8..d95165c 100644
--- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
+++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
@@ -4,6 +4,10 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativetimer.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
index d9f1c13..02c480c 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
+++ b/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro
@@ -7,7 +7,14 @@ HEADERS += testtypes.h
 SOURCES += tst_qdeclarativevaluetypes.cpp \
            testtypes.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro
index d6be728..ad54713 100644
--- a/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro
+++ b/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro
@@ -4,4 +4,11 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeview.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
index dc10f5b..9bb6161 100644
--- a/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
+++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
@@ -6,6 +6,13 @@ include(../../../../tools/qml/qml.pri)
 
 SOURCES += tst_qdeclarativeviewer.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
index d76b582..c87171b 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
@@ -4,8 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativevisualdatamodel.cpp
 
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
index 956272f..8caa393 100644
--- a/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
+++ b/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
@@ -6,6 +6,13 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativewebview.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
index 2e3da4d..36b3449 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
+++ b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
@@ -5,7 +5,14 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativeworkerscript.cpp
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
index 160300e..b54f670 100644
--- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
+++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro
@@ -8,9 +8,15 @@ HEADERS += ../shared/testhttpserver.h
 SOURCES += tst_qdeclarativexmlhttprequest.cpp \
            ../shared/testhttpserver.cpp
 
-
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
index 8c5052a..1bf1c58 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro
@@ -8,7 +8,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativexmllistmodel.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro
index a3abbe3..dca9b04 100644
--- a/tests/auto/declarative/qmlvisual/qmlvisual.pro
+++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro
@@ -4,7 +4,34 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qmlvisual.cpp
 
-DEFINES += QT_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\"
+symbian: {
+    importFiles.path =
+    importFiles.sources = animation \
+    fillmode \
+    focusscope \
+    ListView \
+    qdeclarativeborderimage \
+    qdeclarativeflickable \
+    qdeclarativeflipable \
+    qdeclarativegridview \
+    qdeclarativemousearea \
+    qdeclarativeparticles \
+    qdeclarativepathview \
+    qdeclarativepositioners \
+    qdeclarativesmoothedanimation \
+    qdeclarativespringfollow \
+    qdeclarativetext \
+    qdeclarativetextedit \
+    qdeclarativetextinput \
+    rect \
+    repeater \
+    selftest_noimages \
+    webview
+    DEPLOYMENT = importFiles
+    
+    DEFINES += QT_TEST_SOURCE_DIR=\".\"   
+} else {
+    DEFINES += QT_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\"
+}
 
 CONFIG += parallel_test
-
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 0f33a07..4aad29b 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -82,7 +82,7 @@ QString tst_qmlvisual::viewer()
 
 #if defined(Q_WS_MAC)
     qmlruntime = QDir(binaries).absoluteFilePath("qml.app/Contents/MacOS/qml");
-#elif defined(Q_WS_WIN)
+#elif defined(Q_WS_WIN) || defined(Q_WS_S60)
     qmlruntime = QDir(binaries).absoluteFilePath("qml.exe");
 #else
     qmlruntime = QDir(binaries).absoluteFilePath("qml");
diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
index b8e317e..7d34698 100644
--- a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -225,7 +225,7 @@ void tst_QPacketProtocol::read()
 void tst_QPacketProtocol::device()
 {
     QPacketProtocol p(m_client);
-    QCOMPARE(p.device(), m_client);
+    QVERIFY(p.device() == m_client);
 }
 
 void tst_QPacketProtocol::tst_QPacket_clear()
diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro
index 5ceaf34..268541f 100644
--- a/tests/benchmarks/declarative/binding/binding.pro
+++ b/tests/benchmarks/declarative/binding/binding.pro
@@ -8,11 +8,11 @@ SOURCES += tst_binding.cpp testtypes.cpp
 HEADERS += testtypes.h
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-symbian* {
-    data.sources = data/*
-    data.path = data
-    DEPLOYMENT = data
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-
diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro
index 3e0caf6..08ad772 100644
--- a/tests/benchmarks/declarative/creation/creation.pro
+++ b/tests/benchmarks/declarative/creation/creation.pro
@@ -6,10 +6,11 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_creation.cpp
 
-symbian* {
-    data.sources = data/*
-    data.path = data
-    DEPLOYMENT += addFiles
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
\ No newline at end of file
+}
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index 99324f4..6e9197b 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -50,12 +50,6 @@
 #include 
 #include 
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Application private dir is default serach path for files, so SRCDIR can be set to empty
-#define SRCDIR ""
-#endif
-
 class tst_creation : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index a7d426c..262247a 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -1,8 +1,11 @@
 TEMPLATE = subdirs
+!symbian: {
+    SUBDIRS += painting
+}
+
 SUBDIRS += \
            binding \
            creation \
-           painting \
            pointers \
            qdeclarativecomponent \
            qdeclarativeimage \
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
index 30ef235..670e425 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
@@ -8,15 +8,11 @@ SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp
 HEADERS += testtypes.h
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-symbian* {
-    data.sources = data/*
-    data.path = data
-    samegame.sources = data/samegame/*
-    samegame.path = data/samegame
-    samegame_pics.sources = data/samegame/pics/*
-    samegame_pics.path = data/samegame/pics
-    DEPLOYMENT += data samegame samegame_pics
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path =
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
index bbe4e8d..fb5779a 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
+++ b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro
@@ -7,10 +7,12 @@ CONFIG += release
 
 SOURCES += tst_qdeclarativeimage.cpp
 
-symbian* {
-    data.sources = image.png
-    data.path = .
-    DEPLOYMENT += data
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = image.png
+    importFiles.path = 
+    DEPLOYMENT = importFiles
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
+
diff --git a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index e2e8c8a..e979f20 100644
--- a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -44,12 +44,6 @@
 #include 
 #include 
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Application private dir is default serach path for files, so SRCDIR can be set to empty
-#define SRCDIR ""
-#endif
-
 class tst_qmlgraphicsimage : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
index 79fdd26..55dfafe 100644
--- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
+++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
@@ -7,4 +7,11 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qdeclarativemetaproperty.cpp 
 
 # Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro
index 6255acc..91db871 100644
--- a/tests/benchmarks/declarative/script/script.pro
+++ b/tests/benchmarks/declarative/script/script.pro
@@ -7,10 +7,11 @@ CONFIG += release
 
 SOURCES += tst_script.cpp
 
-symbian* {
-    data.sources = data/*
-    data.path = data
-    DEPLOYMENT += data
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path =
+    DEPLOYMENT = importFiles
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index 8ea6dcd..6dc7ed6 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -48,12 +48,6 @@
 #include 
 #include 
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Application private dir is default serach path for files, so SRCDIR can be set to empty
-#define SRCDIR "."
-#endif
-
 class tst_script : public QObject
 {
     Q_OBJECT
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index d343c76..3c86d31 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -24,6 +24,12 @@ maemo5 {
 } else {
     SOURCES += $$PWD/deviceorientation.cpp
 }
+
+symbian {
+    INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/
+    LIBS += -lesock -lcommdb -lconnmon -linsock
+}
+
 FORMS = $$PWD/recopts.ui \
         $$PWD/proxysettings.ui
 
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index b33d48b..77a9533 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -32,9 +32,7 @@ wince* {
 symbian {
     TARGET.UID3 = 0x20021317
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-    INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-    LIBS += -lesock -lcommdb -lconnmon -linsock
     TARGET.CAPABILITY = NetworkServices ReadUserData
 }
 mac {
-- 
cgit v0.12


From 376ca20965e7546f0d25218858583ccde872f2fb Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Fri, 14 May 2010 12:16:54 +1000
Subject: Revert "Fix crash in ParentAnimation."

This reverts commit 8f800ea5611be333ae15f932dfea50bc80852c03.
---
 src/declarative/util/qdeclarativeanimation.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 195939f..0f7c946 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2535,15 +2535,14 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                 myAction.event = vpc;
                 viaData->pc << vpc;
                 viaData->actions << myAction;
-                int index = i;
-                bool invertedIndex = (direction == QDeclarativeAbstractAnimation::Forward) && action.reverseEvent;
                 QDeclarativeAction dummyAction;
-                QDeclarativeAction &xAction = pc->xIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
-                QDeclarativeAction &yAction = pc->yIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
-                QDeclarativeAction &sAction = pc->scaleIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
-                QDeclarativeAction &rAction = pc->rotationIsSet() ? actions[invertedIndex ? --index : ++i] : dummyAction;
+                QDeclarativeAction &xAction = pc->xIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &yAction = pc->yIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &sAction = pc->scaleIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &rAction = pc->rotationIsSet() ? actions[++i] : dummyAction;
+                bool forward = (direction == QDeclarativeAbstractAnimation::Forward);
                 QDeclarativeItem *target = pc->object();
-                QDeclarativeItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent();
+                QDeclarativeItem *targetParent = forward ? pc->parent() : pc->originalParent();
 
                 //### this mirrors the logic in QDeclarativeParentChange.
                 bool ok;
@@ -2585,9 +2584,9 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                     qreal w = target->width();
                     qreal h = target->height();
                     if (pc->widthIsSet())
-                        w = actions[invertedIndex ? --index : ++i].toValue.toReal();
+                        w = actions[++i].toValue.toReal();
                     if (pc->heightIsSet())
-                        h = actions[invertedIndex ? --index : ++i].toValue.toReal();
+                        h = actions[++i].toValue.toReal();
                     const QPointF &transformOrigin
                             = d->computeTransformOrigin(target->transformOrigin(), w,h);
                     qreal tempxt = transformOrigin.x();
-- 
cgit v0.12


From 08b6114240a6c02dbeb0297d0deeb538ebc3fde9 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Thu, 13 May 2010 10:16:48 +1000
Subject: Cherry pick fix for MOBILITY-828 from Qt Mobility.

Change e5f8e3069d0de428a751e8a1dd88f3585f2d3f5f from Qt Mobility.
---
 .../bearer/symbian/qnetworksession_impl.cpp        | 369 ++++++++++++---------
 src/plugins/bearer/symbian/qnetworksession_impl.h  |  15 +-
 src/plugins/bearer/symbian/symbianengine.cpp       | 248 +++++++++-----
 src/plugins/bearer/symbian/symbianengine.h         |  27 +-
 tests/auto/qnetworksession/lackey/main.cpp         |  24 +-
 .../qnetworksession/test/tst_qnetworksession.cpp   | 361 ++++++++++++--------
 6 files changed, 658 insertions(+), 386 deletions(-)

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 1b9c8cc..04853c4 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -53,15 +53,17 @@
 QT_BEGIN_NAMESPACE
 
 QNetworkSessionPrivateImpl::QNetworkSessionPrivateImpl(SymbianEngine *engine)
-    : CActive(CActive::EPriorityStandard), engine(engine), ipConnectionNotifier(0),
-      iError(QNetworkSession::UnknownSessionError),
-      iALREnabled(0), iConnectInBackground(false)
+    : CActive(CActive::EPriorityStandard), engine(engine),
+      ipConnectionNotifier(0), iHandleStateNotificationsFromManager(false),
+      iFirstSync(true), iStoppedByUser(false), iClosedByUser(false), iDeprecatedConnectionId(0),
+      iError(QNetworkSession::UnknownSessionError), iALREnabled(0), iConnectInBackground(false)
 {
     CActiveScheduler::Add(this);
 
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
     iMobility = NULL;
 #endif
+
     TRAP_IGNORE(iConnectionMonitor.ConnectL());
 }
 
@@ -90,18 +92,72 @@ QNetworkSessionPrivateImpl::~QNetworkSessionPrivateImpl()
     
     // Close global 'Open C' RConnection
     setdefaultif(0);
-
-    iConnectionMonitor.CancelNotifications();
+    
     iConnectionMonitor.Close();
 }
 
+void QNetworkSessionPrivateImpl::configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState)
+{
+    if (iHandleStateNotificationsFromManager) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                << "configurationStateChanged from manager for IAP : " << QString::number(accessPointId)
+                << "configurationStateChanged connMon ID : " << QString::number(connMonId)
+                << " : to a state: " << newState
+                << " whereas my current state is: " << state;
+#endif
+        if (connMonId == iDeprecatedConnectionId) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                    << "however status update from manager ignored because it related to already closed connection.";
+#endif
+            return;
+        }
+        this->newState(newState, accessPointId);
+    }
+}
+
+void QNetworkSessionPrivateImpl::configurationRemoved(QNetworkConfigurationPrivatePointer config)
+{
+    if (!publicConfig.isValid())
+        return;
+
+    SymbianNetworkConfigurationPrivate *symbianConfig = toSymbianConfig(config);
+    
+    symbianConfig->mutex.lock();
+    TUint32 configNumericId = symbianConfig->numericId;
+    symbianConfig->mutex.unlock();
+
+    symbianConfig = toSymbianConfig(privateConfiguration(publicConfig));
+
+    symbianConfig->mutex.lock();
+    TUint32 publicNumericId = symbianConfig->numericId;
+    symbianConfig->mutex.unlock();
+
+    if (configNumericId == publicNumericId) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                 << "configurationRemoved IAP: " << QString::number(publicNumericId) << " : going to State: Invalid";
+#endif
+        this->newState(QNetworkSession::Invalid, publicNumericId);
+    }
+}
+
 void QNetworkSessionPrivateImpl::syncStateWithInterface()
 {
     if (!publicConfig.isValid())
         return;
 
-    // Start monitoring changes in IAP states
-    TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this));
+    if (iFirstSync && publicConfig.isValid()) {
+        QObject::connect(engine, SIGNAL(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)),
+                         this, SLOT(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)));
+        // Listen to configuration removals, so that in case the configuration
+        // this session is based on is removed, session knows to enter Invalid -state.
+        QObject::connect(engine, SIGNAL(configurationRemoved(QNetworkConfigurationPrivatePointer)),
+                         this, SLOT(configurationRemoved(QNetworkConfigurationPrivatePointer)));
+    }
+    // Start listening IAP state changes from QNetworkConfigurationManagerPrivate
+    iHandleStateNotificationsFromManager = true;    
 
     // Check open connections to see if there is already
     // an open connection to selected IAP or SNAP
@@ -137,11 +193,8 @@ void QNetworkSessionPrivateImpl::syncStateWithInterface()
     }
 
     if (state != QNetworkSession::Connected) {
-        // There were no open connections to used IAP or SNAP
-        if (iError == QNetworkSession::InvalidConfigurationError) {
-            newState(QNetworkSession::Invalid);
-        } else if ((publicConfig.state() & QNetworkConfiguration::Discovered) ==
-                   QNetworkConfiguration::Discovered) {
+        if ((publicConfig.state() & QNetworkConfiguration::Discovered) ==
+            QNetworkConfiguration::Discovered) {
             newState(QNetworkSession::Disconnected);
         } else {
             newState(QNetworkSession::NotAvailable);
@@ -245,13 +298,18 @@ QNetworkSession::SessionError QNetworkSessionPrivateImpl::error() const
 
 void QNetworkSessionPrivateImpl::open()
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                << "open() called, session state is: " << state << " and isOpen is: "
+                << isOpen;
+#endif
     if (isOpen || (state == QNetworkSession::Connecting)) {
         return;
     }
-
-    // Cancel notifications from RConnectionMonitor
+    
+    // Stop handling IAP state change signals from QNetworkConfigurationManagerPrivate
     // => RConnection::ProgressNotification will be used for IAP/SNAP monitoring
-    iConnectionMonitor.CancelNotifications();
+    iHandleStateNotificationsFromManager = false;
 
     // Configuration may have been invalidated after session creation by platform
     // (e.g. configuration has been deleted).
@@ -259,19 +317,25 @@ void QNetworkSessionPrivateImpl::open()
         newState(QNetworkSession::Invalid);
         iError = QNetworkSession::InvalidConfigurationError;
         emit QNetworkSessionPrivate::error(iError);
-        syncStateWithInterface();
         return;
     }
-    // If opening a (un)defined configuration, session emits error and enters
-    // NotAvailable -state.
-    if (publicConfig.state() == QNetworkConfiguration::Undefined ||
-        publicConfig.state() == QNetworkConfiguration::Defined) {
+    // If opening a undefined configuration, session emits error and enters
+    // NotAvailable -state. Note that we will try ones in 'defined' state to avoid excessive
+    // need for WLAN scans (via updateConfigurations()), because user may have walked
+    // into a WLAN range, but periodic background scan has not occurred yet -->
+    // we don't want to force application to make frequent updateConfigurations() calls
+    // to be able to try if e.g. home WLAN is available.
+    if (publicConfig.state() == QNetworkConfiguration::Undefined) {
         newState(QNetworkSession::NotAvailable);
         iError = QNetworkSession::InvalidConfigurationError;
         emit QNetworkSessionPrivate::error(iError);
         return;
     }
-    
+    // Clear possible previous states
+    iStoppedByUser = false;
+    iClosedByUser = false;
+    iDeprecatedConnectionId = 0;
+
     TInt error = iSocketServ.Connect();
     if (error != KErrNone) {
         // Could not open RSocketServ
@@ -446,9 +510,18 @@ TUint QNetworkSessionPrivateImpl::iapClientCount(TUint aIAPId) const
 
 void QNetworkSessionPrivateImpl::close(bool allowSignals)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "close() called, session state is: " << state << " and isOpen is : "
+            << isOpen;
+#endif
     if (!isOpen) {
         return;
     }
+    // Mark this session as closed-by-user so that we are able to report
+    // distinguish between stop() and close() state transitions
+    // when reporting.
+    iClosedByUser = true;
 
     SymbianNetworkConfigurationPrivate *symbianConfig =
         toSymbianConfig(privateConfiguration(activeConfig));
@@ -469,8 +542,10 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
     }
 #endif
 
-    if (ipConnectionNotifier) {
+    if (ipConnectionNotifier && !iHandleStateNotificationsFromManager) {
         ipConnectionNotifier->StopNotifications();
+        // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+        iHandleStateNotificationsFromManager = true;
     }
     
     iConnection.Close();
@@ -488,7 +563,6 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
         newState(QNetworkSession::Closing);
     }
     
-    syncStateWithInterface();
     if (allowSignals) {
         if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
             newState(QNetworkSession::Disconnected);
@@ -499,9 +573,19 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
 
 void QNetworkSessionPrivateImpl::stop()
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "stop() called, session state is: " << state << " and isOpen is : "
+            << isOpen;
+#endif
     if (!isOpen &&
         publicConfig.isValid() &&
         publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "since session is not open, using RConnectionMonitor to stop() the interface";
+#endif
+        iStoppedByUser = true;
         // If the publicConfig is type of IAP, enumerate through connections at
         // connection monitor. If publicConfig is active in that list, stop it.
         // Otherwise there is nothing to stop. Note: because this QNetworkSession is not open,
@@ -532,11 +616,25 @@ void QNetworkSessionPrivateImpl::stop()
                                                               ETrue);
                 }
             }
+            // Enter disconnected state right away since the session is not even open.
+            // Symbian^3 connection monitor does not emit KLinkLayerClosed when
+            // connection is stopped via connection monitor.
+            newState(QNetworkSession::Disconnected);
         }
     } else if (isOpen) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "since session is open, using RConnection to stop() the interface";
+#endif
         // Since we are open, use RConnection to stop the interface
         isOpen = false;
+        iStoppedByUser = true;
         newState(QNetworkSession::Closing);
+        if (ipConnectionNotifier) {
+            ipConnectionNotifier->StopNotifications();
+            // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+            iHandleStateNotificationsFromManager = true;
+        }
         iConnection.Stop(RConnection::EStopAuthoritative);
         isOpen = true;
         close(false);
@@ -654,6 +752,10 @@ void QNetworkSessionPrivateImpl::NewCarrierActive(TAccessPointInfo /*aNewAPInfo*
 
 void QNetworkSessionPrivateImpl::Error(TInt /*aError*/)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "roaming Error() occured";
+#endif
     if (isOpen) {
         isOpen = false;
         activeConfig = QNetworkConfiguration();
@@ -671,6 +773,11 @@ void QNetworkSessionPrivateImpl::Error(TInt /*aError*/)
         //    changes immediately to Disconnected.
         newState(QNetworkSession::Disconnected);
         emit closed();
+    } else if (iStoppedByUser) {
+        // If the user of this session has called the stop() and
+        // configuration is based on internet SNAP, this needs to be
+        // done here because platform might roam.
+        newState(QNetworkSession::Disconnected);
     }
 }
 #endif
@@ -975,7 +1082,12 @@ void QNetworkSessionPrivateImpl::RunL()
             isOpen = false;
             activeConfig = QNetworkConfiguration();
             serviceConfig = QNetworkConfiguration();
-            iError = QNetworkSession::UnknownSessionError;
+            if (publicConfig.state() == QNetworkConfiguration::Undefined ||
+                publicConfig.state() == QNetworkConfiguration::Defined) {
+                iError = QNetworkSession::InvalidConfigurationError;
+            } else {
+                iError = QNetworkSession::UnknownSessionError;
+            }
             emit QNetworkSessionPrivate::error(iError);
             Cancel();
             if (ipConnectionNotifier) {
@@ -991,8 +1103,16 @@ void QNetworkSessionPrivateImpl::DoCancel()
     iConnection.Close();
 }
 
+// Enters newState if feasible according to current state.
+// AccessPointId may be given as parameter. If it is zero, state-change is assumed to
+// concern this session's configuration. If non-zero, the configuration is looked up
+// and checked if it matches the configuration this session is based on.
 bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint accessPointId)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+             << "NEW STATE, IAP ID : " << QString::number(accessPointId) << " , newState : " << QString::number(newState);
+#endif
     // Make sure that activeConfig is always updated when SNAP is signaled to be
     // connected.
     if (isOpen && publicConfig.type() == QNetworkConfiguration::ServiceNetwork &&
@@ -1027,9 +1147,29 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
     if (state == QNetworkSession::Roaming && newState == QNetworkSession::Connecting) {
         return false;
     }
+    
+    // Make sure that Connected state is not reported when Connection is
+    // already Closing.
+    // Note: Stopping connection results sometimes KLinkLayerOpen
+    //       to be reported first (just before KLinkLayerClosed).
+    if (state == QNetworkSession::Closing && newState == QNetworkSession::Connected) {
+        return false;
+    }
+
+    // Make sure that some lagging 'closing' state-changes do not overwrite
+    // if we are already disconnected or closed.
+    if (state == QNetworkSession::Disconnected && newState == QNetworkSession::Closing) {
+        return false;
+    }
 
     bool emitSessionClosed = false;
-    if (isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) {
+
+    // If we abruptly go down and user hasn't closed the session, we've been aborted.
+    // Note that session may be in 'closing' state and not in 'connected' state, because
+    // depending on platform the platform may report KConfigDaemonStartingDeregistration
+    // event before KLinkLayerClosed
+    if ((isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) ||
+        (isOpen && !iClosedByUser && newState == QNetworkSession::Disconnected)) {
         // Active & Connected state should change directly to Disconnected state
         // only when something forces connection to close (eg. when another
         // application or session stops connection or when network drops
@@ -1043,14 +1183,17 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
         if (ipConnectionNotifier) {
             ipConnectionNotifier->StopNotifications();
         }
-        // Start monitoring changes in IAP states
-        TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this));
+        // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+        iHandleStateNotificationsFromManager = true;
         emitSessionClosed = true; // Emit SessionClosed after state change has been reported
     }
 
     bool retVal = false;
     if (accessPointId == 0) {
         state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed A to: " << state;
+#endif
         emit stateChanged(state);
         retVal = true;
     } else {
@@ -1063,6 +1206,9 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
                 configLocker.unlock();
 
                 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed B to: " << state;
+#endif
                 emit stateChanged(state);
                 retVal = true;
             }
@@ -1075,6 +1221,9 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
                 configLocker.unlock();
 
                 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed C to: " << state;
+#endif
                 emit stateChanged(state);
                 retVal = true;
             }
@@ -1088,20 +1237,13 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
 
                 if (symbianConfig->numericId == accessPointId) {
                     if (newState == QNetworkSession::Connected) {
-                        // Make sure that when AccessPoint is reported to be Connected
-                        // also state of the related configuration changes to Active.
-                        symbianConfig->state = QNetworkConfiguration::Active;
-                        configLocker.unlock();
-    
                         state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                        qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed D  to: " << state;
+#endif
                         emit stateChanged(state);
                         retVal = true;
                     } else {
-                        if (newState == QNetworkSession::Disconnected) {
-                            // Make sure that when AccessPoint is reported to be disconnected
-                            // also state of the related configuration changes from Active to Defined.
-                            symbianConfig->state = QNetworkConfiguration::Defined;
-                        }
                         QNetworkConfiguration config = bestConfigFromSNAP(publicConfig);
                         if ((config.state() == QNetworkConfiguration::Defined) ||
                             (config.state() == QNetworkConfiguration::Discovered)) {
@@ -1109,6 +1251,9 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
                             configLocker.unlock();
 
                             state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                            qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed E  to: " << state;
+#endif
                             emit stateChanged(state);
                             retVal = true;
                         }
@@ -1121,6 +1266,19 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
     if (emitSessionClosed) {
         emit closed();
     }
+    if (state == QNetworkSession::Disconnected) {
+        // The connection has gone down, and processing of status updates must be
+        // stopped. Depending on platform, there may come 'connecting/connected' states
+        // considerably later (almost a second). Connection id is an increasing
+        // number, so this does not affect next _real_ 'conneting/connected' states.
+
+        SymbianNetworkConfigurationPrivate *symbianConfig =
+            toSymbianConfig(privateConfiguration(publicConfig));
+
+        symbianConfig->mutex.lock();
+        iDeprecatedConnectionId = symbianConfig->connectionId;
+        symbianConfig->mutex.unlock();
+    }
 
     return retVal;
 }
@@ -1129,6 +1287,9 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
                                                                  TInt aError,
                                                                  TUint accessPointId)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - " << QString::number(accessPointId) << " , status : " << QString::number(aConnectionStatus);
+#endif
     switch (aConnectionStatus)
         {
         // Connection unitialised
@@ -1167,6 +1328,7 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
         case KCsdGotLoginInfo:
             break;
 
+        case KConfigDaemonStartingRegistration:
         // Creating connection (e.g. GPRS activation)
         case KCsdStartingConnect:
         case KCsdFinishedConnect:
@@ -1193,6 +1355,7 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
         case KDataTransferTemporarilyBlocked:
             break;
 
+        case KConfigDaemonStartingDeregistration:
         // Hangup or GRPS deactivation
         case KConnectionStartingClose:
             newState(QNetworkSession::Closing,accessPointId);
@@ -1200,136 +1363,26 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
 
         // Connection closed
         case KConnectionClosed:
-            break;
-
         case KLinkLayerClosed:
             newState(QNetworkSession::Disconnected,accessPointId);
+            // Report manager about this to make sure this event
+            // is received by all interseted parties (mediated by
+            // manager because it does always receive all events from
+            // connection monitor).
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "reporting disconnection to manager.";
+#endif
+            if (publicConfig.isValid()) {
+                engine->configurationStateChangeReport(toSymbianConfig(privateConfiguration(publicConfig))->numericId, QNetworkSession::Disconnected);
+            }
             break;
-
         // Unhandled state
         default:
             break;
         }
 }
 
-void QNetworkSessionPrivateImpl::EventL(const CConnMonEventBase& aEvent)
-{
-    switch (aEvent.EventType())
-    {
-        case EConnMonConnectionStatusChange:
-            {
-            CConnMonConnectionStatusChange* realEvent;
-            realEvent = (CConnMonConnectionStatusChange*) &aEvent;
-
-            TUint connectionId = realEvent->ConnectionId();
-            TInt connectionStatus = realEvent->ConnectionStatus();
-
-            // Try to Find IAP Id using connection Id
-            TUint apId = 0;
-            if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-                QList subConfigurations = publicConfig.children();
-                for (int i = 0; i < subConfigurations.count(); i++ ) {
-                    SymbianNetworkConfigurationPrivate *symbianConfig =
-                        toSymbianConfig(privateConfiguration(subConfigurations[i]));
-
-                    QMutexLocker configLocker(&symbianConfig->mutex);
-
-                    if (symbianConfig->connectionId == connectionId) {
-                        apId = symbianConfig->numericId;
-                        break;
-                    }
-                }
-            } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-                SymbianNetworkConfigurationPrivate *symbianConfig =
-                    toSymbianConfig(privateConfiguration(publicConfig));
-
-                symbianConfig->mutex.lock();
-                if (symbianConfig->connectionId == connectionId)
-                    apId = symbianConfig->numericId;
-                symbianConfig->mutex.unlock();
-            }
-
-            if (apId > 0) {
-                handleSymbianConnectionStatusChange(connectionStatus, KErrNone, apId);
-            }
-            }
-            break;
-
-        case EConnMonCreateConnection:
-            {
-            CConnMonCreateConnection* realEvent;
-            realEvent = (CConnMonCreateConnection*) &aEvent;
-            TUint apId;
-            TUint connectionId = realEvent->ConnectionId();
-            TRequestStatus status;
-            iConnectionMonitor.GetUintAttribute(connectionId, 0, KIAPId, apId, status);
-            User::WaitForRequest(status);
-            if (status.Int() == KErrNone) {
-                // Store connection id to related AccessPoint Configuration
-                if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-                    QList subConfigurations = publicConfig.children();
-                    for (int i = 0; i < subConfigurations.count(); i++ ) {
-                        SymbianNetworkConfigurationPrivate *symbianConfig =
-                            toSymbianConfig(privateConfiguration(subConfigurations[i]));
-
-                        QMutexLocker configLocker(&symbianConfig->mutex);
-
-                        if (symbianConfig->numericId == apId) {
-                            symbianConfig->connectionId = connectionId;
-                            break;
-                        }
-                    }
-                } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-                    SymbianNetworkConfigurationPrivate *symbianConfig =
-                        toSymbianConfig(privateConfiguration(publicConfig));
-
-                    symbianConfig->mutex.lock();
-                    if (symbianConfig->numericId == apId)
-                        symbianConfig->connectionId = connectionId;
-                    symbianConfig->mutex.unlock();
-                }
-            }
-            }
-            break;
-
-        case EConnMonDeleteConnection:
-            {
-            CConnMonDeleteConnection* realEvent;
-            realEvent = (CConnMonDeleteConnection*) &aEvent;
-            TUint connectionId = realEvent->ConnectionId();
-            // Remove connection id from related AccessPoint Configuration
-            if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-                QList subConfigurations = publicConfig.children();
-                for (int i = 0; i < subConfigurations.count(); i++ ) {
-                    SymbianNetworkConfigurationPrivate *symbianConfig =
-                        toSymbianConfig(privateConfiguration(subConfigurations[i]));
-
-                    QMutexLocker configLocker(&symbianConfig->mutex);
-
-                    if (symbianConfig->connectionId == connectionId) {
-                        symbianConfig->connectionId = 0;
-                        break;
-                    }
-                }
-            } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-                SymbianNetworkConfigurationPrivate *symbianConfig =
-                    toSymbianConfig(privateConfiguration(publicConfig));
-
-                symbianConfig->mutex.lock();
-                if (symbianConfig->connectionId == connectionId)
-                    symbianConfig->connectionId = 0;
-                symbianConfig->mutex.unlock();
-            }
-            }
-            break;
-
-        default:
-            // For unrecognized events
-            break;
-    }
-}
-
-ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivateImpl &owner, RConnection &connection)
+ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivateImpl& owner, RConnection& connection)
     : CActive(CActive::EPriorityStandard), iOwner(owner), iConnection(connection)
 {
     CActiveScheduler::Add(this);
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 7116519..9767293 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -75,9 +75,8 @@ class SymbianEngine;
 
 class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate, public CActive,
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-                                   public MMobilityProtocolResp,
+                                   public MMobilityProtocolResp
 #endif
-                                   public MConnectionMonitorObserver
 {
     Q_OBJECT
 public:
@@ -130,8 +129,9 @@ protected: // From CActive
     void RunL();
     void DoCancel();
     
-private: // MConnectionMonitorObserver
-    void EventL(const CConnMonEventBase& aEvent);
+private Q_SLOTS:
+    void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState);
+    void configurationRemoved(QNetworkConfigurationPrivatePointer config);
     
 private:
     TUint iapClientCount(TUint aIAPId) const;
@@ -157,6 +157,13 @@ private: // data
     mutable RConnection iConnection;
     mutable RConnectionMonitor iConnectionMonitor;
     ConnectionProgressNotifier* ipConnectionNotifier;
+    
+    bool iHandleStateNotificationsFromManager;
+    bool iFirstSync;
+    bool iStoppedByUser;
+    bool iClosedByUser;
+    TUint32 iDeprecatedConnectionId;
+    
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE    
     CActiveCommsMobilityApiExt* iMobility;
 #endif    
diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index 8e9675e..cea8b67 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -45,14 +45,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include   // For randgen seeding
 #include  // For randgen seeding
 
-// #define QT_BEARERMGMT_CONFIGMGR_DEBUG
 
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
 #include 
 #endif
 
@@ -73,7 +73,9 @@
 
 QT_BEGIN_NAMESPACE
 
-static const int KValueThatWillBeAddedToSNAPId = 1000;
+#ifdef SNAP_FUNCTIONALITY_AVAILABLE
+    static const int KValueThatWillBeAddedToSNAPId = 1000;
+#endif
 static const int KUserChoiceIAPId = 0;
 
 SymbianNetworkConfigurationPrivate::SymbianNetworkConfigurationPrivate()
@@ -657,26 +659,34 @@ void SymbianEngine::updateActiveAccessPoints()
     iConnectionMonitor.GetConnectionCount(connectionCount, status);
     User::WaitForRequest(status);
     
-    // Go through all connections and set state of related IAPs to Active
+    // Go through all connections and set state of related IAPs to Active.
+    // Status needs to be checked carefully, because ConnMon lists also e.g.
+    // WLAN connections that are being currently tried --> we don't want to
+    // state these as active.
     TUint connectionId;
     TUint subConnectionCount;
     TUint apId;
+    TInt connectionStatus;
     if (status.Int() == KErrNone) {
         for (TUint i = 1; i <= connectionCount; i++) {
             iConnectionMonitor.GetConnectionInfo(i, connectionId, subConnectionCount);
             iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
             User::WaitForRequest(status);
             QString ident = QString::number(qHash(apId));
-
             QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
             if (ptr) {
-                online = true;
-                inactiveConfigs.removeOne(ident);
+                iConnectionMonitor.GetIntAttribute(connectionId, subConnectionCount, KConnectionStatus, connectionStatus, status);
+                User::WaitForRequest(status);          
+                if (connectionStatus == KLinkLayerOpen) {
+                    online = true;
+                    inactiveConfigs.removeOne(ident);
 
-                toSymbianConfig(ptr)->connectionId = connectionId;
+                    QMutexLocker configLocker(&ptr->mutex);
+                    toSymbianConfig(ptr)->connectionId = connectionId;
 
-                // Configuration is Active
-                changeConfigurationStateTo(ptr, QNetworkConfiguration::Active);
+                    // Configuration is Active
+                    changeConfigurationStateTo(ptr, QNetworkConfiguration::Active);
+                }
             }
         }
     }
@@ -733,12 +743,12 @@ void SymbianEngine::accessPointScanningReady(TBool scanSuccessful, TConnMonIapIn
             }
         }
         
-        // Make sure that state of rest of the IAPs won't be Discovered or Active
+        // Make sure that state of rest of the IAPs won't be Active
         foreach (const QString &iface, unavailableConfigs) {
             QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(iface);
             if (ptr) {
                 // Configuration is Defined
-                changeConfigurationStateAtMaxTo(ptr, QNetworkConfiguration::Defined);
+                changeConfigurationStateAtMaxTo(ptr, QNetworkConfiguration::Discovered);
             }
         }
     }
@@ -894,21 +904,22 @@ void SymbianEngine::RunL()
     QMutexLocker locker(&mutex);
 
     if (iIgnoringUpdates) {
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
-        qDebug("CommsDB event handling postponed (postpone-timer running because IAPs/SNAPs were updated very recently).");
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug("QNCM CommsDB event handling postponed (postpone-timer running because IAPs/SNAPs were updated very recently).");
 #endif
         return;
     }
 
     if (iStatus != KErrCancel) {
         RDbNotifier::TEvent event = STATIC_CAST(RDbNotifier::TEvent, iStatus.Int());
+
         switch (event) {
         case RDbNotifier::EUnlock:   /** All read locks have been removed.  */
         case RDbNotifier::ECommit:   /** A transaction has been committed.  */ 
         case RDbNotifier::ERollback: /** A transaction has been rolled back */
         case RDbNotifier::ERecover:  /** The database has been recovered    */
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
-            qDebug("CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int());
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug("QNCM CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int());
 #endif
             iIgnoringUpdates = true;
             // Other events than ECommit get lower priority. In practice with those events,
@@ -957,73 +968,95 @@ void SymbianEngine::DoCancel()
     ipCommsDB->CancelRequestNotification();
 }
 
-
 void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
 {
     QMutexLocker locker(&mutex);
 
     switch (aEvent.EventType()) {
-    case EConnMonCreateConnection:
+    case EConnMonConnectionStatusChange:
         {
-        CConnMonCreateConnection* realEvent;
-        realEvent = (CConnMonCreateConnection*) &aEvent;
-        TUint subConnectionCount = 0;
-        TUint apId;            
-        TUint connectionId = realEvent->ConnectionId();
-        TRequestStatus status;
-        iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
-        User::WaitForRequest(status);
-        QString ident = QString::number(qHash(apId));
-
-        QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
-        if (ptr) {
-            toSymbianConfig(ptr)->connectionId = connectionId;
-            // Configuration is Active
-            if (changeConfigurationStateTo(ptr, QNetworkConfiguration::Active))
-                updateStatesToSnaps();
-
-            if (!iOnline) {
-                iOnline = true;
-
-                locker.unlock();
-                emit this->onlineStateChanged(iOnline);
-                locker.relock();
+        CConnMonConnectionStatusChange* realEvent;
+        realEvent = (CConnMonConnectionStatusChange*) &aEvent;
+        TInt connectionStatus = realEvent->ConnectionStatus();
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNCM Connection status : " << QString::number(connectionStatus) << " , connection monitor Id : " << realEvent->ConnectionId();
+#endif
+        if (connectionStatus == KConfigDaemonStartingRegistration) {
+            TUint connectionId = realEvent->ConnectionId();
+            TUint subConnectionCount = 0;
+            TUint apId;            
+            TRequestStatus status;
+            iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
+            User::WaitForRequest(status);
+            QString ident = QString::number(qHash(apId));
+            QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
+            if (ptr) {
+                QMutexLocker configLocker(&ptr->mutex);
+                toSymbianConfig(ptr)->connectionId = connectionId;
+                emit this->configurationStateChanged(toSymbianConfig(ptr)->numericId, connectionId, QNetworkSession::Connecting);
             }
-        }
-        }
-        break;
-
-    case EConnMonDeleteConnection:
-        {
-        CConnMonDeleteConnection* realEvent;
-        realEvent = (CConnMonDeleteConnection*) &aEvent;
-        TUint connectionId = realEvent->ConnectionId();
-
-        QNetworkConfigurationPrivatePointer ptr = dataByConnectionId(connectionId);
-        if (ptr) {
-            toSymbianConfig(ptr)->connectionId = 0;
-            // Configuration is either Defined or Discovered
-            if (changeConfigurationStateAtMaxTo(ptr, QNetworkConfiguration::Discovered))
-                updateStatesToSnaps();
-        }
-        
-        bool online = false;
-        foreach (const QString &iface, accessPointConfigurations.keys()) {
-            QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(iface);
-            if (ptr->state == QNetworkConfiguration::Active) {
-                online = true;
-                break;
+        } else if (connectionStatus == KLinkLayerOpen) {
+            // Connection has been successfully opened
+            TUint connectionId = realEvent->ConnectionId();
+            TUint subConnectionCount = 0;
+            TUint apId;            
+            TRequestStatus status;
+            iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
+            User::WaitForRequest(status);
+            QString ident = QString::number(qHash(apId));
+            QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
+            if (ptr) {
+                QMutexLocker configLocker(&ptr->mutex);
+                toSymbianConfig(ptr)->connectionId = connectionId;
+                // Configuration is Active
+                if (changeConfigurationStateTo(ptr, QNetworkConfiguration::Active)) {
+                    updateStatesToSnaps();
+                }
+                emit this->configurationStateChanged(toSymbianConfig(ptr)->numericId, connectionId, QNetworkSession::Connected);
+                if (!iOnline) {
+                    iOnline = true;
+                    emit this->onlineStateChanged(iOnline);
+                }
             }
-        }
-        if (iOnline != online) {
-            iOnline = online;
+        } else if (connectionStatus == KConfigDaemonStartingDeregistration) {
+            TUint connectionId = realEvent->ConnectionId();
+            QNetworkConfigurationPrivatePointer ptr = dataByConnectionId(connectionId);
+            if (ptr) {
+                QMutexLocker configLocker(&ptr->mutex);
+                emit this->configurationStateChanged(toSymbianConfig(ptr)->numericId, connectionId, QNetworkSession::Closing);
+            }
+        } else if (connectionStatus == KLinkLayerClosed ||
+                   connectionStatus == KConnectionClosed) {
+            // Connection has been closed. Which of the above events is reported, depends on the Symbian
+            // platform.
+            TUint connectionId = realEvent->ConnectionId();
+            QNetworkConfigurationPrivatePointer ptr = dataByConnectionId(connectionId);
+            if (ptr) {
+                // Configuration is either Defined or Discovered
+                if (changeConfigurationStateAtMaxTo(ptr, QNetworkConfiguration::Discovered)) {
+                    updateStatesToSnaps();
+                }
 
-            locker.unlock();
-            emit this->onlineStateChanged(iOnline);
-            locker.relock();
+                QMutexLocker configLocker(&ptr->mutex);
+                emit this->configurationStateChanged(toSymbianConfig(ptr)->numericId, connectionId, QNetworkSession::Disconnected);
+            }
+            
+            bool online = false;
+            foreach (const QString &iface, accessPointConfigurations.keys()) {
+                QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(iface);
+                QMutexLocker configLocker(&ptr->mutex);
+                if (ptr->state == QNetworkConfiguration::Active) {
+                    online = true;
+                    break;
+                }
+            }
+            if (iOnline != online) {
+                iOnline = online;
+                emit this->onlineStateChanged(iOnline);
+            }
         }
         }
-        break;
+        break;    
 
     case EConnMonIapAvailabilityChange:
         {
@@ -1051,21 +1084,78 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
         }
         break;
 
+    case EConnMonCreateConnection:
+        {
+        // This event is caught to keep connection monitor IDs up-to-date.
+        CConnMonCreateConnection* realEvent;
+        realEvent = (CConnMonCreateConnection*) &aEvent;
+        TUint subConnectionCount = 0;
+        TUint apId;
+        TUint connectionId = realEvent->ConnectionId();
+        TRequestStatus status;
+        iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
+        User::WaitForRequest(status);
+        QString ident = QString::number(qHash(apId));
+        QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
+        if (ptr) {
+            QMutexLocker configLocker(&ptr->mutex);
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug() << "QNCM updating connection monitor ID : from, to, whose: " << toSymbianConfig(ptr)->connectionId << connectionId << ptr->name;
+#endif
+            toSymbianConfig(ptr)->connectionId = connectionId;
+        }
+        }
+        break;
     default:
         // For unrecognized events
         break;
     }
 }
 
-// Waits for 1..4 seconds.
+// Sessions may use this function to report configuration state changes,
+// because on some Symbian platforms (especially Symbian^3) all state changes are not
+// reported by the RConnectionMonitor, in particular in relation to stop() call,
+// whereas they _are_ reported on RConnection progress notifier used by sessions --> centralize
+// this data here so that other sessions may benefit from it too (not all sessions necessarily have
+// RConnection progress notifiers available but they relay on having e.g. disconnected information from
+// manager). Currently only 'Disconnected' state is of interest because it has proven to be troublesome.
+void SymbianEngine::configurationStateChangeReport(TUint32 accessPointId, QNetworkSession::State newState)
+{
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNCM A session reported state change for IAP ID: " << accessPointId << " whose new state is: " << newState;
+#endif
+    switch (newState) {
+    case QNetworkSession::Disconnected:
+        {
+            QString ident = QString::number(qHash(accessPointId));
+            QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(ident);
+            if (ptr) {
+                // Configuration is either Defined or Discovered
+                if (changeConfigurationStateAtMaxTo(ptr, QNetworkConfiguration::Discovered)) {
+                    updateStatesToSnaps();
+                }
+
+                QMutexLocker configLocker(&ptr->mutex);
+                emit this->configurationStateChanged(toSymbianConfig(ptr)->numericId,
+                                                     toSymbianConfig(ptr)->connectionId,
+                                                     QNetworkSession::Disconnected);
+            }
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+// Waits for 2..6 seconds.
 void SymbianEngine::waitRandomTime()
 {
-    iTimeToWait = (qAbs(qrand()) % 5) * 1000;
-    if (iTimeToWait < 1000) {
-        iTimeToWait = 1000;
+    iTimeToWait = (qAbs(qrand()) % 7) * 1000;
+    if (iTimeToWait < 2000) {
+        iTimeToWait = 2000;
     }
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
-    qDebug("QNetworkConfigurationManager waiting random time: %d ms", iTimeToWait);
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug("QNCM waiting random time: %d ms", iTimeToWait);
 #endif
     QTimer::singleShot(iTimeToWait, iIgnoreEventLoop, SLOT(quit()));
     iIgnoreEventLoop->exec();
@@ -1076,11 +1166,11 @@ QNetworkConfigurationPrivatePointer SymbianEngine::dataByConnectionId(TUint aCon
     QMutexLocker locker(&mutex);
 
     QNetworkConfiguration item;
-    
     QHash::const_iterator i =
             accessPointConfigurations.constBegin();
     while (i != accessPointConfigurations.constEnd()) {
         QNetworkConfigurationPrivatePointer ptr = i.value();
+        QMutexLocker configLocker(&ptr->mutex);
         if (toSymbianConfig(ptr)->connectionId == aConnectionId)
             return ptr;
 
diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index afb37de..7d565db 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -52,6 +52,9 @@
     #include 
 #endif
 
+// Uncomment and compile QtBearer to gain detailed state tracing
+// #define QT_BEARERMGMT_SYMBIAN_DEBUG
+
 class CCommsDatabase;
 class QEventLoop;
 
@@ -90,7 +93,18 @@ public:
 
     Bearer bearer;
 
+    // So called IAP id from the platform. Remains constant as long as the
+    // platform is aware of the configuration ie. it is stored in the databases
+    // --> does not depend on whether connections are currently open or not.
+    // In practice is the same for the lifetime of the QNetworkConfiguration.
     TUint32 numericId;
+    // So called connection id, or connection monitor ID. A dynamic ID assigned
+    // by RConnectionMonitor whenever a new connection is opened. ConnectionID and
+    // numericId/IAP id have 1-to-1 mapping during the lifetime of the connection at
+    // connection monitor. Notably however it changes whenever a new connection to
+    // a given IAP is created. In a sense it is constant during the time the
+    // configuration remains between states Discovered..Active..Discovered, do not
+    // however relay on this.
     TUint connectionId;
 };
 
@@ -124,6 +138,9 @@ public:
 Q_SIGNALS:
     void onlineStateChanged(bool isOnline);
     
+    void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId,
+                                   QNetworkSession::State newState);
+    
 public Q_SLOTS:
     void updateConfigurations();
 
@@ -157,12 +174,17 @@ private:
     void startMonitoringIAPData(TUint32 aIapId);
     QNetworkConfigurationPrivatePointer dataByConnectionId(TUint aConnectionId);
 
-protected: // From CActive
+protected:
+    // From CActive
     void RunL();
     void DoCancel();
     
-private: // MConnectionMonitorObserver
+private:
+    // MConnectionMonitorObserver
     void EventL(const CConnMonEventBase& aEvent);
+    // For QNetworkSessionPrivate to indicate about state changes
+    void configurationStateChangeReport(TUint32 accessPointId,
+                                   QNetworkSession::State newState);
 
 private: // Data
     bool               iFirstUpdate; 
@@ -181,6 +203,7 @@ private: // Data
     
     friend class QNetworkSessionPrivate;
     friend class AccessPointsAvailabilityScanner;
+    friend class QNetworkSessionPrivateImpl;
 
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
     RCmManager iCmManager;
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp
index 8759b52..ec2fad9 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/qnetworksession/lackey/main.cpp
@@ -47,6 +47,8 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 
 QT_USE_NAMESPACE
@@ -60,15 +62,14 @@ int main(int argc, char** argv)
 {
     QCoreApplication app(argc, argv);
 
-    // Cannot read/write to processes on WinCE or Symbian.
-    // Easiest alternative is to use sockets for IPC.
-
-    QLocalSocket oopSocket;
-
-    oopSocket.connectToServer("tst_qnetworksession");
-    oopSocket.waitForConnected(-1);
-
+    // Update configurations so that everything is up to date for this process too.
+    // Event loop is used to wait for awhile.
     QNetworkConfigurationManager manager;
+    manager.updateConfigurations();
+    QEventLoop iIgnoreEventLoop;
+    QTimer::singleShot(3000, &iIgnoreEventLoop, SLOT(quit()));
+    iIgnoreEventLoop.exec();
+
     QList discovered =
         manager.allConfigurations(QNetworkConfiguration::Discovered);
 
@@ -82,6 +83,13 @@ int main(int argc, char** argv)
         return NO_DISCOVERED_CONFIGURATIONS_ERROR;
     }
 
+    // Cannot read/write to processes on WinCE or Symbian.
+    // Easiest alternative is to use sockets for IPC.
+    QLocalSocket oopSocket;
+
+    oopSocket.connectToServer("tst_qnetworksession");
+    oopSocket.waitForConnected(-1);
+
     qDebug() << "Lackey started";
 
     QNetworkSession *session = 0;
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
index 23cdc6a..8ab9da2 100644
--- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
@@ -100,6 +100,7 @@ private slots:
 
 private:
     QNetworkConfigurationManager manager;
+    QMap testsToRun;
 
     int inProcessSessionManagementCount;
 
@@ -117,6 +118,7 @@ private:
 bool openSession(QNetworkSession *session);
 bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration = true);
 void updateConfigurations();
+void printConfigurations();
 QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfiguration::Type configType);
 
 void tst_QNetworkSession::initTestCase()
@@ -125,7 +127,19 @@ void tst_QNetworkSession::initTestCase()
     qRegisterMetaType("QNetworkSession::SessionError");
     qRegisterMetaType("QNetworkConfiguration");
     qRegisterMetaType("QNetworkConfiguration::Type");
-
+	
+    // If you wish to skip tests, set value as false. This is often very convinient because tests are so lengthy.
+    // Better way still would be to make this readable from a file.
+    testsToRun["robustnessBombing"] = true;
+    testsToRun["outOfProcessSession"] = true;
+    testsToRun["invalidSession"] = true;
+    testsToRun["repeatedOpenClose"] = true;
+    testsToRun["roamingErrorCodes"] = true;
+    testsToRun["sessionStop"] = true;
+    testsToRun["sessionProperties"] = true;
+    testsToRun["userChoiceSession"] = true;
+    testsToRun["sessionOpenCloseStop"] = true;
+	
 #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
     iapconf = new Maemo::IAPConf("007");
     iapconf->setValue("ipv4_type", "AUTO");
@@ -238,6 +252,10 @@ void tst_QNetworkSession::cleanupTestCase()
 // Robustness test for calling interfaces in nonsense order / with nonsense parameters
 void tst_QNetworkSession::robustnessBombing() 
 {
+    if (!testsToRun["robustnessBombing"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
+    
     QNetworkConfigurationManager mgr;
     QNetworkSession testSession(mgr.defaultConfiguration());
     // Should not reset even session is not opened
@@ -253,7 +271,10 @@ void tst_QNetworkSession::robustnessBombing()
 
 
 void tst_QNetworkSession::invalidSession()
-{
+{ 
+    if (!testsToRun["invalidSession"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     // 1. Verify that session created with invalid configuration remains in invalid state
     QNetworkSession session(QNetworkConfiguration(), 0);
     QVERIFY(!session.isOpen());
@@ -270,11 +291,24 @@ void tst_QNetworkSession::invalidSession()
     QVERIFY(error == QNetworkSession::InvalidConfigurationError);
     QVERIFY(session.error() == QNetworkSession::InvalidConfigurationError);
     QVERIFY(session.state() == QNetworkSession::Invalid);
-
+    	
 #ifdef QNETWORKSESSION_MANUAL_TESTS
+
+    QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
+    if (invalidatedConfig.isValid()) {
+        // 3. Verify that invalidating a session after its successfully configured works
+        QNetworkSession invalidatedSession(invalidatedConfig);
+        qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name();
+        QTest::qWait(60000);
+        QVERIFY(!invalidatedConfig.isValid());
+        QVERIFY(invalidatedSession.state() == QNetworkSession::Invalid);
+        qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name();
+        QTest::qWait(60000);
+    }
+    
     QNetworkConfiguration definedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
     if (definedConfig.isValid()) {
-        // 3. Verify that opening a session with defined configuration emits error and enters notavailable-state
+        // 4. Verify that opening a session with defined configuration emits error and enters notavailable-state
         // TODO these timer waits should be changed to waiting appropriate signals, now these wait excessively
         qDebug() << "Shutdown WLAN IAP (waiting 60 seconds): " << definedConfig.name();
         QTest::qWait(60000);
@@ -283,43 +317,27 @@ void tst_QNetworkSession::invalidSession()
         QNetworkSession definedSession(definedConfig);
         QSignalSpy errorSpy(&definedSession, SIGNAL(error(QNetworkSession::SessionError)));
         QNetworkSession::SessionError sessionError;
+        updateConfigurations();
 
         definedSession.open();
+#ifdef Q_OS_SYMBIAN
+        // On symbian, the connection opening is tried even with defined state.
+        qDebug("Waiting for 10 seconds to all signals to propagate.");
+        QTest::qWait(10000);
+#endif
+        updateConfigurations();
 
         QVERIFY(definedConfig.isValid()); // Session remains valid
         QVERIFY(definedSession.state() == QNetworkSession::NotAvailable); // State is not available because WLAN is not in coverage
         QVERIFY(!errorSpy.isEmpty()); // Session tells with error about invalidated configuration
         sessionError = qvariant_cast (errorSpy.first().at(0));
-        qDebug() << "Error code is: " << sessionError;
         QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError);
-        
         qDebug() << "Turn the WLAN IAP back on (waiting 60 seconds): " << definedConfig.name();
         QTest::qWait(60000);
-        updateConfigurations();
-        
+        updateConfigurations();        
         QVERIFY(definedConfig.state() == QNetworkConfiguration::Discovered);
     }
-        
-    QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
-    if (invalidatedConfig.isValid()) {
-        // 4. Verify that invalidating a session after its successfully configured works
-        QNetworkSession invalidatedSession(invalidatedConfig);
-        QSignalSpy errorSpy(&invalidatedSession, SIGNAL(error(QNetworkSession::SessionError)));
-        QNetworkSession::SessionError sessionError;
-        
-        qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name();
-        QTest::qWait(60000);
-        
-        invalidatedSession.open();
-        QVERIFY(!invalidatedConfig.isValid());
-        QVERIFY(invalidatedSession.state() == QNetworkSession::Invalid);
-        QVERIFY(!errorSpy.isEmpty());
-        
-        sessionError = qvariant_cast (errorSpy.first().at(0));
-        QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError);
-        qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name();
-        QTest::qWait(60000);
-    }
+
 #endif
 }
 
@@ -337,12 +355,12 @@ void tst_QNetworkSession::sessionProperties_data()
 
 void tst_QNetworkSession::sessionProperties()
 {
+    if (!testsToRun["sessionProperties"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     QFETCH(QNetworkConfiguration, configuration);
-
     QNetworkSession session(configuration);
-
     QVERIFY(session.configuration() == configuration);
-
     QStringList validBearerNames = QStringList() << QLatin1String("Unknown")
                                                  << QLatin1String("Ethernet")
                                                  << QLatin1String("WLAN")
@@ -356,9 +374,6 @@ void tst_QNetworkSession::sessionProperties()
     if (!configuration.isValid()) {
         QVERIFY(configuration.bearerName().isEmpty());
     } else {
-        qDebug() << "Type:" << configuration.type()
-                 << "Bearer:" << configuration.bearerName();
-
         switch (configuration.type())
         {
             case QNetworkConfiguration::ServiceNetwork:
@@ -374,9 +389,7 @@ void tst_QNetworkSession::sessionProperties()
 
     // QNetworkSession::interface() should return an invalid interface unless
     // session is in the connected state.
-    qDebug() << "Session state:" << session.state();
 #ifndef QT_NO_NETWORKINTERFACE
-    qDebug() << "Session iface:" << session.interface().isValid() << session.interface().name();
 #if !(defined(Q_OS_SYMBIAN) && defined(__WINS__))
     // On Symbian emulator, the support for data bearers is limited
     QCOMPARE(session.state() == QNetworkSession::Connected, session.interface().isValid());
@@ -420,7 +433,12 @@ void tst_QNetworkSession::repeatedOpenClose_data() {
 }
 
 // Tests repeated-open close.
-void tst_QNetworkSession::repeatedOpenClose() {
+void tst_QNetworkSession::repeatedOpenClose() 
+{	
+    if (!testsToRun["repeatedOpenClose"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
+	
     QFETCH(QString, bearerType);
     QFETCH(QNetworkConfiguration::Type, configurationType);
     QFETCH(int, repeatTimes);
@@ -436,13 +454,20 @@ void tst_QNetworkSession::repeatedOpenClose() {
         !closeSession(&permanentSession)) {
         QSKIP("Unable to open/close session, skipping this round of repeated open-close test.", SkipSingle); 
     }
-    for (int i = repeatTimes; i > 0; i--) { 
+    for (int i = 0; i < repeatTimes; i++) { 
+       qDebug() << "Opening, loop number " << i;
        QVERIFY(openSession(&permanentSession));
+       qDebug() << "Closing, loop number, then waiting 5 seconds: " << i;
        QVERIFY(closeSession(&permanentSession));
+       QTest::qWait(5000);
     }
 }
 
-void tst_QNetworkSession::roamingErrorCodes() {
+void tst_QNetworkSession::roamingErrorCodes() 
+{
+    if (!testsToRun["roamingErrorCodes"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }    
 #ifndef Q_OS_SYMBIAN
     QSKIP("Roaming supported on Symbian.", SkipAll);
 #else 
@@ -466,41 +491,11 @@ void tst_QNetworkSession::roamingErrorCodes() {
     adminIapSession.stop(); // requires NetworkControl capabilities
     QTRY_VERIFY(!errorSpy.isEmpty()); // wait for error signals
     QNetworkSession::SessionError error = qvariant_cast(errorSpy.first().at(0));
+    QTest::qWait(2000); // Wait for a moment to all platform signals to propagate
     QVERIFY(error == QNetworkSession::SessionAbortedError);
     QVERIFY(iapSession.state() == QNetworkSession::Disconnected);
     QVERIFY(adminIapSession.state() == QNetworkSession::Disconnected);
 #endif // Q_OS_SYMBIAN
-   
-#ifdef QNETWORKSESSION_MANUAL_TESTS
-     // Check for roaming error.
-     // Case requires that you have controllable WLAN in Internet SNAP (only).
-    QNetworkConfiguration snapConfig = suitableConfiguration("bearer_not_relevant_with_snaps", QNetworkConfiguration::ServiceNetwork);
-    if (!snapConfig.isValid()) {
-        QSKIP("No SNAP accessible, skipping test.", SkipAll);
-    }
-    QNetworkSession snapSession(snapConfig);
-    QVERIFY(openSession(&snapSession));
-    QSignalSpy errorSpySnap(&snapSession, SIGNAL(error(QNetworkSession::SessionError)));
-    qDebug("Disconnect the WLAN now");
-    QTRY_VERIFY(!errorSpySnap.isEmpty()); // wait for error signals
-    QVERIFY(errorSpySnap.count() == 1);
-    error = qvariant_cast(errorSpySnap.first().at(0));
-    qDebug() << "Error received when turning off wlan on SNAP: " << error;
-    QVERIFY(error == QNetworkSession::RoamingError);
-    
-    qDebug("Connect the WLAN now");
-    QTest::qWait(60000); // Wait for WLAN to get up
-    QNetworkConfiguration wlanIapConfig2 = suitableConfiguration("WLAN", QNetworkConfiguration::InternetAccessPoint);
-    QNetworkSession iapSession2(wlanIapConfig2);
-    QVERIFY(openSession(&iapSession2));
-    QSignalSpy errorSpy2(&iapSession2, SIGNAL(error(QNetworkSession::SessionError)));
-    qDebug("Disconnect the WLAN now");
-    QTRY_VERIFY(!errorSpy2.isEmpty()); // wait for error signals
-    QVERIFY(errorSpy2.count() == 1);
-    error = qvariant_cast(errorSpy2.first().at(0));
-    QVERIFY(error == QNetworkSession::SessionAbortedError);
-    QVERIFY(iapSession2.state() == QNetworkSession::Disconnected);
-#endif
 }
 
 
@@ -515,6 +510,9 @@ void tst_QNetworkSession::sessionStop_data() {
 
 void tst_QNetworkSession::sessionStop() 
 {
+    if (!testsToRun["sessionStop"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
 #ifndef Q_OS_SYMBIAN
     QSKIP("Testcase contains mainly Symbian specific checks, because it is only platform to really support interface (IAP-level) Stop.", SkipAll);
 #endif 
@@ -522,6 +520,9 @@ void tst_QNetworkSession::sessionStop()
     QFETCH(QNetworkConfiguration::Type, configurationType);
     
     int configWaitdelayInMs = 2000;
+	
+    updateConfigurations();
+    printConfigurations();
     
     QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType);
     if (!config.isValid()) {
@@ -539,6 +540,9 @@ void tst_QNetworkSession::sessionStop()
     QSignalSpy closedSessionStateChangedSpy(&closedSession, SIGNAL(stateChanged(QNetworkSession::State)));
     QSignalSpy closedErrorSpy(&closedSession, SIGNAL(error(QNetworkSession::SessionError)));
     
+    QSignalSpy openedSessionClosedSpy(&openedSession, SIGNAL(closed()));
+    QSignalSpy openedSessionStateChangedSpy(&openedSession, SIGNAL(stateChanged(QNetworkSession::State)));
+    
     QSignalSpy innocentSessionClosedSpy(&innocentSession, SIGNAL(closed()));
     QSignalSpy innocentSessionStateChangedSpy(&innocentSession, SIGNAL(stateChanged(QNetworkSession::State)));
     QSignalSpy innocentErrorSpy(&innocentSession, SIGNAL(error(QNetworkSession::SessionError)));
@@ -554,10 +558,18 @@ void tst_QNetworkSession::sessionStop()
     closedSessionClosedSpy.clear();
     closedSessionStateChangedSpy.clear();
     closedErrorSpy.clear();
+    openedSessionStateChangedSpy.clear();
+    openedSessionClosedSpy.clear();
+    
     openedSession.stop();
 
-    QVERIFY(openedSession.state() == QNetworkSession::Disconnected);
+    qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs);
     QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
+    
+    // First to closing, then to disconnected
+    QVERIFY(openedSessionStateChangedSpy.count() == 2);
+    QVERIFY(!openedSessionClosedSpy.isEmpty());
+    QVERIFY(openedSession.state() == QNetworkSession::Disconnected);
     QVERIFY(config.state() != QNetworkConfiguration::Active);
     
     // 2. Verify that stopping a session based on non-connected configuration does nothing
@@ -583,18 +595,20 @@ void tst_QNetworkSession::sessionStop()
     // 3. Check that stopping a opened session affects also other opened session based on the same configuration.
     if (config.type() == QNetworkConfiguration::InternetAccessPoint) {
         qDebug("----------3. Check that stopping a opened session affects also other opened session based on the same configuration.");
+	
         QVERIFY(openSession(&openedSession));
         QVERIFY(openSession(&innocentSession));
-
+	    
         configChangeSpy.clear();
         innocentSessionClosedSpy.clear();
         innocentSessionStateChangedSpy.clear();
         innocentErrorSpy.clear();
-      
+        
         openedSession.stop();    
         qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs);
         QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
-
+	QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
+	    
         QVERIFY(!innocentSessionClosedSpy.isEmpty());
         QVERIFY(!innocentSessionStateChangedSpy.isEmpty());
         QVERIFY(!innocentErrorSpy.isEmpty());
@@ -614,14 +628,19 @@ void tst_QNetworkSession::sessionStop()
     if (config.type() == QNetworkConfiguration::ServiceNetwork) {
         qDebug("----------4. Skip for SNAP configuration.");
     } else if (config.type() == QNetworkConfiguration::InternetAccessPoint) {
-        qDebug("----------4. Check that stopping a non-opened session stops the other session based on the same configuration");
-        QVERIFY(openSession(&innocentSession));
+        qDebug("----------4.   Check that stopping a non-opened session stops the other session based on the same configuration");
+	qDebug("----------4.1 Opening innocent session");
+        QVERIFY(openSession(&innocentSession));    
         qDebug("Waiting for %d ms after open to make sure all platform indications are propagated", configWaitdelayInMs);
         QTest::qWait(configWaitdelayInMs);
+    qDebug("----------4.2 Calling closedSession.stop()");
         closedSession.stop();
         qDebug("Waiting for %d ms to get all configurationChange signals from platform..", configWaitdelayInMs);
         QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
     
+	    QTest::qWait(configWaitdelayInMs);
+	    QTest::qWait(configWaitdelayInMs);
+	    
         QVERIFY(!innocentSessionClosedSpy.isEmpty());
         QVERIFY(!innocentSessionStateChangedSpy.isEmpty());
         QVERIFY(!innocentErrorSpy.isEmpty());
@@ -653,6 +672,9 @@ void tst_QNetworkSession::userChoiceSession_data()
 
 void tst_QNetworkSession::userChoiceSession()
 {
+    if (!testsToRun["userChoiceSession"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     QFETCH(QNetworkConfiguration, configuration);
 
     QVERIFY(configuration.type() == QNetworkConfiguration::UserChoice);
@@ -786,6 +808,9 @@ void tst_QNetworkSession::sessionOpenCloseStop_data()
 
 void tst_QNetworkSession::sessionOpenCloseStop()
 {
+    if (!testsToRun["sessionOpenCloseStop"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     QFETCH(QNetworkConfiguration, configuration);
     QFETCH(bool, forceSessionStop);
 
@@ -894,26 +919,30 @@ void tst_QNetworkSession::sessionOpenCloseStop()
         QVERIFY(session.error() == QNetworkSession::UnknownSessionError);
 
         session2.open();
-
+	    
         QTRY_VERIFY(!sessionOpenedSpy2.isEmpty() || !errorSpy2.isEmpty());
 
+        if (errorSpy2.isEmpty()) {
+            QVERIFY(session2.isOpen());
+            QVERIFY(session2.state() == QNetworkSession::Connected);
+        }
         QVERIFY(session.isOpen());
-        QVERIFY(session2.isOpen());
         QVERIFY(session.state() == QNetworkSession::Connected);
-        QVERIFY(session2.state() == QNetworkSession::Connected);
 #ifndef QT_NO_NETWORKINTERFACE
 #if !(defined(Q_OS_SYMBIAN) && defined(__WINS__))
         // On Symbian emulator, the support for data bearers is limited
         QVERIFY(session.interface().isValid());
 #endif
-        QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress());
-        QCOMPARE(session.interface().index(), session2.interface().index());
+        if (errorSpy2.isEmpty()) {
+            QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress());
+            QCOMPARE(session.interface().index(), session2.interface().index());
+        }
 #endif
     }
 
     sessionOpenedSpy2.clear();
 
-    if (forceSessionStop) {
+    if (forceSessionStop && session2.isOpen()) {
         // Test forcing the second session to stop the interface.
         QNetworkSession::State previousState = session.state();
 #ifdef Q_CC_NOKIAX86
@@ -922,15 +951,17 @@ void tst_QNetworkSession::sessionOpenCloseStop()
 #else
         bool expectStateChange = previousState != QNetworkSession::Disconnected;
 #endif
-
         session2.stop();
 
+        // QNetworkSession::stop() must result either closed() signal
+        // or error() signal
         QTRY_VERIFY(!sessionClosedSpy2.isEmpty() || !errorSpy2.isEmpty());
-
         QVERIFY(!session2.isOpen());
 
         if (!errorSpy2.isEmpty()) {
-	    QVERIFY(!errorSpy.isEmpty());
+            // QNetworkSession::stop() resulted error() signal for session2
+            // => also session should emit error() signal
+            QTRY_VERIFY(!errorSpy.isEmpty());
 
             // check for SessionAbortedError
             QNetworkSession::SessionError error =
@@ -950,9 +981,12 @@ void tst_QNetworkSession::sessionOpenCloseStop()
 
         QVERIFY(errorSpy.isEmpty());
         QVERIFY(errorSpy2.isEmpty());
-
+        
+        // Wait for Disconnected state 
+        QTRY_NOOP(session2.state() == QNetworkSession::Disconnected);
+	
         if (expectStateChange)
-            QTRY_VERIFY(stateChangedSpy2.count() >= 2 || !errorSpy2.isEmpty());
+            QTRY_VERIFY(stateChangedSpy2.count() >= 1 || !errorSpy2.isEmpty());
 
         if (!errorSpy2.isEmpty()) {
             QVERIFY(session2.state() == previousState);
@@ -996,16 +1030,29 @@ void tst_QNetworkSession::sessionOpenCloseStop()
                     state = qvariant_cast(stateChangedSpy2.at(3).at(0));
                     QVERIFY(state == QNetworkSession::Disconnected);
                     
+			
+                    QTRY_VERIFY(session.state() == QNetworkSession::Roaming ||
+                                session.state() == QNetworkSession::Connected ||
+                                session.state() == QNetworkSession::Disconnected);
+                    
                     QTRY_VERIFY(stateChangedSpy.count() > 0);
-                    state = qvariant_cast(stateChangedSpy.at(0).at(0));
+                    state = qvariant_cast(stateChangedSpy.at(stateChangedSpy.count() - 1).at(0));                    
+                    
                     if (state == QNetworkSession::Roaming) {
-                        QTRY_VERIFY(!errorSpy.isEmpty() || stateChangedSpy.count() > 1);
-                        if (stateChangedSpy.count() > 1 &&
-                            qvariant_cast(stateChangedSpy.at(1).at(0)) ==
-                            QNetworkSession::Connected) {
-                            roamedSuccessfully = true;
+                        QTRY_VERIFY(session.state() == QNetworkSession::Connected);
+                        QTRY_VERIFY(session2.state() == QNetworkSession::Connected);
+                        roamedSuccessfully = true;
+                    } else if (state == QNetworkSession::Disconnected) {
+                        QTRY_VERIFY(!errorSpy.isEmpty());
+                        QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected);
+                  	} else if (state == QNetworkSession::Connected) {
+                        QTRY_VERIFY(errorSpy.isEmpty());
+                        if (stateChangedSpy.count() > 1) {
+                            state = qvariant_cast(stateChangedSpy.at(stateChangedSpy.count() - 2).at(0));                        
+                            QVERIFY(state == QNetworkSession::Roaming);
                         }
-                    }
+                        roamedSuccessfully = true;
+                  	}
 
                     if (roamedSuccessfully) {
                         QString configId = session.sessionProperty("ActiveConfiguration").toString();
@@ -1013,37 +1060,36 @@ void tst_QNetworkSession::sessionOpenCloseStop()
                         QNetworkSession session3(config);
                         QSignalSpy errorSpy3(&session3, SIGNAL(error(QNetworkSession::SessionError)));
                         QSignalSpy sessionOpenedSpy3(&session3, SIGNAL(opened()));
-                        
                         session3.open();
-                        session3.waitForOpened();
-                        
+                        session3.waitForOpened();      
                         if (session.isOpen())
                             QVERIFY(!sessionOpenedSpy3.isEmpty() || !errorSpy3.isEmpty());
-                        
                         session.stop();
-
                         QTRY_VERIFY(session.state() == QNetworkSession::Disconnected);
-                        QTRY_VERIFY(session3.state() == QNetworkSession::Disconnected);
                     }
 #ifndef Q_CC_NOKIAX86
                     if (!roamedSuccessfully)
                         QVERIFY(!errorSpy.isEmpty());
 #endif
                 } else {
-                    QCOMPARE(stateChangedSpy2.count(), 2);
-
-                    QNetworkSession::State state =
-                        qvariant_cast(stateChangedSpy2.at(0).at(0));
-                    QVERIFY(state == QNetworkSession::Closing);
-
-                    state = qvariant_cast(stateChangedSpy2.at(1).at(0));
-                    QVERIFY(state == QNetworkSession::Disconnected);
+                    QTest::qWait(2000); // Wait awhile to get all signals from platform
+        
+                    if (stateChangedSpy2.count() == 2)  {
+                        QNetworkSession::State state =
+                            qvariant_cast(stateChangedSpy2.at(0).at(0));
+                        QVERIFY(state == QNetworkSession::Closing);
+                        state = qvariant_cast(stateChangedSpy2.at(1).at(0));
+                        QVERIFY(state == QNetworkSession::Disconnected);
+                    } else { // Assume .count() == 1
+                        QCOMPARE(stateChangedSpy2.count(), 1); 
+                        QNetworkSession::State state = qvariant_cast(stateChangedSpy2.at(0).at(0));
+                         // Symbian version dependant.
+                        QVERIFY(state == QNetworkSession::Disconnected);	
+                    }
                 }
 
                 QTRY_VERIFY(!sessionClosedSpy.isEmpty());
-
                 QTRY_VERIFY(session.state() == QNetworkSession::Disconnected);
-                QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected);
             }
 
             QVERIFY(errorSpy2.isEmpty());
@@ -1062,7 +1108,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
         QVERIFY(!session.isOpen());
 #endif
         QVERIFY(!session2.isOpen());
-    } else {
+    } else if (session2.isOpen()) {
         // Test closing the second session.
         {
             int stateChangedCountBeforeClose = stateChangedSpy2.count();
@@ -1161,11 +1207,15 @@ QDebug operator<<(QDebug debug, const QList &list)
 // at Discovered -state.
 void tst_QNetworkSession::outOfProcessSession()
 {
-    qDebug() << "START";
-
+    if (!testsToRun["outOfProcessSession"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
 #if defined(Q_OS_SYMBIAN) && defined(__WINS__)
     QSKIP("Symbian emulator does not support two [QR]PRocesses linking a dll (QtBearer.dll) with global writeable static data.", SkipAll);
 #endif
+	updateConfigurations();	   
+	QTest::qWait(2000);
+	
     QNetworkConfigurationManager manager;
     // Create a QNetworkConfigurationManager to detect configuration changes made in Lackey. This
     // is actually the essence of this testcase - to check that platform mediates/reflects changes
@@ -1182,16 +1232,15 @@ void tst_QNetworkSession::outOfProcessSession()
     QLocalServer::removeServer("tst_qnetworksession");
     oopServer.listen("tst_qnetworksession");
 
-    qDebug() << "starting lackey";
     QProcess lackey;
     lackey.start("lackey/lackey");
     qDebug() << lackey.error() << lackey.errorString();
     QVERIFY(lackey.waitForStarted());
 
-    qDebug() << "waiting for connection";
+
     QVERIFY(oopServer.waitForNewConnection(-1));
     QLocalSocket *oopSocket = oopServer.nextPendingConnection();
-    qDebug() << "got connection";
+
     do {
         QByteArray output;
 
@@ -1258,7 +1307,6 @@ void tst_QNetworkSession::outOfProcessSession()
     default:
         QSKIP("Lackey failed", SkipAll);
     }
-    qDebug("STOP");
 }
 
 // A convinience / helper function for testcases. Return the first matching configuration.
@@ -1269,6 +1317,7 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur
     // Refresh configurations and derive configurations matching given parameters.
     QNetworkConfigurationManager mgr;
     QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted()));
+    
     mgr.updateConfigurations();
     QTRY_NOOP(updateSpy.count() == 1);
     if (updateSpy.count() != 1) {
@@ -1277,8 +1326,7 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur
     }
     QList discoveredConfigs = mgr.allConfigurations(QNetworkConfiguration::Discovered);
     foreach(QNetworkConfiguration config, discoveredConfigs) {
-        if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            // qDebug() << "Dumping config because is active: " << config.name();
+        if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {        
             discoveredConfigs.removeOne(config);
         } else if (config.type() != configType) {
             // qDebug() << "Dumping config because type (IAP/SNAP) mismatches: " << config.name();
@@ -1315,9 +1363,23 @@ void updateConfigurations()
     QTRY_NOOP(updateSpy.count() == 1);
 }
 
+// A convinience-function: updates and prints all available confiurations and their states
+void printConfigurations()
+{
+    QNetworkConfigurationManager manager;
+    QList allConfigs =
+    manager.allConfigurations();
+    qDebug("tst_QNetworkSession::printConfigurations QNetworkConfigurationManager gives following configurations: ");
+    foreach(QNetworkConfiguration config, allConfigs) {
+        qDebug() << "Name of the configuration: " << config.name();
+        qDebug() << "State of the configuration: " << config.state();
+    }
+}
+
 // A convinience function for test-cases: opens the given configuration and return
 // true if it was done gracefully.
 bool openSession(QNetworkSession *session) {
+    bool result = true;
     QNetworkConfigurationManager mgr;
     QSignalSpy openedSpy(session, SIGNAL(opened()));
     QSignalSpy stateChangeSpy(session, SIGNAL(stateChanged(QNetworkSession::State)));
@@ -1327,43 +1389,57 @@ bool openSession(QNetworkSession *session) {
     // active by some other session
     QNetworkConfiguration::StateFlags configInitState = session->configuration().state();
     QNetworkSession::State sessionInitState = session->state();
+    qDebug() << "tst_QNetworkSession::openSession() name of the configuration to be opened:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::openSession() state of the configuration to be opened:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::openSession() state of the session to be opened:  " << session->state();
 
     if (session->isOpen() ||
         !session->sessionProperty("ActiveConfiguration").toString().isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: session was already open / active.");
-        return false;
+        result = false;
     } else {
         session->open();
         session->waitForOpened(120000); // Bringing interfaces up and down may take time at platform
     }
+    QTest::qWait(5000); // Wait a moment to ensure all signals are propagated
     // Check that connection opening went by the book. Add checks here if more strictness needed.
     if (!session->isOpen()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::open() failed.");
-        return false;
+        result =  false;
     }
     if (openedSpy.count() != 1) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::opened() - signal not received.");
-        return false;
+        result =  false;
     }
     if (!errorSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::error() - signal was detected.");
-        return false;
+        result = false;
     }
     if (sessionInitState != QNetworkSession::Connected && 
         stateChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::stateChanged() - signals not detected.");
-        return false;
+        result =  false;
     }
     if (configInitState != QNetworkConfiguration::Active && 
         configChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkConfigurationManager::configurationChanged() - signals not detected.");
-        return false;
+        result =  false;
     }
     if (session->configuration().state() != QNetworkConfiguration::Active) {
         qDebug("tst_QNetworkSession::openSession() failure: session's configuration is not in 'Active' -state.");
-        return false;
+	qDebug() << "tst_QNetworkSession::openSession() state is:  " << session->configuration().state();
+        result =  false;
+    }
+    if (result == false) {
+	    qDebug() << "tst_QNetworkSession::openSession() opening session failed.";
+    } else {
+	    qDebug() << "tst_QNetworkSession::openSession() opening session succeeded.";
     }
-    return true;
+    qDebug() << "tst_QNetworkSession::openSession() name of the configuration is:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::openSession() configuration state is:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::openSession() session state is:  " << session->state();
+	    
+    return result;
 }
 
 // Helper function for closing opened session. Performs checks that 
@@ -1376,6 +1452,11 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
         qDebug("tst_QNetworkSession::closeSession() failure: NULL session given");
         return false;
     }
+    
+    qDebug() << "tst_QNetworkSession::closeSession() name of the configuration to be closed:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::closeSession() state of the configuration to be closed:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::closeSession() state of the session to be closed:  " << session->state();
+    
     if (session->state() != QNetworkSession::Connected || 
         !session->isOpen()) {
         qDebug("tst_QNetworkSession::closeSession() failure: session is not opened.");
@@ -1387,38 +1468,48 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
     QSignalSpy sessionErrorSpy(session, SIGNAL(error(QNetworkSession::SessionError)));
     QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration)));
     
+    bool result = true;
     session->close();
+    QTest::qWait(5000); // Wait a moment so that all signals are propagated
     
     if (!sessionErrorSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::error() received.");
-        return false;
+        result = false;
     }
     if (sessionClosedSpy.count() != 1) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::closed() signal not received.");
-        return false;
+        result = false;
     }
     if (lastSessionOnConfiguration && 
         sessionStateChangedSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::stateChanged() signals not received.");
-        return false;
+        result = false;
     }
     if (lastSessionOnConfiguration &&
         session->state() != QNetworkSession::Disconnected) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession is not in Disconnected -state");
-        return false;
+        result = false;
     }
     QTRY_NOOP(!configChangeSpy.isEmpty());
     if (lastSessionOnConfiguration &&
         configChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkConfigurationManager::configurationChanged() - signal not detected.");
-        return false;
+        result = false;
     }
     if (lastSessionOnConfiguration &&
         session->configuration().state() == QNetworkConfiguration::Active) {
          qDebug("tst_QNetworkSession::closeSession() failure: session's configuration is still in active state.");
-         return false;
+         result = false;
     }
-    return true;
+    if (result == false) {
+	    qDebug() << "tst_QNetworkSession::closeSession() closing session failed.";
+    } else {
+	    qDebug() << "tst_QNetworkSession::closeSession() closing session succeeded.";
+    } 
+    qDebug() << "tst_QNetworkSession::closeSession() name of the configuration is:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::closeSession() configuration state is:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::closeSession() session state is:  " << session->state();
+    return result;
 }
 
 void tst_QNetworkSession::sessionAutoClose_data()
-- 
cgit v0.12


From e6efa3ea81dff9eb0ade1c2ba868c272ccfcc958 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Thu, 13 May 2010 10:49:52 +1000
Subject: Bearer management changes from Qt Mobility.

9286bfcc43d38e0cb3bfd1d3f99ac7ab5d88b7e3
---
 examples/network/bearermonitor/bearermonitor.cpp             |  3 +++
 examples/network/bearermonitor/sessionwidget.cpp             | 12 ++++++++++--
 examples/network/bearermonitor/sessionwidget.h               |  5 ++++-
 examples/network/bearermonitor/sessionwidget.ui              |  2 +-
 .../auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp |  7 +++++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 4a6c6ff..0d98eff 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -255,6 +255,7 @@ void BearerMonitor::onlineStateChanged(bool isOnline)
 void BearerMonitor::registerNetwork()
 {
     QTreeWidgetItem *item = treeWidget->currentItem();
+    if (!item) return;
 
     QNetworkConfiguration configuration =
         manager.configurationFromIdentifier(item->data(0, Qt::UserRole).toString());
@@ -276,6 +277,7 @@ void BearerMonitor::registerNetwork()
 void BearerMonitor::unregisterNetwork()
 {
     QTreeWidgetItem *item = treeWidget->currentItem();
+    if (!item) return;
 
     QNetworkConfiguration configuration =
         manager.configurationFromIdentifier(item->data(0, Qt::UserRole).toString());
@@ -384,6 +386,7 @@ void BearerMonitor::createSessionFor(QTreeWidgetItem *item)
 void BearerMonitor::createNewSession()
 {
     QTreeWidgetItem *item = treeWidget->currentItem();
+    if (!item) return;
 
     createSessionFor(item);
 }
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index 443f4b2..3a8e5ea 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -59,7 +59,7 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren
     connect(session, SIGNAL(stateChanged(QNetworkSession::State)),
             this, SLOT(updateSession()));
     connect(session, SIGNAL(error(QNetworkSession::SessionError)),
-            this, SLOT(updateSession()));
+            this, SLOT(updateSessionError(QNetworkSession::SessionError)));
 
     updateSession();
 
@@ -105,7 +105,6 @@ void SessionWidget::deleteSession()
 void SessionWidget::updateSession()
 {
     updateSessionState(session->state());
-    updateSessionError(session->error());
 
     if (session->state() == QNetworkSession::Connected)
         statsTimer = startTimer(1000);
@@ -128,12 +127,14 @@ void SessionWidget::updateSession()
 
 void SessionWidget::openSession()
 {
+    clearError();
     session->open();
     updateSession();
 }
 
 void SessionWidget::openSyncSession()
 {
+    clearError();
     session->open();
     session->waitForOpened();
     updateSession();
@@ -141,12 +142,14 @@ void SessionWidget::openSyncSession()
 
 void SessionWidget::closeSession()
 {
+    clearError();
     session->close();
     updateSession();
 }
 
 void SessionWidget::stopSession()
 {
+    clearError();
     session->stop();
     updateSession();
 }
@@ -195,3 +198,8 @@ void SessionWidget::updateSessionError(QNetworkSession::SessionError error)
     errorString->setText(session->errorString());
 }
 
+void SessionWidget::clearError()
+{
+    lastError->clear();
+    errorString->clear();
+}
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index 5e9d62c..b299b47 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -63,7 +63,7 @@ public:
 
 private:
     void updateSessionState(QNetworkSession::State state);
-    void updateSessionError(QNetworkSession::SessionError error);
+    void clearError();
 
 private Q_SLOTS:
     void openSession();
@@ -71,9 +71,12 @@ private Q_SLOTS:
     void closeSession();
     void stopSession();
     void updateSession();
+    void updateSessionError(QNetworkSession::SessionError error);
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
     void deleteSession();
 #endif
+
+
 private:
     QNetworkSession *session;
     int statsTimer;
diff --git a/examples/network/bearermonitor/sessionwidget.ui b/examples/network/bearermonitor/sessionwidget.ui
index 45135f5..56a2d0e 100644
--- a/examples/network/bearermonitor/sessionwidget.ui
+++ b/examples/network/bearermonitor/sessionwidget.ui
@@ -195,7 +195,7 @@
        
         
          
-          Error String
+          Error String:
          
         
        
diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index ce3acb7..a3cccb2 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -45,6 +45,13 @@
 #include 
 #include 
 
+/*
+  Although this unit test doesn't use QNetworkAccessManager
+  this include is used to ensure that bearer continues to compile against
+  Qt 4.7+ which has a QNetworkConfiguration enabled QNetworkAccessManager
+*/
+#include 
+
 #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
 #include 
 #include 
-- 
cgit v0.12


From e75161c4d54406d137f34b9f54fed853c16a6269 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Thu, 13 May 2010 10:51:13 +1000
Subject: Cherry pick fix for MOBILITY-828 from Qt Mobility.

Change 29776be110cdc121eb5a22446be6adae8ff6f4d8 from Qt Mobility.
---
 .../bearer/symbian/qnetworksession_impl.cpp        |  4 +--
 .../qnetworksession/test/tst_qnetworksession.cpp   | 30 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 04853c4..f09c73a 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -53,7 +53,7 @@
 QT_BEGIN_NAMESPACE
 
 QNetworkSessionPrivateImpl::QNetworkSessionPrivateImpl(SymbianEngine *engine)
-    : CActive(CActive::EPriorityStandard), engine(engine),
+    : CActive(CActive::EPriorityUserInput), engine(engine),
       ipConnectionNotifier(0), iHandleStateNotificationsFromManager(false),
       iFirstSync(true), iStoppedByUser(false), iClosedByUser(false), iDeprecatedConnectionId(0),
       iError(QNetworkSession::UnknownSessionError), iALREnabled(0), iConnectInBackground(false)
@@ -1383,7 +1383,7 @@ void QNetworkSessionPrivateImpl::handleSymbianConnectionStatusChange(TInt aConne
 }
 
 ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivateImpl& owner, RConnection& connection)
-    : CActive(CActive::EPriorityStandard), iOwner(owner), iConnection(connection)
+    : CActive(CActive::EPriorityUserInput), iOwner(owner), iConnection(connection)
 {
     CActiveScheduler::Add(this);
 }
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
index 8ab9da2..934a50e 100644
--- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
@@ -263,10 +263,6 @@ void tst_QNetworkSession::robustnessBombing()
     testSession.accept();
     testSession.ignore();
     testSession.reject();
-    quint64 temp;
-    temp = testSession.bytesWritten();
-    temp = testSession.bytesReceived();
-    temp = testSession.activeTime();
 }
 
 
@@ -704,7 +700,20 @@ void tst_QNetworkSession::userChoiceSession()
 
         session.open();
 
+#if defined(Q_OS_SYMBIAN)
+        // Opening & closing multiple connections in a row sometimes
+        // results hanging of connection opening on Symbian devices
+        // => If first open fails, wait a moment and try again.
+        if (!session.waitForOpened()) {
+            qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****");        
+            session.close();
+            QTest::qWait(5000); // Wait a while before trying to open session again
+            session.open();
+            session.waitForOpened();
+        }
+#else        
         session.waitForOpened();
+#endif        
 
         if (session.isOpen())
             QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty());
@@ -843,7 +852,20 @@ void tst_QNetworkSession::sessionOpenCloseStop()
 
         session.open();
 
+#if defined(Q_OS_SYMBIAN)
+        // Opening & closing multiple connections in a row sometimes
+        // results hanging of connection opening on Symbian devices
+        // => If first open fails, wait a moment and try again.
+        if (!session.waitForOpened()) {
+            qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****");        
+            session.close();
+            QTest::qWait(5000); // Wait a while before trying to open session again
+            session.open();
+            session.waitForOpened();
+        }
+#else        
         session.waitForOpened();
+#endif        
 
         if (session.isOpen())
             QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty());
-- 
cgit v0.12


From 608d39c9ffee622114d9bc178d5e8ad3d1eadfb5 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Thu, 13 May 2010 10:54:01 +1000
Subject: Cherry pick fix for MOBILITY-962 from Qt Mobility.

6ea1caf2babc68d366fb6d3dc215c1bb18a76368
---
 tests/manual/bearerex/bearerex.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp
index 19246a2..bf60dd1 100644
--- a/tests/manual/bearerex/bearerex.cpp
+++ b/tests/manual/bearerex/bearerex.cpp
@@ -300,8 +300,12 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration,
 
 SessionTab::~SessionTab()
 {
+    // Need to be nulled, because modal dialogs may return after destruction of this object and
+    // use already released resources.
     delete m_NetworkSession;
+    m_NetworkSession = NULL;
     delete m_http;
+    m_http = NULL;
 }
 
 void SessionTab::on_createQHttpButton_clicked()
@@ -551,10 +555,16 @@ void SessionTab::done(bool error)
         msgBox.setText(QString("HTTP request finished successfully.\nReceived ")+QString::number(result.length())+QString(" bytes."));
     }
     msgBox.exec();
-    
-    sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
-                                 QString(" / ")+
-                                 QString::number(m_NetworkSession->bytesReceived()));
+    // Check if the networksession still exists - it may have gone after returning from
+    // the modal dialog (in the case that app has been closed, and deleting QHttp will
+    // trigger the done() invokation).
+    if (m_NetworkSession) {
+        sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
+                                     QString(" / ")+
+                                     QString::number(m_NetworkSession->bytesReceived()));
+    } else {
+        sentRecDataLineEdit->setText("Data amounts not available.");
+    }
 }
 
 // End of file
-- 
cgit v0.12


From 75c4dea93ad415dd9c79cb57ec5598e38789b28d Mon Sep 17 00:00:00 2001
From: Aaron McCarthy 
Date: Thu, 13 May 2010 10:55:06 +1000
Subject: Cherry pick fix for MOBILITY-932 from Qt Mobility.

807e9868152bb06d37895a5e3d1a3e49908a6036
---
 .../bearer/symbian/qnetworksession_impl.cpp        | 32 ++++++++++------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index f09c73a..ce2203d 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -523,13 +523,6 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
     // when reporting.
     iClosedByUser = true;
 
-    SymbianNetworkConfigurationPrivate *symbianConfig =
-        toSymbianConfig(privateConfiguration(activeConfig));
-
-    symbianConfig->mutex.lock();
-    TUint activeIap = symbianConfig->numericId;
-    symbianConfig->mutex.unlock();
-
     isOpen = false;
     activeConfig = QNetworkConfiguration();
     serviceConfig = QNetworkConfiguration();
@@ -554,19 +547,12 @@ void QNetworkSessionPrivateImpl::close(bool allowSignals)
     // Close global 'Open C' RConnection
     setdefaultif(0);
 
-#ifdef Q_CC_NOKIAX86
-    if ((allowSignals && iapClientCount(activeIap) <= 0) ||
-#else
-    if ((allowSignals && iapClientCount(activeIap) <= 1) ||
-#endif
-        (publicConfig.type() == QNetworkConfiguration::UserChoice)) {
+    if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
         newState(QNetworkSession::Closing);
+        newState(QNetworkSession::Disconnected);
     }
     
     if (allowSignals) {
-        if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
-            newState(QNetworkSession::Disconnected);
-        }
         emit closed();
     }
 }
@@ -599,7 +585,7 @@ void QNetworkSessionPrivateImpl::stop()
         }
         TUint numSubConnections; // Not used but needed by GetConnectionInfo i/f
         TUint connectionId;
-        for (TInt i = 1; i <= count; ++i) {
+        for (TUint i = 1; i <= count; ++i) {
             // Get (connection monitor's assigned) connection ID
             TInt ret = iConnectionMonitor.GetConnectionInfo(i, connectionId, numSubConnections);            
             if (ret == KErrNone) {
@@ -1236,7 +1222,7 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
                 QMutexLocker configLocker(&symbianConfig->mutex);
 
                 if (symbianConfig->numericId == accessPointId) {
-                    if (newState == QNetworkSession::Connected) {
+                    if (newState != QNetworkSession::Disconnected) {
                         state = newState;
 #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
                         qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed D  to: " << state;
@@ -1256,6 +1242,16 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint
 #endif
                             emit stateChanged(state);
                             retVal = true;
+                        } else if (config.state() == QNetworkConfiguration::Active) {
+                            // Connection to used IAP was closed, but there is another
+                            // IAP that's active in used SNAP
+                            // => Change state back to Connected
+                            state =  QNetworkSession::Connected;
+                            emit stateChanged(state);
+                            retVal = true;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                            qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed F  to: " << state;
+#endif
                         }
                     }
                 }
-- 
cgit v0.12


From 5cd963d2628ed7c01d331cdad03b4d77161c8b93 Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Fri, 14 May 2010 13:15:08 +1000
Subject: Fix crash in ParentAnimation.

copyOriginals plays with the order of the revertList, which messes up
the assumptions of ParentAnimation. The full fix will require some
rearchitecting of how the states and transitions handle "related"
actions, but for now this fixes the crash.

Reverting to the base state has also been fixed.

Task-number: QTBUG-10671, QTBUG-10676
---
 src/declarative/util/qdeclarativeanimation.cpp       | 14 +++++++-------
 src/declarative/util/qdeclarativepropertychanges.cpp |  4 ++--
 src/declarative/util/qdeclarativestate.cpp           |  3 ++-
 src/declarative/util/qdeclarativestate_p.h           |  1 +
 src/declarative/util/qdeclarativestateoperations.cpp |  4 ++--
 src/declarative/util/qdeclarativestateoperations_p.h |  3 ++-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 0f7c946..67440b6 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2536,13 +2536,13 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                 viaData->pc << vpc;
                 viaData->actions << myAction;
                 QDeclarativeAction dummyAction;
-                QDeclarativeAction &xAction = pc->xIsSet() ? actions[++i] : dummyAction;
-                QDeclarativeAction &yAction = pc->yIsSet() ? actions[++i] : dummyAction;
-                QDeclarativeAction &sAction = pc->scaleIsSet() ? actions[++i] : dummyAction;
-                QDeclarativeAction &rAction = pc->rotationIsSet() ? actions[++i] : dummyAction;
+                QDeclarativeAction &xAction = pc->xIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QDeclarativeAction &yAction = pc->yIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QDeclarativeAction &sAction = pc->scaleIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
+                QDeclarativeAction &rAction = pc->rotationIsSet() && i < actions.size()-1 ? actions[++i] : dummyAction;
                 bool forward = (direction == QDeclarativeAbstractAnimation::Forward);
                 QDeclarativeItem *target = pc->object();
-                QDeclarativeItem *targetParent = forward ? pc->parent() : pc->originalParent();
+                QDeclarativeItem *targetParent = action.reverseEvent ? pc->originalParent() : pc->parent();
 
                 //### this mirrors the logic in QDeclarativeParentChange.
                 bool ok;
@@ -2583,9 +2583,9 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                 if (ok && target->transformOrigin() != QDeclarativeItem::TopLeft) {
                     qreal w = target->width();
                     qreal h = target->height();
-                    if (pc->widthIsSet())
+                    if (pc->widthIsSet() && i < actions.size() - 1)
                         w = actions[++i].toValue.toReal();
-                    if (pc->heightIsSet())
+                    if (pc->heightIsSet() && i < actions.size() - 1)
                         h = actions[++i].toValue.toReal();
                     const QPointF &transformOrigin
                             = d->computeTransformOrigin(target->transformOrigin(), w,h);
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index a22c756..12fef36 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -179,7 +179,7 @@ public:
         reverseExpression = rewindExpression;
     }
 
-    virtual void copyOriginals(QDeclarativeActionEvent *other)
+    /*virtual void copyOriginals(QDeclarativeActionEvent *other)
     {
         QDeclarativeReplaceSignalHandler *rsh = static_cast(other);
         saveCurrentValues();
@@ -190,7 +190,7 @@ public:
             ownedExpression = rsh->ownedExpression;
             rsh->ownedExpression = 0;
         }
-    }
+    }*/
 
     virtual void rewind() {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index ea209aa..b5f7900 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -390,12 +390,13 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit
                     if (action.event->override(event)) {
                         found = true;
 
-                        if (action.event != d->revertList.at(jj).event) {
+                        if (action.event != d->revertList.at(jj).event && action.event->needsCopy()) {
                             action.event->copyOriginals(d->revertList.at(jj).event);
 
                             QDeclarativeSimpleAction r(action);
                             additionalReverts << r;
                             d->revertList.removeAt(jj);
+                            --jj;
                         } else if (action.event->isRewindable())    //###why needed?
                             action.event->saveCurrentValues();
 
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index 0ba67b0..25715c6 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -96,6 +96,7 @@ public:
     virtual bool isReversable();
     virtual void reverse(Reason reason = ActualChange);
     virtual void saveOriginals() {}
+    virtual bool needsCopy() { return false; }
     virtual void copyOriginals(QDeclarativeActionEvent *) {}
 
     virtual bool isRewindable() { return isReversable(); }
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index a93a25d..a6fcaf3 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -408,7 +408,7 @@ void QDeclarativeParentChange::saveOriginals()
     d->origStackBefore = d->rewindStackBefore;
 }
 
-void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other)
+/*void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other)
 {
     Q_D(QDeclarativeParentChange);
     QDeclarativeParentChange *pc = static_cast(other);
@@ -417,7 +417,7 @@ void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other)
     d->origStackBefore = pc->d_func()->rewindStackBefore;
 
     saveCurrentValues();
-}
+}*/
 
 void QDeclarativeParentChange::execute(Reason)
 {
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index e22c1e2..21a86f5 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -107,7 +107,7 @@ public:
     virtual ActionList actions();
 
     virtual void saveOriginals();
-    virtual void copyOriginals(QDeclarativeActionEvent*);
+    //virtual void copyOriginals(QDeclarativeActionEvent*);
     virtual void execute(Reason reason = ActualChange);
     virtual bool isReversable();
     virtual void reverse(Reason reason = ActualChange);
@@ -277,6 +277,7 @@ public:
     virtual bool override(QDeclarativeActionEvent*other);
     virtual bool changesBindings();
     virtual void saveOriginals();
+    virtual bool needsCopy() { return true; }
     virtual void copyOriginals(QDeclarativeActionEvent*);
     virtual void clearBindings();
     virtual void rewind();
-- 
cgit v0.12


From bea52aaaaf188293a5e235d5b5f96b386efba5ac Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Fri, 14 May 2010 13:32:49 +1000
Subject: Add a "priority" property to Keys and KeyNavigation Allows
 intercepting keys before or after normal item key processing.

Task-number: QTBUG-10467
---
 .../graphicsitems/qdeclarativegridview.cpp         |   7 +-
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 200 ++++++++++++++++++---
 src/declarative/graphicsitems/qdeclarativeitem.h   |   4 +
 src/declarative/graphicsitems/qdeclarativeitem_p.h |  37 +++-
 .../graphicsitems/qdeclarativelistview.cpp         |   7 +-
 .../graphicsitems/qdeclarativetextedit.cpp         |   9 +-
 .../graphicsitems/qdeclarativetextinput.cpp        |   3 +
 .../qdeclarativeitem/data/keyspriority.qml         |   9 +
 .../qdeclarativeitem/tst_qdeclarativeitem.cpp      | 131 +++++++++++++-
 9 files changed, 361 insertions(+), 46 deletions(-)
 create mode 100644 tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index fe78c84..e1874b8 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1651,6 +1651,9 @@ qreal QDeclarativeGridView::maxXExtent() const
 void QDeclarativeGridView::keyPressEvent(QKeyEvent *event)
 {
     Q_D(QDeclarativeGridView);
+    keyPressPreHandler(event);
+    if (event->isAccepted())
+        return;
     if (d->model && d->model->count() && d->interactive) {
         d->moveReason = QDeclarativeGridViewPrivate::SetIndex;
         int oldCurrent = currentIndex();
@@ -1676,10 +1679,8 @@ void QDeclarativeGridView::keyPressEvent(QKeyEvent *event)
         }
     }
     d->moveReason = QDeclarativeGridViewPrivate::Other;
-    QDeclarativeFlickable::keyPressEvent(event);
-    if (event->isAccepted())
-        return;
     event->ignore();
+    QDeclarativeFlickable::keyPressEvent(event);
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index f251ba1..9547884 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -375,7 +375,7 @@ void QDeclarativeContents::childAdded(QDeclarativeItem *item)
 }
 
 QDeclarativeItemKeyFilter::QDeclarativeItemKeyFilter(QDeclarativeItem *item)
-: m_next(0)
+: m_processPost(false), m_next(0)
 {
     QDeclarativeItemPrivate *p =
         item?static_cast(QGraphicsItemPrivate::get(item)):0;
@@ -389,19 +389,19 @@ QDeclarativeItemKeyFilter::~QDeclarativeItemKeyFilter()
 {
 }
 
-void QDeclarativeItemKeyFilter::keyPressed(QKeyEvent *event)
+void QDeclarativeItemKeyFilter::keyPressed(QKeyEvent *event, bool post)
 {
-    if (m_next) m_next->keyPressed(event);
+    if (m_next) m_next->keyPressed(event, post);
 }
 
-void QDeclarativeItemKeyFilter::keyReleased(QKeyEvent *event)
+void QDeclarativeItemKeyFilter::keyReleased(QKeyEvent *event, bool post)
 {
-    if (m_next) m_next->keyReleased(event);
+    if (m_next) m_next->keyReleased(event, post);
 }
 
-void QDeclarativeItemKeyFilter::inputMethodEvent(QInputMethodEvent *event)
+void QDeclarativeItemKeyFilter::inputMethodEvent(QInputMethodEvent *event, bool post)
 {
-    if (m_next) m_next->inputMethodEvent(event);
+    if (m_next) m_next->inputMethodEvent(event, post);
 }
 
 QVariant QDeclarativeItemKeyFilter::inputMethodQuery(Qt::InputMethodQuery query) const
@@ -463,9 +463,11 @@ void QDeclarativeItemKeyFilter::componentComplete()
     }
     \endcode
 
-    KeyNavigation receives key events after the item it is attached to.
+    By default KeyNavigation receives key events after the item it is attached to.
     If the item accepts an arrow key event, the KeyNavigation
-    attached property will not receive an event for that key.
+    attached property will not receive an event for that key.  Setting the
+    \l priority property to KeyNavigation.BeforeItem allows handling
+    of the key events before normal item processing.
 
     If an item has been set for a direction and the KeyNavigation
     attached property receives the corresponding
@@ -490,6 +492,7 @@ QDeclarativeKeyNavigationAttached::QDeclarativeKeyNavigationAttached(QObject *pa
 : QObject(*(new QDeclarativeKeyNavigationAttachedPrivate), parent),
   QDeclarativeItemKeyFilter(qobject_cast(parent))
 {
+    m_processPost = true;
 }
 
 QDeclarativeKeyNavigationAttached *
@@ -576,12 +579,45 @@ void QDeclarativeKeyNavigationAttached::setBacktab(QDeclarativeItem *i)
     emit changed();
 }
 
-void QDeclarativeKeyNavigationAttached::keyPressed(QKeyEvent *event)
+/*!
+    \qmlproperty enumeration KeyNavigation::priority
+
+    This property determines whether the keys are processed before
+    or after the attached item's own key handling.
+
+    \list
+    \o KeyNavigation.BeforeItem - process the key events before normal
+    item key processing.  If the event is accepted it will not
+    be passed on to the item.
+    \o KeyNavigation.AfterItem (default) - process the key events after normal item key
+    handling.  If the item accepts the key event it will not be
+    handled by the KeyNavigation attached property handler.
+    \endlist
+*/
+QDeclarativeKeyNavigationAttached::Priority QDeclarativeKeyNavigationAttached::priority() const
 {
-    Q_D(QDeclarativeKeyNavigationAttached);
+    return m_processPost ? AfterItem : BeforeItem;
+}
+
+void QDeclarativeKeyNavigationAttached::setPriority(Priority order)
+{
+    bool processPost = order == AfterItem;
+    if (processPost != m_processPost) {
+        m_processPost = processPost;
+        emit priorityChanged();
+    }
+}
 
+void QDeclarativeKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
+{
+    Q_D(QDeclarativeKeyNavigationAttached);
     event->ignore();
 
+    if (post != m_processPost) {
+        QDeclarativeItemKeyFilter::keyPressed(event, post);
+        return;
+    }
+
     switch(event->key()) {
     case Qt::Key_Left:
         if (d->left) {
@@ -623,15 +659,19 @@ void QDeclarativeKeyNavigationAttached::keyPressed(QKeyEvent *event)
         break;
     }
 
-    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyPressed(event);
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyPressed(event, post);
 }
 
-void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
+void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
 {
     Q_D(QDeclarativeKeyNavigationAttached);
-
     event->ignore();
 
+    if (post != m_processPost) {
+        QDeclarativeItemKeyFilter::keyReleased(event, post);
+        return;
+    }
+
     switch(event->key()) {
     case Qt::Key_Left:
         if (d->left) {
@@ -667,7 +707,7 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
         break;
     }
 
-    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event);
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event, post);
 }
 
 /*!
@@ -709,6 +749,28 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
 
     See \l {Qt::Key}{Qt.Key} for the list of keyboard codes.
 
+    If priority is Keys.BeforeItem (default) the order of key event processing is:
+
+    \list 1
+    \o Items specified in \c forwardTo
+    \o specific key handlers, e.g. onReturnPressed
+    \o onKeyPress, onKeyRelease handlers
+    \o Item specific key handling, e.g. TextInput key handling
+    \o parent item
+    \endlist
+
+    If priority is Keys.AfterItem the order of key event processing is:
+    \list 1
+    \o Item specific key handling, e.g. TextInput key handling
+    \o Items specified in \c forwardTo
+    \o specific key handlers, e.g. onReturnPressed
+    \o onKeyPress, onKeyRelease handlers
+    \o parent item
+    \endlist
+
+    If the event is accepted during any of the above steps, key
+    propagation stops.
+
     \sa KeyEvent, {KeyNavigation}{KeyNavigation attached property}
 */
 
@@ -720,6 +782,22 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event)
 */
 
 /*!
+    \qmlproperty enumeration Keys::priority
+
+    This property determines whether the keys are processed before
+    or after the attached item's own key handling.
+
+    \list
+    \o Keys.BeforeItem (default) - process the key events before normal
+    item key processing.  If the event is accepted it will not
+    be passed on to the item.
+    \o Keys.AfterItem - process the key events after normal item key
+    handling.  If the item accepts the key event it will not be
+    handled by the Keys attached property handler.
+    \endlist
+*/
+
+/*!
     \qmlproperty list Keys::forwardTo
 
     This property provides a way to forward key presses, key releases, and keyboard input
@@ -1039,6 +1117,7 @@ QDeclarativeKeysAttached::QDeclarativeKeysAttached(QObject *parent)
   QDeclarativeItemKeyFilter(qobject_cast(parent))
 {
     Q_D(QDeclarativeKeysAttached);
+    m_processPost = false;
     d->item = qobject_cast(parent);
 }
 
@@ -1046,6 +1125,20 @@ QDeclarativeKeysAttached::~QDeclarativeKeysAttached()
 {
 }
 
+QDeclarativeKeysAttached::Priority QDeclarativeKeysAttached::priority() const
+{
+    return m_processPost ? AfterItem : BeforeItem;
+}
+
+void QDeclarativeKeysAttached::setPriority(Priority order)
+{
+    bool processPost = order == AfterItem;
+    if (processPost != m_processPost) {
+        m_processPost = processPost;
+        emit priorityChanged();
+    }
+}
+
 void QDeclarativeKeysAttached::componentComplete()
 {
     Q_D(QDeclarativeKeysAttached);
@@ -1060,11 +1153,12 @@ void QDeclarativeKeysAttached::componentComplete()
     }
 }
 
-void QDeclarativeKeysAttached::keyPressed(QKeyEvent *event)
+void QDeclarativeKeysAttached::keyPressed(QKeyEvent *event, bool post)
 {
     Q_D(QDeclarativeKeysAttached);
-    if (!d->enabled || d->inPress) {
+    if (post != m_processPost || !d->enabled || d->inPress) {
         event->ignore();
+        QDeclarativeItemKeyFilter::keyPressed(event, post);
         return;
     }
 
@@ -1099,14 +1193,15 @@ void QDeclarativeKeysAttached::keyPressed(QKeyEvent *event)
         emit pressed(&ke);
     event->setAccepted(ke.isAccepted());
 
-    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyPressed(event);
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyPressed(event, post);
 }
 
-void QDeclarativeKeysAttached::keyReleased(QKeyEvent *event)
+void QDeclarativeKeysAttached::keyReleased(QKeyEvent *event, bool post)
 {
     Q_D(QDeclarativeKeysAttached);
-    if (!d->enabled || d->inRelease) {
+    if (post != m_processPost || !d->enabled || d->inRelease) {
         event->ignore();
+        QDeclarativeItemKeyFilter::keyReleased(event, post);
         return;
     }
 
@@ -1129,13 +1224,13 @@ void QDeclarativeKeysAttached::keyReleased(QKeyEvent *event)
     emit released(&ke);
     event->setAccepted(ke.isAccepted());
 
-    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event);
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event, post);
 }
 
-void QDeclarativeKeysAttached::inputMethodEvent(QInputMethodEvent *event)
+void QDeclarativeKeysAttached::inputMethodEvent(QInputMethodEvent *event, bool post)
 {
     Q_D(QDeclarativeKeysAttached);
-    if (d->item && !d->inIM && d->item->scene()) {
+    if (post == m_processPost && d->item && !d->inIM && d->item->scene()) {
         d->inIM = true;
         for (int ii = 0; ii < d->targets.count(); ++ii) {
             QGraphicsItem *i = d->finalFocusProxy(d->targets.at(ii));
@@ -1150,7 +1245,7 @@ void QDeclarativeKeysAttached::inputMethodEvent(QInputMethodEvent *event)
         }
         d->inIM = false;
     }
-    if (!event->isAccepted()) QDeclarativeItemKeyFilter::inputMethodEvent(event);
+    if (!event->isAccepted()) QDeclarativeItemKeyFilter::inputMethodEvent(event, post);
 }
 
 class QDeclarativeItemAccessor : public QGraphicsItem
@@ -1822,8 +1917,11 @@ void QDeclarativeItemPrivate::removeItemChangeListener(QDeclarativeItemChangeLis
 void QDeclarativeItem::keyPressEvent(QKeyEvent *event)
 {
     Q_D(QDeclarativeItem);
+    keyPressPreHandler(event);
+    if (event->isAccepted())
+        return;
     if (d->keyHandler)
-        d->keyHandler->keyPressed(event);
+        d->keyHandler->keyPressed(event, true);
     else
         event->ignore();
 }
@@ -1832,8 +1930,11 @@ void QDeclarativeItem::keyPressEvent(QKeyEvent *event)
 void QDeclarativeItem::keyReleaseEvent(QKeyEvent *event)
 {
     Q_D(QDeclarativeItem);
+    keyReleasePreHandler(event);
+    if (event->isAccepted())
+        return;
     if (d->keyHandler)
-        d->keyHandler->keyReleased(event);
+        d->keyHandler->keyReleased(event, true);
     else
         event->ignore();
 }
@@ -1842,8 +1943,11 @@ void QDeclarativeItem::keyReleaseEvent(QKeyEvent *event)
 void QDeclarativeItem::inputMethodEvent(QInputMethodEvent *event)
 {
     Q_D(QDeclarativeItem);
+    inputMethodPreHandler(event);
+    if (event->isAccepted())
+        return;
     if (d->keyHandler)
-        d->keyHandler->inputMethodEvent(event);
+        d->keyHandler->inputMethodEvent(event, true);
     else
         event->ignore();
 }
@@ -1862,6 +1966,37 @@ QVariant QDeclarativeItem::inputMethodQuery(Qt::InputMethodQuery query) const
     return v;
 }
 
+void QDeclarativeItem::keyPressPreHandler(QKeyEvent *event)
+{
+    Q_D(QDeclarativeItem);
+    if (d->keyHandler && !d->doneEventPreHandler)
+        d->keyHandler->keyPressed(event, false);
+    else
+        event->ignore();
+    d->doneEventPreHandler = true;
+}
+
+void QDeclarativeItem::keyReleasePreHandler(QKeyEvent *event)
+{
+    Q_D(QDeclarativeItem);
+    if (d->keyHandler && !d->doneEventPreHandler)
+        d->keyHandler->keyReleased(event, false);
+    else
+        event->ignore();
+    d->doneEventPreHandler = true;
+}
+
+void QDeclarativeItem::inputMethodPreHandler(QInputMethodEvent *event)
+{
+    Q_D(QDeclarativeItem);
+    if (d->keyHandler && !d->doneEventPreHandler)
+        d->keyHandler->inputMethodEvent(event, false);
+    else
+        event->ignore();
+    d->doneEventPreHandler = true;
+}
+
+
 /*!
     \internal
 */
@@ -2976,6 +3111,17 @@ void QDeclarativeItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidg
 */
 bool QDeclarativeItem::event(QEvent *ev)
 {
+    Q_D(QDeclarativeItem);
+    switch (ev->type()) {
+    case QEvent::KeyPress:
+    case QEvent::KeyRelease:
+    case QEvent::InputMethod:
+        d->doneEventPreHandler = false;
+        break;
+    default:
+        break;
+    }
+
     return QGraphicsObject::event(ev);
 }
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index 3b05b09..29fd241 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -178,6 +178,10 @@ protected:
     virtual void keyReleaseEvent(QKeyEvent *event);
     virtual void inputMethodEvent(QInputMethodEvent *);
     virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+    void keyPressPreHandler(QKeyEvent *);
+    void keyReleasePreHandler(QKeyEvent *);
+    void inputMethodPreHandler(QInputMethodEvent *);
+
     virtual void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry);
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
index 516d6d0..15b34f0 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -124,7 +124,7 @@ public:
       _stateGroup(0), origin(QDeclarativeItem::Center),
       widthValid(false), heightValid(false),
       _componentComplete(true), _keepMouse(false),
-      smooth(false), transformOriginDirty(true), keyHandler(0),
+      smooth(false), transformOriginDirty(true), doneEventPreHandler(false), keyHandler(0),
       mWidth(0), mHeight(0), implicitWidth(0), implicitHeight(0)
     {
         QGraphicsItemPrivate::acceptedMouseButtons = 0;
@@ -263,6 +263,7 @@ public:
     bool _keepMouse:1;
     bool smooth:1;
     bool transformOriginDirty : 1;
+    bool doneEventPreHandler : 1;
 
     QDeclarativeItemKeyFilter *keyHandler;
 
@@ -324,12 +325,14 @@ public:
     QDeclarativeItemKeyFilter(QDeclarativeItem * = 0);
     virtual ~QDeclarativeItemKeyFilter();
 
-    virtual void keyPressed(QKeyEvent *event);
-    virtual void keyReleased(QKeyEvent *event);
-    virtual void inputMethodEvent(QInputMethodEvent *event);
+    virtual void keyPressed(QKeyEvent *event, bool post);
+    virtual void keyReleased(QKeyEvent *event, bool post);
+    virtual void inputMethodEvent(QInputMethodEvent *event, bool post);
     virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
     virtual void componentComplete();
 
+    bool m_processPost;
+
 private:
     QDeclarativeItemKeyFilter *m_next;
 };
@@ -359,6 +362,9 @@ class QDeclarativeKeyNavigationAttached : public QObject, public QDeclarativeIte
     Q_PROPERTY(QDeclarativeItem *down READ down WRITE setDown NOTIFY changed)
     Q_PROPERTY(QDeclarativeItem *tab READ tab WRITE setTab NOTIFY changed)
     Q_PROPERTY(QDeclarativeItem *backtab READ backtab WRITE setBacktab NOTIFY changed)
+    Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
+
+    Q_ENUMS(Priority)
 
 public:
     QDeclarativeKeyNavigationAttached(QObject * = 0);
@@ -376,14 +382,19 @@ public:
     QDeclarativeItem *backtab() const;
     void setBacktab(QDeclarativeItem *);
 
+    enum Priority { BeforeItem, AfterItem };
+    Priority priority() const;
+    void setPriority(Priority);
+
     static QDeclarativeKeyNavigationAttached *qmlAttachedProperties(QObject *);
 
 Q_SIGNALS:
     void changed();
+    void priorityChanged();
 
 private:
-    virtual void keyPressed(QKeyEvent *event);
-    virtual void keyReleased(QKeyEvent *event);
+    virtual void keyPressed(QKeyEvent *event, bool post);
+    virtual void keyReleased(QKeyEvent *event, bool post);
 };
 
 class QDeclarativeKeysAttachedPrivate : public QObjectPrivate
@@ -423,6 +434,9 @@ class QDeclarativeKeysAttached : public QObject, public QDeclarativeItemKeyFilte
 
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
     Q_PROPERTY(QDeclarativeListProperty forwardTo READ forwardTo)
+    Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
+
+    Q_ENUMS(Priority)
 
 public:
     QDeclarativeKeysAttached(QObject *parent=0);
@@ -437,6 +451,10 @@ public:
         }
     }
 
+    enum Priority { BeforeItem, AfterItem};
+    Priority priority() const;
+    void setPriority(Priority);
+
     QDeclarativeListProperty forwardTo() {
         Q_D(QDeclarativeKeysAttached);
         return QDeclarativeListProperty(this, d->targets);
@@ -448,6 +466,7 @@ public:
 
 Q_SIGNALS:
     void enabledChanged();
+    void priorityChanged();
     void pressed(QDeclarativeKeyEvent *event);
     void released(QDeclarativeKeyEvent *event);
     void digit0Pressed(QDeclarativeKeyEvent *event);
@@ -492,9 +511,9 @@ Q_SIGNALS:
     void volumeDownPressed(QDeclarativeKeyEvent *event);
 
 private:
-    virtual void keyPressed(QKeyEvent *event);
-    virtual void keyReleased(QKeyEvent *event);
-    virtual void inputMethodEvent(QInputMethodEvent *);
+    virtual void keyPressed(QKeyEvent *event, bool post);
+    virtual void keyReleased(QKeyEvent *event, bool post);
+    virtual void inputMethodEvent(QInputMethodEvent *, bool post);
     virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
 
     const QByteArray keyToSignal(int key) {
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 46e9ce3..bd4c386 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -2263,6 +2263,9 @@ qreal QDeclarativeListView::maxXExtent() const
 void QDeclarativeListView::keyPressEvent(QKeyEvent *event)
 {
     Q_D(QDeclarativeListView);
+    keyPressPreHandler(event);
+    if (event->isAccepted())
+        return;
 
     if (d->model && d->model->count() && d->interactive) {
         if ((d->orient == QDeclarativeListView::Horizontal && event->key() == Qt::Key_Left)
@@ -2287,10 +2290,8 @@ void QDeclarativeListView::keyPressEvent(QKeyEvent *event)
             }
         }
     }
-    QDeclarativeFlickable::keyPressEvent(event);
-    if (event->isAccepted())
-        return;
     event->ignore();
+    QDeclarativeFlickable::keyPressEvent(event);
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index db20da8..7f71dd2 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -858,8 +858,9 @@ Handles the given key \a event.
 void QDeclarativeTextEdit::keyPressEvent(QKeyEvent *event)
 {
     Q_D(QDeclarativeTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
-
+    keyPressPreHandler(event);
+    if (!event->isAccepted())
+        d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
         QDeclarativePaintedItem::keyPressEvent(event);
 }
@@ -871,7 +872,9 @@ Handles the given key \a event.
 void QDeclarativeTextEdit::keyReleaseEvent(QKeyEvent *event)
 {
     Q_D(QDeclarativeTextEdit);
-    d->control->processEvent(event, QPointF(0, 0));
+    keyReleasePreHandler(event);
+    if (!event->isAccepted())
+        d->control->processEvent(event, QPointF(0, 0));
     if (!event->isAccepted())
         QDeclarativePaintedItem::keyReleaseEvent(event);
 }
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index afbaaac..054fefd 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -863,6 +863,9 @@ void QDeclarativeTextInputPrivate::focusChanged(bool hasFocus)
 void QDeclarativeTextInput::keyPressEvent(QKeyEvent* ev)
 {
     Q_D(QDeclarativeTextInput);
+    keyPressPreHandler(ev);
+    if (ev->isAccepted())
+        return;
     if (((ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down) && ev->modifiers() == Qt::NoModifier) // Don't allow MacOSX up/down support, and we don't allow a completer.
         || (((d->control->cursor() == 0 && ev->key() == Qt::Key_Left)
             || (d->control->cursor() == d->control->text().length()
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml b/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml
new file mode 100644
index 0000000..171536b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml
@@ -0,0 +1,9 @@
+import Qt 4.7
+import Test 1.0
+
+KeyTestItem {
+    focus: true
+    Keys.onPressed: keysTestObject.keyPress(event.key, event.text, event.modifiers)
+    Keys.onReleased: { keysTestObject.keyRelease(event.key, event.text, event.modifiers); event.accepted = true; }
+    Keys.priority: keysTestObject.processLast ? Keys.AfterItem : Keys.BeforeItem
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index f4edeb2..ecc813e 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -55,7 +55,9 @@ public:
     tst_QDeclarativeItem();
 
 private slots:
+    void initTestCase();
     void keys();
+    void keysProcessingOrder();
     void keyNavigation();
     void smooth();
     void clip();
@@ -79,8 +81,11 @@ private:
 class KeysTestObject : public QObject
 {
     Q_OBJECT
+
+    Q_PROPERTY(bool processLast READ processLast NOTIFY processLastChanged)
+
 public:
-    KeysTestObject() : mKey(0), mModifiers(0), mForwardedKey(0) {}
+    KeysTestObject() : mKey(0), mModifiers(0), mForwardedKey(0), mLast(false) {}
 
     void reset() {
         mKey = 0;
@@ -89,6 +94,14 @@ public:
         mForwardedKey = 0;
     }
 
+    bool processLast() const { return mLast; }
+    void setProcessLast(bool b) {
+        if (b != mLast) {
+            mLast = b;
+            emit processLastChanged();
+        }
+    }
+
 public slots:
     void keyPress(int key, QString text, int modifiers) {
         mKey = key;
@@ -104,20 +117,73 @@ public slots:
         mForwardedKey = key;
     }
 
+signals:
+    void processLastChanged();
+
 public:
     int mKey;
     QString mText;
     int mModifiers;
     int mForwardedKey;
+    bool mLast;
 
 private:
 };
 
+class KeyTestItem : public QDeclarativeItem
+{
+    Q_OBJECT
+public:
+    KeyTestItem(QDeclarativeItem *parent=0) : QDeclarativeItem(parent), mKey(0) {}
+
+protected:
+    void keyPressEvent(QKeyEvent *e) {
+        keyPressPreHandler(e);
+        if (e->isAccepted())
+            return;
+
+        mKey = e->key();
+
+        if (e->key() == Qt::Key_A)
+            e->accept();
+        else
+            e->ignore();
+
+        if (!e->isAccepted())
+            QDeclarativeItem::keyPressEvent(e);
+    }
+
+    void keyReleaseEvent(QKeyEvent *e) {
+        keyReleasePreHandler(e);
+
+        if (e->isAccepted())
+            return;
+
+        if (e->key() == Qt::Key_B)
+            e->accept();
+        else
+            e->ignore();
+
+        if (!e->isAccepted())
+            QDeclarativeItem::keyReleaseEvent(e);
+    }
+
+public:
+    int mKey;
+};
+
+QML_DECLARE_TYPE(KeyTestItem);
+
 
 tst_QDeclarativeItem::tst_QDeclarativeItem()
 {
 }
 
+void tst_QDeclarativeItem::initTestCase()
+{
+    qmlRegisterType("Test",1,0,"KeyTestItem");
+}
+
 void tst_QDeclarativeItem::keys()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
@@ -214,6 +280,69 @@ void tst_QDeclarativeItem::keys()
     QCOMPARE(testObject->mKey, 0);
     QVERIFY(!key.isAccepted());
 
+    canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(true));
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_Return));
+    QVERIFY(key.isAccepted());
+
+    delete canvas;
+    delete testObject;
+}
+
+void tst_QDeclarativeItem::keysProcessingOrder()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    KeysTestObject *testObject = new KeysTestObject;
+    canvas->rootContext()->setContextProperty("keysTestObject", testObject);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keyspriority.qml"));
+    canvas->show();
+    qApp->processEvents();
+
+    KeyTestItem *testItem = qobject_cast(canvas->rootObject());
+    QVERIFY(testItem);
+
+    QEvent wa(QEvent::WindowActivate);
+    QApplication::sendEvent(canvas, &wa);
+    QFocusEvent fe(QEvent::FocusIn);
+    QApplication::sendEvent(canvas, &fe);
+
+    QKeyEvent key(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_A));
+    QCOMPARE(testObject->mText, QLatin1String("A"));
+    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QVERIFY(key.isAccepted());
+
+    testObject->reset();
+
+    testObject->setProcessLast(true);
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_A, Qt::NoModifier, "A", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, 0);
+    QVERIFY(key.isAccepted());
+
+    testObject->reset();
+
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_B, Qt::NoModifier, "B", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, int(Qt::Key_B));
+    QCOMPARE(testObject->mText, QLatin1String("B"));
+    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QVERIFY(!key.isAccepted());
+
+    testObject->reset();
+
+    key = QKeyEvent(QEvent::KeyRelease, Qt::Key_B, Qt::NoModifier, "B", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QCOMPARE(testObject->mKey, 0);
+    QVERIFY(key.isAccepted());
+
     delete canvas;
     delete testObject;
 }
-- 
cgit v0.12


From 645b9ee9dd6e0576542cc61872ecedb408ca8a89 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 14 May 2010 13:45:08 +1000
Subject: Add Qt.include() method for scoped inclusion of JavaScript files

---
 src/declarative/qml/qdeclarativeinclude.cpp        | 255 +++++++++++++++++++++
 src/declarative/qml/qdeclarativeinclude_p.h        | 112 +++++++++
 .../qdeclarativeecmascript/data/blank.js           |   0
 .../qdeclarativeecmascript/data/exception.js       |   1 +
 .../qdeclarativeecmascript/data/include.js         |   8 +
 .../qdeclarativeecmascript/data/include.qml        |  23 ++
 .../data/include_callback.js                       |  11 +
 .../data/include_callback.qml                      |  15 ++
 .../qdeclarativeecmascript/data/include_remote.js  |  26 +++
 .../qdeclarativeecmascript/data/include_remote.qml |  21 ++
 .../data/include_remote_missing.js                 |  13 ++
 .../data/include_remote_missing.qml                |  12 +
 .../qdeclarativeecmascript/data/include_shared.js  |  12 +
 .../qdeclarativeecmascript/data/include_shared.qml |  22 ++
 .../qdeclarativeecmascript/data/js/include2.js     |   4 +
 .../qdeclarativeecmascript/data/js/include3.js     |   3 +
 .../qdeclarativeecmascript/data/remote_file.js     |   2 +
 17 files changed, 540 insertions(+)
 create mode 100644 src/declarative/qml/qdeclarativeinclude.cpp
 create mode 100644 src/declarative/qml/qdeclarativeinclude_p.h
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/blank.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/exception.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js

diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp
new file mode 100644
index 0000000..97af5b5
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeinclude.cpp
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** 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 "qdeclarativeinclude_p.h"
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeInclude::QDeclarativeInclude(const QUrl &url, 
+                                                       QDeclarativeEngine *engine, 
+                                                       QScriptContext *ctxt)
+: QObject(engine), m_engine(engine), m_network(0), m_reply(0), m_url(url), m_redirectCount(0)
+{
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    m_context = ep->contextClass->contextFromValue(QScriptDeclarativeClass::scopeChainValue(ctxt, -3));
+
+    m_scope[0] = QScriptDeclarativeClass::scopeChainValue(ctxt, -4);
+    m_scope[1] = QScriptDeclarativeClass::scopeChainValue(ctxt, -5);
+
+    m_scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+    m_network = QDeclarativeScriptEngine::get(m_scriptEngine)->networkAccessManager();
+
+    m_result = resultValue(m_scriptEngine);
+
+    QNetworkRequest request;
+    request.setUrl(url);
+
+    m_reply = m_network->get(request);
+    QObject::connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
+}
+
+QDeclarativeInclude::~QDeclarativeInclude()
+{
+    if (m_reply)
+        delete m_reply;
+}
+
+QScriptValue QDeclarativeInclude::resultValue(QScriptEngine *engine, Status status)
+{
+    QScriptValue result = engine->newObject();
+    result.setProperty(QLatin1String("OK"), QScriptValue(engine, Ok));
+    result.setProperty(QLatin1String("LOADING"), QScriptValue(engine, Loading));
+    result.setProperty(QLatin1String("NETWORK_ERROR"), QScriptValue(engine, NetworkError));
+    result.setProperty(QLatin1String("EXCEPTION"), QScriptValue(engine, Exception));
+
+    result.setProperty(QLatin1String("status"), QScriptValue(engine, status));
+    return result;
+}
+
+QScriptValue QDeclarativeInclude::result() const
+{
+    return m_result;
+}
+
+void QDeclarativeInclude::setCallback(const QScriptValue &c)
+{
+    m_callback = c;
+}
+
+QScriptValue QDeclarativeInclude::callback() const
+{
+    return m_callback;
+}
+
+#define INCLUDE_MAXIMUM_REDIRECT_RECURSION 15
+void QDeclarativeInclude::finished()
+{
+    m_redirectCount++;
+
+    if (m_redirectCount < INCLUDE_MAXIMUM_REDIRECT_RECURSION) {
+        QVariant redirect = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+        if (redirect.isValid()) {
+            m_url = m_url.resolved(redirect.toUrl());
+            delete m_reply;
+            
+            QNetworkRequest request;
+            request.setUrl(m_url);
+
+            m_reply = m_network->get(request);
+            QObject::connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
+            return;
+        }
+    }
+
+    if (m_reply->error() == QNetworkReply::NoError) {
+        QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(m_engine);
+
+        QByteArray data = m_reply->readAll();
+
+        QString code = QString::fromUtf8(data);
+
+        QString urlString = m_url.toString();
+        QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(m_scriptEngine);
+        scriptContext->pushScope(ep->contextClass->newUrlContext(m_context, 0, urlString));
+        scriptContext->pushScope(m_scope[0]);
+
+        scriptContext->pushScope(m_scope[1]);
+        scriptContext->setActivationObject(m_scope[1]);
+
+        m_scriptEngine->evaluate(code, urlString, 1);
+
+        m_scriptEngine->popContext();
+
+        if (m_scriptEngine->hasUncaughtException()) {
+            m_result.setProperty(QLatin1String("status"), QScriptValue(m_scriptEngine, Exception));
+            m_result.setProperty(QLatin1String("exception"), m_scriptEngine->uncaughtException());
+        } else {
+            m_result.setProperty(QLatin1String("status"), QScriptValue(m_scriptEngine, Ok));
+        }
+    } else {
+        m_result.setProperty(QLatin1String("status"), QScriptValue(m_scriptEngine, NetworkError));
+    }
+
+    callback(m_scriptEngine, m_callback, m_result);
+
+    delete this;
+}
+
+void QDeclarativeInclude::callback(QScriptEngine *engine, QScriptValue &callback, QScriptValue &status)
+{
+    if (callback.isValid()) {
+        QScriptValue args = engine->newArray(1);
+        args.setProperty(0, status);
+        callback.call(QScriptValue(), args);
+    }
+}
+
+static QString toLocalFileOrQrc(const QUrl& url)
+{
+    if (url.scheme() == QLatin1String("qrc")) {
+        if (url.authority().isEmpty())
+            return QLatin1Char(':') + url.path();
+        return QString();
+    }
+    return url.toLocalFile();
+}
+
+QScriptValue QDeclarativeInclude::include(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if (ctxt->argumentCount() == 0)
+        return engine->undefinedValue();
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    QUrl contextUrl = ep->contextClass->urlFromValue(QScriptDeclarativeClass::scopeChainValue(ctxt, -3));
+    if (contextUrl.isEmpty()) 
+        return ctxt->throwError(QLatin1String("Qt.include(): Can only be called from JavaScript files"));
+
+    QString urlString = ctxt->argument(0).toString();
+    QUrl url(ctxt->argument(0).toString());
+    if (url.isRelative()) {
+        url = QUrl(contextUrl).resolved(url);
+        urlString = url.toString();
+    }
+
+    QString localFile = toLocalFileOrQrc(url);
+
+    QScriptValue func = ctxt->argument(1);
+    if (!func.isFunction())
+        func = QScriptValue();
+
+    QScriptValue result;
+    if (localFile.isEmpty()) {
+        QDeclarativeInclude *i = 
+            new QDeclarativeInclude(url, QDeclarativeEnginePrivate::getEngine(engine), ctxt);
+
+        if (func.isValid())
+            i->setCallback(func);
+
+        result = i->result();
+    } else {
+
+        QFile f(localFile);
+        if (f.open(QIODevice::ReadOnly)) {
+            QByteArray data = f.readAll();
+            QString code = QString::fromUtf8(data);
+
+            QDeclarativeContextData *context = 
+                ep->contextClass->contextFromValue(QScriptDeclarativeClass::scopeChainValue(ctxt, -3));
+
+            QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(engine);
+            scriptContext->pushScope(ep->contextClass->newUrlContext(context, 0, urlString));
+            scriptContext->pushScope(ep->globalClass->globalObject());
+            QScriptValue scope = QScriptDeclarativeClass::scopeChainValue(ctxt, -5);
+            scriptContext->pushScope(scope);
+            scriptContext->setActivationObject(scope);
+
+            engine->evaluate(code, urlString, 1);
+
+            engine->popContext();
+
+            if (engine->hasUncaughtException()) {
+                result = resultValue(engine, Exception);
+                result.setProperty(QLatin1String("exception"), engine->uncaughtException());
+            } else {
+                result = resultValue(engine, Ok);
+            }
+            callback(engine, func, result);
+        } else {
+            result = resultValue(engine, NetworkError);
+            callback(engine, func, result);
+        }
+    }
+
+    return result;
+}
+
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeinclude_p.h b/src/declarative/qml/qdeclarativeinclude_p.h
new file mode 100644
index 0000000..28c49ea
--- /dev/null
+++ b/src/declarative/qml/qdeclarativeinclude_p.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** 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 QDECLARATIVEINCLUDE_P_H
+#define QDECLARATIVEINCLUDE_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include 
+#include 
+#include 
+
+#include 
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeEngine;
+class QScriptContext;
+class QScriptEngine;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QDeclarativeInclude : public QObject
+{
+    Q_OBJECT
+public:
+    enum Status {
+        Ok = 0,
+        Loading = 1,
+        NetworkError = 2,
+        Exception = 3
+    };
+
+    QDeclarativeInclude(const QUrl &, QDeclarativeEngine *, QScriptContext *ctxt);
+    ~QDeclarativeInclude();
+
+    void setCallback(const QScriptValue &);
+    QScriptValue callback() const;
+
+    QScriptValue result() const;
+
+    static QScriptValue resultValue(QScriptEngine *, Status status = Loading);
+    static void callback(QScriptEngine *, QScriptValue &callback, QScriptValue &status);
+    static QScriptValue include(QScriptContext *ctxt, QScriptEngine *engine);
+
+public slots:
+    void finished();
+
+private:
+    QDeclarativeEngine *m_engine;
+    QScriptEngine *m_scriptEngine;
+    QNetworkAccessManager *m_network;
+    QNetworkReply *m_reply;
+
+    QUrl m_url;
+    int m_redirectCount;
+    QScriptValue m_callback;
+    QScriptValue m_result;
+    QDeclarativeGuardedContextData m_context;
+    QScriptValue m_scope[2];
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEINCLUDE_P_H
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/blank.js b/tests/auto/declarative/qdeclarativeecmascript/data/blank.js
new file mode 100644
index 0000000..e69de29
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/exception.js b/tests/auto/declarative/qdeclarativeecmascript/data/exception.js
new file mode 100644
index 0000000..160bbfa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/exception.js
@@ -0,0 +1 @@
+throw("Whoops!");
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include.js b/tests/auto/declarative/qdeclarativeecmascript/data/include.js
new file mode 100644
index 0000000..232fd80
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include.js
@@ -0,0 +1,8 @@
+var test1 = true
+var test2 = false
+var test3 = false
+
+function go() {
+    Qt.include("js/include2.js");
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include.qml
new file mode 100644
index 0000000..18543b2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include.qml
@@ -0,0 +1,23 @@
+import Qt 4.7
+import "include.js" as IncludeTest
+
+QtObject {
+    property int test0: 0
+    property bool test1: false
+    property bool test2: false
+    property bool test2_1: false
+    property bool test3: false
+    property bool test3_1: false
+
+    property int testValue: 99
+
+    Component.onCompleted: { 
+        IncludeTest.go(); 
+        test0 = IncludeTest.value
+        test1 = IncludeTest.test1
+        test2 = IncludeTest.test2
+        test2_1 = IncludeTest.test2_1
+        test3 = IncludeTest.test3
+        test3_1 = IncludeTest.test3_1
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js
new file mode 100644
index 0000000..ea19eba
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.js
@@ -0,0 +1,11 @@
+function go() {
+    var a = Qt.include("missing.js", function(o) { test2 = o.status == o.NETWORK_ERROR });
+    test1 = a.status == a.NETWORK_ERROR
+
+    var b = Qt.include("blank.js", function(o) { test4 = o.status == o.OK });
+    test3 = b.status == b.OK
+
+    var c = Qt.include("exception.js", function(o) { test6 = o.status == o.EXCEPTION });
+    test5 = c.status == c.EXCEPTION
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml
new file mode 100644
index 0000000..a39e821
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+import "include_callback.js" as IncludeTest
+
+QtObject {
+    property bool test1: false
+    property bool test2: false
+    property bool test3: false
+    property bool test4: false
+    property bool test5: false
+    property bool test6: false
+
+    Component.onCompleted: { 
+        IncludeTest.go(); 
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js
new file mode 100644
index 0000000..e6a4676
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.js
@@ -0,0 +1,26 @@
+var myvar = 10;
+
+function go()
+{
+    var a = Qt.include("http://127.0.0.1:8111/remote_file.js", 
+                       function(o) { 
+                            test2 = o.status == o.OK
+                            test3 = a.status == a.OK
+                            test4 = myvar == 13
+
+                            done = true;
+                       });
+    test1 = a.status == a.LOADING
+
+
+    var b = Qt.include("http://127.0.0.1:8111/exception.js", 
+                       function(o) { 
+                            test7 = o.status == o.EXCEPTION
+                            test8 = b.status == a.EXCEPTION
+                            test9 = b.exception.toString() == "Whoops!";
+                            test10 = o.exception.toString() == "Whoops!";
+
+                            done2 = true;
+                       });
+    test6 = b.status == b.LOADING
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml
new file mode 100644
index 0000000..06bd174
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml
@@ -0,0 +1,21 @@
+import Qt 4.7
+import "include_remote.js" as IncludeTest
+
+QtObject {
+    property bool done: false
+    property bool done2: false
+
+    property bool test1: false
+    property bool test2: false
+    property bool test3: false
+    property bool test4: false
+    property bool test5: false
+
+    property bool test6: false
+    property bool test7: false
+    property bool test8: false
+    property bool test9: false
+    property bool test10: false
+
+    Component.onCompleted: IncludeTest.go();
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js
new file mode 100644
index 0000000..cc90860
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.js
@@ -0,0 +1,13 @@
+function go()
+{
+    var a = Qt.include("http://127.0.0.1:8111/missing.js", 
+                       function(o) { 
+                            test2 = o.status == o.NETWORK_ERROR
+                            test3 = a.status == a.NETWORK_ERROR
+
+                            done = true;
+                       });
+
+    test1 = a.status == a.LOADING
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml
new file mode 100644
index 0000000..8e486b2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml
@@ -0,0 +1,12 @@
+import Qt 4.7
+import "include_remote_missing.js" as IncludeTest
+
+QtObject {
+    property bool done: false
+
+    property bool test1: false
+    property bool test2: false
+    property bool test3: false
+
+    Component.onCompleted: IncludeTest.go();
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js
new file mode 100644
index 0000000..a49c07b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.js
@@ -0,0 +1,12 @@
+.pragma library
+
+var test1 = true
+var test2 = false
+var test3 = false
+
+var testValue = 99;
+
+function go() {
+    Qt.include("js/include2.js");
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml
new file mode 100644
index 0000000..e957018
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+import "include_shared.js" as IncludeTest
+
+QtObject {
+    property int test0: 0
+    property bool test1: false
+    property bool test2: false
+    property bool test2_1: false
+    property bool test3: false
+    property bool test3_1: false
+
+    Component.onCompleted: { 
+        IncludeTest.go(); 
+        test0 = IncludeTest.value
+        test1 = IncludeTest.test1
+        test2 = IncludeTest.test2
+        test2_1 = IncludeTest.test2_1
+        test3 = IncludeTest.test3
+        test3_1 = IncludeTest.test3_1
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js b/tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js
new file mode 100644
index 0000000..2a0c039
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/js/include2.js
@@ -0,0 +1,4 @@
+test2 = true
+var test2_1 = true
+
+Qt.include("include3.js");
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js b/tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js
new file mode 100644
index 0000000..84b2770
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/js/include3.js
@@ -0,0 +1,3 @@
+test3 = true
+var test3_1 = true
+var value = testValue
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js b/tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js
new file mode 100644
index 0000000..1b123ae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/remote_file.js
@@ -0,0 +1,2 @@
+myvar = 13;
+test5 = true;
-- 
cgit v0.12


From 0d608587f35f7659376a728cf8ee6b4b71ec9d5a Mon Sep 17 00:00:00 2001
From: Michael Brasser 
Date: Fri, 14 May 2010 13:56:45 +1000
Subject: Reduce the chance of AnchorAnimation animating geometry changes it
 isn't responsible for.

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

diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index a6fcaf3..0326f6d 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -1241,24 +1241,28 @@ QList QDeclarativeAnchorChanges::additionalActions()
     Q_D(QDeclarativeAnchorChanges);
     QList extra;
 
+    QDeclarativeAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors;
+    bool hChange = combined & QDeclarativeAnchors::Horizontal_Mask;
+    bool vChange = combined & QDeclarativeAnchors::Vertical_Mask;
+
     if (d->target) {
         QDeclarativeAction a;
-        if (d->fromX != d->toX) {
+        if (hChange && d->fromX != d->toX) {
             a.property = QDeclarativeProperty(d->target, QLatin1String("x"));
             a.toValue = d->toX;
             extra << a;
         }
-        if (d->fromY != d->toY) {
+        if (vChange && d->fromY != d->toY) {
             a.property = QDeclarativeProperty(d->target, QLatin1String("y"));
             a.toValue = d->toY;
             extra << a;
         }
-        if (d->fromWidth != d->toWidth) {
+        if (hChange && d->fromWidth != d->toWidth) {
             a.property = QDeclarativeProperty(d->target, QLatin1String("width"));
             a.toValue = d->toWidth;
             extra << a;
         }
-        if (d->fromHeight != d->toHeight) {
+        if (vChange && d->fromHeight != d->toHeight) {
             a.property = QDeclarativeProperty(d->target, QLatin1String("height"));
             a.toValue = d->toHeight;
             extra << a;
-- 
cgit v0.12


From 17a5c63a499b10036dc14135457ec22c89270f9a Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 14 May 2010 14:00:21 +1000
Subject: Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89

Grrr
---
 src/declarative/qml/qdeclarativecontext.cpp        |   4 +-
 .../qml/qdeclarativecontextscriptclass.cpp         |  46 ++++++++-
 .../qml/qdeclarativecontextscriptclass_p.h         |   4 +
 src/declarative/qml/qdeclarativeengine.cpp         |   2 +
 .../qml/qdeclarativeglobalscriptclass_p.h          |   1 +
 src/declarative/qml/qdeclarativeinclude.cpp        |  10 +-
 src/declarative/qml/qdeclarativeinclude_p.h        |   3 +-
 src/declarative/qml/qml.pri                        |   2 +
 .../qdeclarativeecmascript.pro                     |  11 +-
 .../tst_qdeclarativeecmascript.cpp                 | 111 +++++++++++++++++++++
 10 files changed, 182 insertions(+), 12 deletions(-)

diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index b61b8cb..6a13f15 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -659,7 +659,7 @@ void QDeclarativeContextData::addImportedScript(const QDeclarativeParser::Object
         if (iter == enginePriv->m_sharedScriptImports.end()) {
             QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
 
-            scriptContext->pushScope(enginePriv->contextClass->newContext(0, 0));
+            scriptContext->pushScope(enginePriv->contextClass->newUrlContext(url));
             scriptContext->pushScope(enginePriv->globalClass->globalObject());
         
             QScriptValue scope = scriptEngine->newObject();
@@ -685,7 +685,7 @@ void QDeclarativeContextData::addImportedScript(const QDeclarativeParser::Object
 
         QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine);
 
-        scriptContext->pushScope(enginePriv->contextClass->newContext(this, 0));
+        scriptContext->pushScope(enginePriv->contextClass->newUrlContext(this, 0, url));
         scriptContext->pushScope(enginePriv->globalClass->globalObject());
         
         QScriptValue scope = scriptEngine->newObject();
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass.cpp b/src/declarative/qml/qdeclarativecontextscriptclass.cpp
index 1336a1a..1ebedbb 100644
--- a/src/declarative/qml/qdeclarativecontextscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativecontextscriptclass.cpp
@@ -51,11 +51,13 @@ QT_BEGIN_NAMESPACE
 
 struct ContextData : public QScriptDeclarativeClass::Object {
     ContextData() : overrideObject(0), isSharedContext(true) {}
-    ContextData(QDeclarativeContextData *c, QObject *o) : context(c), scopeObject(o), overrideObject(0), isSharedContext(false) {}
+    ContextData(QDeclarativeContextData *c, QObject *o) 
+    : context(c), scopeObject(o), overrideObject(0), isSharedContext(false), isUrlContext(false) {}
     QDeclarativeGuardedContextData context;
     QDeclarativeGuard scopeObject;
     QObject *overrideObject;
-    bool isSharedContext;
+    bool isSharedContext:1;
+    bool isUrlContext:1;
 
     QDeclarativeContextData *getContext(QDeclarativeEngine *engine) {
         if (isSharedContext) {
@@ -74,6 +76,18 @@ struct ContextData : public QScriptDeclarativeClass::Object {
     }
 };
 
+struct UrlContextData : public ContextData {
+    UrlContextData(QDeclarativeContextData *c, QObject *o, const QString &u) 
+    : ContextData(c, o), url(u) {
+        isUrlContext = true;
+    }
+    UrlContextData(const QString &u) 
+    : ContextData(0, 0), url(u) {
+        isUrlContext = true;
+    }
+    QString url;
+};
+
 /*
     The QDeclarativeContextScriptClass handles property access for a QDeclarativeContext
     via QtScript.
@@ -95,6 +109,21 @@ QScriptValue QDeclarativeContextScriptClass::newContext(QDeclarativeContextData
     return newObject(scriptEngine, this, new ContextData(context, scopeObject));
 }
 
+QScriptValue QDeclarativeContextScriptClass::newUrlContext(QDeclarativeContextData *context, QObject *scopeObject, 
+                                                           const QString &url)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return newObject(scriptEngine, this, new UrlContextData(context, scopeObject, url));
+}
+
+QScriptValue QDeclarativeContextScriptClass::newUrlContext(const QString &url)
+{
+    QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
+
+    return newObject(scriptEngine, this, new UrlContextData(url));
+}
+
 QScriptValue QDeclarativeContextScriptClass::newSharedContext()
 {
     QScriptEngine *scriptEngine = QDeclarativeEnginePrivate::getScriptEngine(engine);
@@ -111,6 +140,19 @@ QDeclarativeContextData *QDeclarativeContextScriptClass::contextFromValue(const
     return data->getContext(engine);
 }
 
+QUrl QDeclarativeContextScriptClass::urlFromValue(const QScriptValue &v)
+{
+    if (scriptClass(v) != this)
+        return QUrl();
+
+    ContextData *data = (ContextData *)object(v);
+    if (data->isUrlContext) {
+        return QUrl(static_cast(data)->url);
+    } else {
+        return QUrl();
+    }
+}
+
 QObject *QDeclarativeContextScriptClass::setOverrideObject(QScriptValue &v, QObject *override)
 {
     if (scriptClass(v) != this)
diff --git a/src/declarative/qml/qdeclarativecontextscriptclass_p.h b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
index 1936d38..1215b00 100644
--- a/src/declarative/qml/qdeclarativecontextscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
@@ -68,9 +68,13 @@ public:
     ~QDeclarativeContextScriptClass();
 
     QScriptValue newContext(QDeclarativeContextData *, QObject * = 0);
+    QScriptValue newUrlContext(QDeclarativeContextData *, QObject *, const QString &);
+    QScriptValue newUrlContext(const QString &);
     QScriptValue newSharedContext();
 
     QDeclarativeContextData *contextFromValue(const QScriptValue &);
+    QUrl urlFromValue(const QScriptValue &);
+
     QObject *setOverrideObject(QScriptValue &, QObject *);
 
 protected:
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 94e6771..5cb59da 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -67,6 +67,7 @@
 #include "qdeclarativeextensioninterface.h"
 #include "private/qdeclarativelist_p.h"
 #include "private/qdeclarativetypenamecache_p.h"
+#include "private/qdeclarativeinclude_p.h"
 
 #include 
 #include 
@@ -204,6 +205,7 @@ QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *pr
     // XXX used to add Qt.Sound class.
 
     //types
+    qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2));
     qtObject.setProperty(QLatin1String("isQtObject"), newFunction(QDeclarativeEnginePrivate::isQtObject, 1));
     qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4));
     qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4));
diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
index 1b34aee..7690edd 100644
--- a/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativeglobalscriptclass_p.h
@@ -76,6 +76,7 @@ public:
     void explicitSetProperty(const QString &, const QScriptValue &);
 
     const QScriptValue &globalObject() const { return m_globalObject; }
+
     const QSet &illegalNames() const { return m_illegalNames; }
 
 private:
diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp
index 97af5b5..b886935 100644
--- a/src/declarative/qml/qdeclarativeinclude.cpp
+++ b/src/declarative/qml/qdeclarativeinclude.cpp
@@ -76,8 +76,7 @@ QDeclarativeInclude::QDeclarativeInclude(const QUrl &url,
 
 QDeclarativeInclude::~QDeclarativeInclude()
 {
-    if (m_reply)
-        delete m_reply;
+    delete m_reply;
 }
 
 QScriptValue QDeclarativeInclude::resultValue(QScriptEngine *engine, Status status)
@@ -116,7 +115,7 @@ void QDeclarativeInclude::finished()
         QVariant redirect = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
         if (redirect.isValid()) {
             m_url = m_url.resolved(redirect.toUrl());
-            delete m_reply;
+            delete m_reply; 
             
             QNetworkRequest request;
             request.setUrl(m_url);
@@ -149,6 +148,7 @@ void QDeclarativeInclude::finished()
         if (m_scriptEngine->hasUncaughtException()) {
             m_result.setProperty(QLatin1String("status"), QScriptValue(m_scriptEngine, Exception));
             m_result.setProperty(QLatin1String("exception"), m_scriptEngine->uncaughtException());
+            m_scriptEngine->clearExceptions();
         } else {
             m_result.setProperty(QLatin1String("status"), QScriptValue(m_scriptEngine, Ok));
         }
@@ -158,7 +158,8 @@ void QDeclarativeInclude::finished()
 
     callback(m_scriptEngine, m_callback, m_result);
 
-    delete this;
+    disconnect();
+    deleteLater();
 }
 
 void QDeclarativeInclude::callback(QScriptEngine *engine, QScriptValue &callback, QScriptValue &status)
@@ -237,6 +238,7 @@ QScriptValue QDeclarativeInclude::include(QScriptContext *ctxt, QScriptEngine *e
             if (engine->hasUncaughtException()) {
                 result = resultValue(engine, Exception);
                 result.setProperty(QLatin1String("exception"), engine->uncaughtException());
+                engine->clearExceptions();
             } else {
                 result = resultValue(engine, Ok);
             }
diff --git a/src/declarative/qml/qdeclarativeinclude_p.h b/src/declarative/qml/qdeclarativeinclude_p.h
index 28c49ea..9678e42 100644
--- a/src/declarative/qml/qdeclarativeinclude_p.h
+++ b/src/declarative/qml/qdeclarativeinclude_p.h
@@ -58,6 +58,7 @@
 #include 
 
 #include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
@@ -96,7 +97,7 @@ private:
     QDeclarativeEngine *m_engine;
     QScriptEngine *m_scriptEngine;
     QNetworkAccessManager *m_network;
-    QNetworkReply *m_reply;
+    QDeclarativeGuard m_reply;
 
     QUrl m_url;
     int m_redirectCount;
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index dab9767..12f9794 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -9,6 +9,7 @@ SOURCES += \
     $$PWD/qdeclarativeproperty.cpp \
     $$PWD/qdeclarativecomponent.cpp \
     $$PWD/qdeclarativecontext.cpp \
+    $$PWD/qdeclarativeinclude.cpp \
     $$PWD/qdeclarativecustomparser.cpp \
     $$PWD/qdeclarativepropertyvaluesource.cpp \
     $$PWD/qdeclarativepropertyvalueinterceptor.cpp \
@@ -92,6 +93,7 @@ HEADERS += \
     $$PWD/qdeclarativeinfo.h \
     $$PWD/qdeclarativeproperty_p.h \
     $$PWD/qdeclarativecontext_p.h \
+    $$PWD/qdeclarativeinclude_p.h \
     $$PWD/qdeclarativecompositetypedata_p.h \
     $$PWD/qdeclarativecompositetypemanager_p.h \
     $$PWD/qdeclarativelist.h \
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
index eabed26..c907be5 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
+++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro
@@ -1,13 +1,18 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative script
+contains(QT_CONFIG,declarative): QT += declarative script network
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativeecmascript.cpp \
-           testtypes.cpp
-HEADERS += testtypes.h
+           testtypes.cpp \
+           ../shared/testhttpserver.cpp
+HEADERS += testtypes.h \
+           ../shared/testhttpserver.h
+INCLUDEPATH += ../shared
 
 # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage
 # LIBS += -lgcov
 
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
 CONFIG += parallel_test
 
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 8c9290f..b8faa7c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include "testtypes.h"
+#include "testhttpserver.h"
 
 /*
 This test covers evaluation of ECMAScript expressions and bindings from within
@@ -149,6 +150,8 @@ private slots:
     void eval();
     void function();
 
+    void include();
+
     void callQtInvokables();
 private:
     QDeclarativeEngine engine;
@@ -2361,6 +2364,114 @@ void tst_qdeclarativeecmascript::function()
     delete o;
 }
 
+#define TRY_WAIT(expr) \
+    do { \
+        for (int ii = 0; ii < 6; ++ii) { \
+            if ((expr)) break; \
+            QTest::qWait(50); \
+        } \
+        QVERIFY((expr)); \
+    } while (false) 
+
+// Test the "Qt.include" method
+void tst_qdeclarativeecmascript::include()
+{
+    // Non-library relative include
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("include.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+
+    QCOMPARE(o->property("test0").toInt(), 99);
+    QCOMPARE(o->property("test1").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    QCOMPARE(o->property("test2_1").toBool(), true);
+    QCOMPARE(o->property("test3").toBool(), true);
+    QCOMPARE(o->property("test3_1").toBool(), true);
+
+    delete o;
+    }
+
+    // Library relative include
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("include_shared.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+
+    QCOMPARE(o->property("test0").toInt(), 99);
+    QCOMPARE(o->property("test1").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    QCOMPARE(o->property("test2_1").toBool(), true);
+    QCOMPARE(o->property("test3").toBool(), true);
+    QCOMPARE(o->property("test3_1").toBool(), true);
+
+    delete o;
+    }
+
+    // Callback
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("include_callback.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+
+    QCOMPARE(o->property("test1").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    QCOMPARE(o->property("test3").toBool(), true);
+    QCOMPARE(o->property("test4").toBool(), true);
+    QCOMPARE(o->property("test5").toBool(), true);
+    QCOMPARE(o->property("test6").toBool(), true);
+
+    delete o;
+    }
+
+    // Remote - success
+    {
+    TestHTTPServer server(8111);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/data");
+
+    QDeclarativeComponent component(&engine, TEST_FILE("include_remote.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+
+    TRY_WAIT(o->property("done").toBool() == true);
+    TRY_WAIT(o->property("done2").toBool() == true);
+
+    QCOMPARE(o->property("test1").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    QCOMPARE(o->property("test3").toBool(), true);
+    QCOMPARE(o->property("test4").toBool(), true);
+    QCOMPARE(o->property("test5").toBool(), true);
+
+    QCOMPARE(o->property("test6").toBool(), true);
+    QCOMPARE(o->property("test7").toBool(), true);
+    QCOMPARE(o->property("test8").toBool(), true);
+    QCOMPARE(o->property("test9").toBool(), true);
+    QCOMPARE(o->property("test10").toBool(), true);
+
+    delete o;
+    }
+
+    // Remote - error
+    {
+    TestHTTPServer server(8111);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/data");
+
+    QDeclarativeComponent component(&engine, TEST_FILE("include_remote_missing.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+
+    TRY_WAIT(o->property("done").toBool() == true);
+
+    QCOMPARE(o->property("test1").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    QCOMPARE(o->property("test3").toBool(), true);
+
+    delete o;
+    }
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
-- 
cgit v0.12


From 2f6eb60bf4012f9a185d7cd5d4c50762c3abc7f7 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 14 May 2010 15:33:48 +1000
Subject: Only add "include" property in non-workerscript threads

---
 src/declarative/qml/qdeclarativeengine.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 5cb59da..8d3ca59 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -205,7 +205,8 @@ QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *pr
     // XXX used to add Qt.Sound class.
 
     //types
-    qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2));
+    if (mainthread)
+        qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2));
     qtObject.setProperty(QLatin1String("isQtObject"), newFunction(QDeclarativeEnginePrivate::isQtObject, 1));
     qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4));
     qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4));
-- 
cgit v0.12


From 3f775da6fec8b5cfb5e538100b7889401d14c410 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen 
Date: Fri, 14 May 2010 08:04:54 +0200
Subject: Add missing file!

Amendment to 812f78e55aa3db4d51ec8617320358d80c4a71d5.
---
 examples/graphicsview/padnavigator/form.ui | 208 +++++++++++++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 examples/graphicsview/padnavigator/form.ui

diff --git a/examples/graphicsview/padnavigator/form.ui b/examples/graphicsview/padnavigator/form.ui
new file mode 100644
index 0000000..fc7d123
--- /dev/null
+++ b/examples/graphicsview/padnavigator/form.ui
@@ -0,0 +1,208 @@
+
+ Form
+ 
+  
+   
+    0
+    0
+    378
+    385
+   
+  
+  
+   BackSide
+  
+  
+   
+    
+     
+      Settings
+     
+     
+      true
+     
+     
+      true
+     
+     
+      
+       
+        
+         Title:
+        
+       
+      
+      
+       
+        
+         Pad Navigator Example
+        
+       
+      
+      
+       
+        
+         Modified:
+        
+       
+      
+      
+       
+        
+         Extent
+        
+       
+      
+      
+       
+        
+         
+          
+           42
+          
+          
+           Qt::Horizontal
+          
+         
+        
+        
+         
+          
+           42
+          
+         
+        
+       
+      
+      
+       
+      
+     
+    
+   
+   
+    
+     
+      Other input
+     
+     
+      true
+     
+     
+      true
+     
+     
+      
+       
+        
+         
+          Widgets On Graphics View
+         
+        
+        
+         
+          QGraphicsProxyWidget
+         
+         
+          
+           QGraphicsWidget
+          
+          
+           
+            QObject
+           
+          
+          
+           
+            QGraphicsItem
+           
+          
+          
+           
+            QGraphicsLayoutItem
+           
+          
+         
+        
+        
+         
+          QGraphicsGridLayout
+         
+         
+          
+           QGraphicsLayout
+          
+          
+           
+            QGraphicsLayoutItem
+           
+          
+         
+        
+        
+         
+          QGraphicsLinearLayout
+         
+         
+          
+           QGraphicsLayout
+          
+          
+           
+            QGraphicsLayoutItem
+           
+          
+         
+        
+       
+      
+     
+    
+   
+  
+ 
+ 
+  groupBox
+  hostName
+  dateTimeEdit
+  horizontalSlider
+  spinBox
+  groupBox_2
+  treeWidget
+ 
+ 
+ 
+  
+   horizontalSlider
+   valueChanged(int)
+   spinBox
+   setValue(int)
+   
+    
+     184
+     125
+    
+    
+     275
+     127
+    
+   
+  
+  
+   spinBox
+   valueChanged(int)
+   horizontalSlider
+   setValue(int)
+   
+    
+     272
+     114
+    
+    
+     190
+     126
+    
+   
+  
+ 
+
-- 
cgit v0.12


From d9ab23c190de774ea093652060981e14ac5aeaf8 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Fri, 14 May 2010 17:15:08 +1000
Subject: Qt.include() support in worker scripts

---
 src/declarative/qml/qdeclarativeengine.cpp       |  3 ++
 src/declarative/qml/qdeclarativeinclude.cpp      | 59 ++++++++++++++++++++++++
 src/declarative/qml/qdeclarativeinclude_p.h      |  2 +
 src/declarative/qml/qdeclarativeworkerscript.cpp |  6 ++-
 4 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 8d3ca59..2c89abd 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -207,6 +207,9 @@ QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate *pr
     //types
     if (mainthread)
         qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::include, 2));
+    else
+        qtObject.setProperty(QLatin1String("include"), newFunction(QDeclarativeInclude::worker_include, 2));
+
     qtObject.setProperty(QLatin1String("isQtObject"), newFunction(QDeclarativeEnginePrivate::isQtObject, 1));
     qtObject.setProperty(QLatin1String("rgba"), newFunction(QDeclarativeEnginePrivate::rgba, 4));
     qtObject.setProperty(QLatin1String("hsla"), newFunction(QDeclarativeEnginePrivate::hsla, 4));
diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp
index b886935..97220f1 100644
--- a/src/declarative/qml/qdeclarativeinclude.cpp
+++ b/src/declarative/qml/qdeclarativeinclude.cpp
@@ -252,6 +252,65 @@ QScriptValue QDeclarativeInclude::include(QScriptContext *ctxt, QScriptEngine *e
     return result;
 }
 
+QScriptValue QDeclarativeInclude::worker_include(QScriptContext *ctxt, QScriptEngine *engine)
+{
+    if (ctxt->argumentCount() == 0)
+        return engine->undefinedValue();
+
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+
+    QString urlString = ctxt->argument(0).toString();
+    QUrl url(ctxt->argument(0).toString());
+    if (url.isRelative()) {
+        QString contextUrl = QScriptDeclarativeClass::scopeChainValue(ctxt, -3).data().toString();
+        Q_ASSERT(!contextUrl.isEmpty());
+
+        url = QUrl(contextUrl).resolved(url);
+        urlString = url.toString();
+    }
+
+    QString localFile = toLocalFileOrQrc(url);
+
+    QScriptValue func = ctxt->argument(1);
+    if (!func.isFunction())
+        func = QScriptValue();
+
+    QScriptValue result;
+    if (!localFile.isEmpty()) {
+
+        QFile f(localFile);
+        if (f.open(QIODevice::ReadOnly)) {
+            QByteArray data = f.readAll();
+            QString code = QString::fromUtf8(data);
 
+            QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(engine);
+            QScriptValue urlContext = engine->newObject();
+            urlContext.setData(QScriptValue(engine, urlString));
+            scriptContext->pushScope(urlContext);
+
+            QScriptValue scope = QScriptDeclarativeClass::scopeChainValue(ctxt, -4);
+            scriptContext->pushScope(scope);
+            scriptContext->setActivationObject(scope);
+
+            engine->evaluate(code, urlString, 1);
+
+            engine->popContext();
+
+            if (engine->hasUncaughtException()) {
+                result = resultValue(engine, Exception);
+                result.setProperty(QLatin1String("exception"), engine->uncaughtException());
+                engine->clearExceptions();
+            } else {
+                result = resultValue(engine, Ok);
+            }
+            callback(engine, func, result);
+        } else {
+            result = resultValue(engine, NetworkError);
+            callback(engine, func, result);
+        }
+    }
+
+    return result;
+}
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeinclude_p.h b/src/declarative/qml/qdeclarativeinclude_p.h
index 9678e42..3124374 100644
--- a/src/declarative/qml/qdeclarativeinclude_p.h
+++ b/src/declarative/qml/qdeclarativeinclude_p.h
@@ -88,7 +88,9 @@ public:
 
     static QScriptValue resultValue(QScriptEngine *, Status status = Loading);
     static void callback(QScriptEngine *, QScriptValue &callback, QScriptValue &status);
+
     static QScriptValue include(QScriptContext *ctxt, QScriptEngine *engine);
+    static QScriptValue worker_include(QScriptContext *ctxt, QScriptEngine *engine);
 
 public slots:
     void finished();
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index c55998f..4b687a9 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -289,7 +289,11 @@ void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
 
         QScriptValue activation = getWorker(id);
 
-        QScriptContext *ctxt = workerEngine->pushContext();
+        QScriptContext *ctxt = QScriptDeclarativeClass::pushCleanContext(workerEngine);
+        QScriptValue urlContext = workerEngine->newObject();
+        urlContext.setData(QScriptValue(workerEngine, fileName));
+        ctxt->pushScope(urlContext);
+        ctxt->pushScope(activation);
         ctxt->setActivationObject(activation);
 
         workerEngine->baseUrl = url;
-- 
cgit v0.12


From ef0a942bc57485ddaad413cd27c0283a1c90149f Mon Sep 17 00:00:00 2001
From: Yoann Lopes 
Date: Fri, 14 May 2010 10:38:52 +0200
Subject: Updated changelog.

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

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 6bf7ea5..919c25a 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -76,6 +76,18 @@ QtGui
     * Fixed rendering bugs when scrolling graphics items with drop
       shadows.
 
+ - QGraphicsItem
+    * [QTBUG-8112] itemChange() is now called when transformation
+      properties change (setRotation, setScale, setTransformOriginPoint).
+
+ - QGraphicsTextItem
+    * [QTBUG-7333] Fixed keyboard shortcuts not being triggered when the
+      the item has focus and something else has the same shortcut sequence.
+
+ - QGraphicsView
+    * [QTBUG-7438] Fixed viewport cursor getting reset when releasing
+      the mouse.
+
  - QImage
     * [QTBUG-9640] Prevented unneccessary copy in
       QImage::setAlphaChannel().
-- 
cgit v0.12


From aeff7ca3bdc7d4c2518f6f27f69332935ff8b104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= 
Date: Fri, 14 May 2010 10:42:31 +0200
Subject: Some 4.7 changes.

---
 dist/changes-4.7.0 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 919c25a..47992f9 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -33,7 +33,6 @@ New features
  - QNetworkSession, QNetworkConfiguration, QNetworkConfigurationManager
     * New bearer management classes added.
 
-
 Third party components
 ----------------------
 
@@ -89,11 +88,17 @@ QtGui
       the mouse.
 
  - QImage
-    * [QTBUG-9640] Prevented unneccessary copy in
-      QImage::setAlphaChannel().
-    * Added QImage::bitPlaneCount(). (QTBUG-7982)
+    * [QTBUG-9640] Prevented unneccessary copy in QImage::setAlphaChannel().
+    * [QTBUG-7982] Added QImage::bitPlaneCount().
+
+ - QPicture
+    * [QTBUG-4974] Printing QPictures containing text to a high resolution
+      QPrinter would in many cases cause incorrect character spacing.
 
  - QPainter
+    * Added QPainter::drawPixmapFragments(), which makes it possible to draw
+      pixmaps, or sub-rectangles of pixmaps, at various positions with
+      different scale, opacity and rotation.
     * [QTBUG-10018] Fixed image drawing inconsistencies when drawing
       1x1 source rects with rotating / shear / perspective transforms.
     * Optimized various blending and rendering operations for ARM
-- 
cgit v0.12


From 96bf7b880976f225ca390aab1cb1492e8d79ea4c Mon Sep 17 00:00:00 2001
From: Simon Hausmann 
Date: Fri, 14 May 2010 11:25:51 +0200
Subject: Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7c

Integrated changes:

* Doc day API doc overhaul

||  || [Qt] GraphicsLayer: depth-test causes flicker in certain situations ||
||  || [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout ||
||  || [Qt] Detect debug mode consistently ||
||  || [Qt] Update the Symbian version for the user agent ||
||  || [Qt] Improve QtLauncher user agent dialog resize ||
||  || Ignore invalid values for various CanvasRenderingContext2D properties ||
||  || [Qt] tst_QWebPage::inputMethods failing on Maemo5 ||
||  || [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing ||
---
 src/3rdparty/webkit/.tag                           |   2 +-
 src/3rdparty/webkit/ChangeLog                      |   9 +
 src/3rdparty/webkit/JavaScriptCore/ChangeLog       |  12 ++
 .../webkit/JavaScriptCore/JavaScriptCore.pri       |   2 +-
 .../webkit/JavaScriptCore/JavaScriptCore.pro       |   2 +-
 .../webkit/JavaScriptCore/qt/api/QtScript.pro      |   2 +-
 src/3rdparty/webkit/VERSION                        |   2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              |  43 +++++
 src/3rdparty/webkit/WebCore/WebCore.pro            |   2 +-
 .../html/canvas/CanvasRenderingContext2D.cpp       |  10 +-
 .../platform/graphics/qt/GraphicsLayerQt.cpp       |   8 -
 src/3rdparty/webkit/WebKit.pri                     |   2 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp |  10 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp  |  20 ++-
 src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp    |  10 +-
 .../webkit/WebKit/qt/Api/qwebhistoryinterface.cpp  |  23 ++-
 .../webkit/WebKit/qt/Api/qwebinspector.cpp         |  45 ++---
 .../webkit/WebKit/qt/Api/qwebkitversion.cpp        |  66 +++++++-
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp     | 184 +++++++++++++++++----
 .../webkit/WebKit/qt/Api/qwebpluginfactory.cpp     |  36 +++-
 .../webkit/WebKit/qt/Api/qwebsecurityorigin.cpp    |  24 ++-
 src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 128 +++++++-------
 src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h   |   2 +-
 src/3rdparty/webkit/WebKit/qt/ChangeLog            |  99 +++++++++++
 .../qt/WebCoreSupport/FrameLoaderClientQt.cpp      |   6 +-
 src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc   | 109 ++++++------
 .../qtwebkit_qwebinspector_snippet.cpp             |   2 -
 .../qt/docs/webkitsnippets/webelement/main.cpp     |  56 +++++++
 .../qgraphicswebview/tst_qgraphicswebview.cpp      |   8 +-
 .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp      |  23 ++-
 30 files changed, 718 insertions(+), 229 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 14af7e9..9d754a4 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-5cf023650a8da206a8cf3130e9d4820b95e1bc7c
+3d774b9df1f963452b1cfe34f9fafad0d399372a
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 70eff7d..a0cf2d0 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-12  Laszlo Gombos  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Detect debug mode consistently
+        https://bugs.webkit.org/show_bug.cgi?id=38863
+
+        * WebKit.pri:
+
 2010-04-09  Simon Hausmann  
 
         Unreviewed crash fix.
diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
index 1610036..a3e6586 100644
--- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-12  Laszlo Gombos  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Detect debug mode consistently
+        https://bugs.webkit.org/show_bug.cgi?id=38863
+
+        * JavaScriptCore.pri:
+        * JavaScriptCore.pro:
+        * jsc.pro:
+        * qt/api/QtScript.pro:
+
 2010-05-10  Laszlo Gombos  
 
         Reviewed by Darin Adler.
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index b7f6665..b3f74a9 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -1,6 +1,6 @@
 # JavaScriptCore - Qt4 build info
 VPATH += $$PWD
-CONFIG(debug, debug|release) {
+!CONFIG(release, debug|release) {
     # Output in JavaScriptCore/
     JAVASCRIPTCORE_DESTDIR = debug
     # Use a config-specific target to prevent parallel builds file clashes on Mac
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index 8e086b3..22fcc91 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -21,7 +21,7 @@ CONFIG(QTDIR_build) {
     # This line was extracted from qbase.pri instead of including the whole file
     win32|mac:!macx-xcode:CONFIG += debug_and_release
 } else {
-    CONFIG(debug, debug|release) {
+    !CONFIG(release, debug|release) {
         OBJECTS_DIR = obj/debug
     } else { # Release
         OBJECTS_DIR = obj/release
diff --git a/src/3rdparty/webkit/JavaScriptCore/qt/api/QtScript.pro b/src/3rdparty/webkit/JavaScriptCore/qt/api/QtScript.pro
index 88629c7..3c2691e 100644
--- a/src/3rdparty/webkit/JavaScriptCore/qt/api/QtScript.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/qt/api/QtScript.pro
@@ -7,7 +7,7 @@ INCLUDEPATH += $$PWD
 CONFIG += building-libs
 
 isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../generated
-CONFIG(debug, debug|release) {
+!CONFIG(release, debug|release) {
     OBJECTS_DIR = obj/debug
 } else { # Release
     OBJECTS_DIR = obj/release
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index b8bac54..a440c03 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
 
-        57d10d5c05e59bbf7de8189ff47dd18d1be996dc
+        5cf023650a8da206a8cf3130e9d4820b95e1bc7c
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 76b4eff..93d00e4 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,46 @@
+2010-05-12  Laszlo Gombos  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Detect debug mode consistently
+        https://bugs.webkit.org/show_bug.cgi?id=38863
+
+        No new tests as there is no new functionality.
+
+        * WebCore.pro:
+
+2010-05-14  Andreas Kling  
+
+        Reviewed by Darin Adler.
+
+        Ignore invalid values for various CanvasRenderingContext2D properties
+        (lineWidth, miterLimit, shadowOffsetX, shadowOffsetY and shadowBlur)
+
+        https://bugs.webkit.org/show_bug.cgi?id=38841
+
+        Test: fast/canvas/canvas-invalid-values.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setLineWidth):
+        (WebCore::CanvasRenderingContext2D::setMiterLimit):
+        (WebCore::CanvasRenderingContext2D::setShadowOffsetX):
+        (WebCore::CanvasRenderingContext2D::setShadowOffsetY):
+        (WebCore::CanvasRenderingContext2D::setShadowBlur):
+
+2010-05-12  Noam Rosenthal  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsLayer: depth-test causes flicker in certain situations
+
+        This patch removes the simplistic 2D depth test as it leads to flickering side effects.
+        https://bugs.webkit.org/show_bug.cgi?id=38370
+
+        Tested by http://webkit.org/blog-files/3d-transforms/morphing-cubes.html
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::updateTransform):
+
 2010-04-29  James Robinson  
 
         Reviewed by Simon Fraser.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 254d17b..689c5ff 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -59,7 +59,7 @@ CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
 
-    CONFIG(debug, debug|release) {
+    !CONFIG(release, debug|release) {
         OBJECTS_DIR = obj/debug
     } else { # Release
         OBJECTS_DIR = obj/release
diff --git a/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 8add19c..823ab59 100644
--- a/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/src/3rdparty/webkit/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -209,7 +209,7 @@ float CanvasRenderingContext2D::lineWidth() const
 
 void CanvasRenderingContext2D::setLineWidth(float width)
 {
-    if (!(width > 0))
+    if (!(isfinite(width) && width > 0))
         return;
     state().m_lineWidth = width;
     GraphicsContext* c = drawingContext();
@@ -259,7 +259,7 @@ float CanvasRenderingContext2D::miterLimit() const
 
 void CanvasRenderingContext2D::setMiterLimit(float limit)
 {
-    if (!(limit > 0))
+    if (!(isfinite(limit) && limit > 0))
         return;
     state().m_miterLimit = limit;
     GraphicsContext* c = drawingContext();
@@ -275,6 +275,8 @@ float CanvasRenderingContext2D::shadowOffsetX() const
 
 void CanvasRenderingContext2D::setShadowOffsetX(float x)
 {
+    if (!isfinite(x))
+        return;
     state().m_shadowOffset.setWidth(x);
     applyShadow();
 }
@@ -286,6 +288,8 @@ float CanvasRenderingContext2D::shadowOffsetY() const
 
 void CanvasRenderingContext2D::setShadowOffsetY(float y)
 {
+    if (!isfinite(y))
+        return;
     state().m_shadowOffset.setHeight(y);
     applyShadow();
 }
@@ -297,6 +301,8 @@ float CanvasRenderingContext2D::shadowBlur() const
 
 void CanvasRenderingContext2D::setShadowBlur(float blur)
 {
+    if (!(isfinite(blur) && blur >= 0))
+        return;
     state().m_shadowBlur = blur;
     applyShadow();
 }
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 1c4c275..d9394e1 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -357,14 +357,6 @@ void GraphicsLayerQtImpl::updateTransform()
         return;
     }
 
-    // Simplistic depth test - we stack the item behind its parent if its computed z is lower than the parent's computed z at the item's center point.
-    if (parent) {
-        const QPointF centerPointMappedToRoot = rootLayer()->mapFromItem(this, m_size.width() / 2, m_size.height() / 2);
-        setFlag(ItemStacksBehindParent,
-                m_transformRelativeToRootLayer.mapPoint(FloatPoint3D(centerPointMappedToRoot.x(), centerPointMappedToRoot.y(), 0)).z() <
-                parent->m_transformRelativeToRootLayer.mapPoint(FloatPoint3D(centerPointMappedToRoot.x(), centerPointMappedToRoot.y(), 0)).z());
-    }
-
     // The item is front-facing or backface-visibility is on.
     setVisible(true);
 
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri
index e737039..a3ccd9d 100644
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
@@ -22,7 +22,7 @@ building-libs {
             QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
         } else {
             win32-*|wince* {
-                CONFIG(debug, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
+                !CONFIG(release, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
                 QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION}
                 win32-g++: LIBS += -l$$QTWEBKITLIBNAME
                 else: LIBS += $${QTWEBKITLIBNAME}.lib
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
index 4e8fd30..ba039c7 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebdatabase.cpp
@@ -39,8 +39,10 @@ using namespace WebCore;
     access on a local computer through JavaScript. QWebDatabase is the C++ interface to these
     databases.
 
-    To get access to all databases defined by a security origin, use QWebSecurityOrigin::databases().
-    Each database has an internal name(), as well as a user-friendly name, provided by displayName().
+    Databases are grouped together in security origins. To get access to all databases defined by
+    a security origin, use QWebSecurityOrigin::databases(). Each database has an internal name(),
+    as well as a user-friendly name, provided by displayName(). These names are specified when
+    creating the database in the JavaScript code.
 
     WebKit uses SQLite to create and access the local SQL databases. The location of the database
     file in the local file system is returned by fileName(). You can access the database directly
@@ -49,7 +51,7 @@ using namespace WebCore;
     For each database the web site can define an expectedSize(). The current size of the database
     in bytes is returned by size().
 
-    For more information refer to the \l{http://dev.w3.org/html5/webdatabase/}{HTML 5 Draft Standard}.
+    For more information refer to the \l{http://dev.w3.org/html5/webdatabase/}{HTML5 Web SQL Database Draft Standard}.
 
     \sa QWebSecurityOrigin
 */
@@ -80,7 +82,7 @@ QString QWebDatabase::name() const
 }
 
 /*!
-    Returns the name of the database as seen by the user.
+    Returns the name of the database in a format that is suitable for display to the user.
 */
 QString QWebDatabase::displayName() const
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
index 955206d..69146a2 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp
@@ -84,13 +84,27 @@ public:
 
     \snippet webkitsnippets/webelement/main.cpp Traversing with QWebElement
 
+    Individual elements can be inspected or changed using methods such as attribute()
+    or setAttribute(). For examle, to capture the user's input in a text field for later
+    use (auto-completion), a browser could do something like this:
+
+    \snippet webkitsnippets/webelement/main.cpp autocomplete1
+
+    When the same page is later revisited, the browser can fill in the text field automatically
+    by modifying the value attribute of the input element:
+
+    \snippet webkitsnippets/webelement/main.cpp autocomplete2
+
+    Another use case is to emulate a click event on an element. The following
+    code snippet demonstrates how to call the JavaScript DOM method click() of
+    a submit button:
+
+    \snippet webkitsnippets/webelement/main.cpp Calling a DOM element method
+
     The underlying content of QWebElement is explicitly shared. Creating a copy
     of a QWebElement does not create a copy of the content. Instead, both
     instances point to the same element.
 
-    The element's attributes can be read using attribute() and modified with
-    setAttribute().
-
     The contents of child elements can be converted to plain text with
     toPlainText(); to XHTML using toInnerXml(). To include the element's tag in
     the output, use toOuterXml().
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
index 394ea17..44cc3b5 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -552,8 +552,10 @@ void QWebFramePrivate::renderRelativeCoords(GraphicsContext* context, QWebFrame:
     can connect to the web page's \l{QWebPage::}{frameCreated()} signal
     to be notified when a new frame is created.
 
-    The hitTestContent() function can be used to programmatically examine the
-    contents of a frame.
+    There are multiple ways to programmatically examine the contents of a frame.
+    The hitTestContent() function can be used to find elements by coordinate.
+    For access to the underlying DOM tree, there is documentElement(),
+    findAllElements() and findFirstElement().
 
     A QWebFrame can be printed onto a QPrinter using the print() function.
     This function is marked as a slot and can be conveniently connected to
@@ -781,6 +783,10 @@ static inline QUrl ensureAbsoluteUrl(const QUrl &url)
     \property QWebFrame::url
     \brief the url of the frame currently viewed
 
+    Setting this property clears the view and loads the URL.
+
+    By default, this property contains an empty, invalid URL.
+
     \sa urlChanged()
 */
 
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp
index 80567d1..61cf5af 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistoryinterface.cpp
@@ -41,7 +41,7 @@ static void gCleanupInterface()
 
 /*!
   Sets a new default interface, \a defaultInterface, that will be used by all of WebKit
-  for managing history.
+  to keep track of visited links.
 
   If an interface without a parent has already been set, the old interface will be deleted.
   When the application exists QWebHistoryInterface will automatically delete the
@@ -68,8 +68,9 @@ void QWebHistoryInterface::setDefaultInterface(QWebHistoryInterface* defaultInte
 }
 
 /*!
-  Returns the default interface that will be used by WebKit. If no
-  default interface has been set, QtWebkit will not track history.
+  Returns the default interface that will be used by WebKit. If no default interface has been set,
+  Webkit will not keep track of visited links and a null pointer will be returned.
+  \sa setDefaultInterface
 */
 QWebHistoryInterface* QWebHistoryInterface::defaultInterface()
 {
@@ -84,11 +85,15 @@ QWebHistoryInterface* QWebHistoryInterface::defaultInterface()
   \inmodule QtWebKit
 
   The QWebHistoryInterface is an interface that can be used to
-  implement link history. It contains two pure virtual methods that
-  are called by the WebKit engine.  addHistoryEntry() is used to add
-  pages that have been visited to the interface, while
-  historyContains() is used to query whether this page has been
-  visited by the user.
+  keep track of visited links. It contains two pure virtual methods that
+  are called by the WebKit engine: addHistoryEntry() is used to add
+  urls that have been visited to the interface, while
+  historyContains() is used to query whether the given url has been
+  visited by the user. By default the QWebHistoryInterface is not set, so WebKit does not keep
+  track of visited links.
+
+  \note The history tracked by QWebHistoryInterface is not specific to an instance of QWebPage
+  but applies to all pages.
 */
 
 /*!
@@ -100,7 +105,7 @@ QWebHistoryInterface::QWebHistoryInterface(QObject* parent)
 }
 
 /*!
-    Destructor.  If this is currently the default interface it will be unset.
+    Destroys the interface.  If this is currently the default interface it will be unset.
 */
 QWebHistoryInterface::~QWebHistoryInterface()
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp
index c0e5277..802ea98 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp
@@ -31,17 +31,23 @@
 /*!
     \class QWebInspector
     \since 4.6
+    \inmodule QtWebKit
     \brief The QWebInspector class allows the placement and control of a
     QWebPage's inspector.
-    The inspector allows you to see a page current hierarchy and loading
-    statistics.
+    The inspector can display a page's hierarchy, its loading statistics and
+    the current state of its individual elements. It is mostly used by web
+    developers.
 
-    The QWebPage to be inspected is determined with the setPage() method.
+    The QWebPage to be inspected must be specified using the setPage() method.
 
     A typical use of QWebInspector follows:
 
     \snippet webkitsnippets/qtwebkit_qwebinspector_snippet.cpp 0
 
+    A QWebInspector can be made visible either programmatically using
+    setVisible(), or by the user through the attached QWebPage's context
+    menu.
+
     \note A QWebInspector will display a blank widget if either:
     \list
         \o page() is null
@@ -61,17 +67,16 @@
     \section1 Inspector configuration persistence
 
     The inspector allows the user to configure some options through its
-    interface (e.g. the resource tracking "Always enable" option).
-    These settings are persisted automatically by QtWebKit using QSettings.
-
-    However since the QSettings object is instantiated using the empty
-    constructor, QCoreApplication::setOrganizationName() and
-    QCoreApplication::setApplicationName() must be called within your
-    application to enable the persistence of these options.
+    user interface (e.g. the resource tracking "Always enable" option).
+    These settings will be persisted automatically by QtWebKit only if
+    your application previously called QCoreApplication::setOrganizationName()
+    and QCoreApplication::setApplicationName().
+    See QSettings's default constructor documentation for an explanation
+    of why this is necessary.
 */
 
 /*!
-    Constructs an empty QWebInspector with parent \a parent.
+    Constructs an unbound QWebInspector with \a parent as its parent.
 */
 QWebInspector::QWebInspector(QWidget* parent)
     : QWidget(parent)
@@ -89,16 +94,16 @@ QWebInspector::~QWebInspector()
 }
 
 /*!
-    Sets the QWebPage to be inspected.
-
-    There can only be one QWebInspector associated with a QWebPage
-    and vices versa.
+    Bind this inspector to the QWebPage to be inspected.
 
-    Calling with \a page as null will break the current association, if any.
-
-    If \a page is already associated to another QWebInspector, the association
-    will be replaced and the previous QWebInspector will have no page
-    associated.
+    \bold {Notes:}
+    \list
+        \o There can only be one QWebInspector associated with a QWebPage
+           and vice versa.
+        \o Calling this method with a null \a page will break the current association, if any.
+        \o If \a page is already associated to another QWebInspector, the association
+           will be replaced and the previous QWebInspector will become unbound
+    \endlist
 
     \sa page()
 */
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp
index 062839f..181913b 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp
@@ -22,11 +22,21 @@
 #include 
 
 /*!
-
+    \relates QWebPage
+    \since 4.6
     Returns the version number of WebKit at run-time as a string (for
-    example, "531.3"). This is the version of WebKit the application
-    was compiled against.
+    example, "531.3").
+
+    This version is commonly used in WebKit based browsers as part
+    of the user agent string. Web servers and JavaScript might use
+    it to identify the presence of certain WebKit engine features
+    and behaviour.
 
+    The evolution of this version is bound to the releases of Apple's
+    Safari browser. For a version specific to the QtWebKit library,
+    see QTWEBKIT_VERSION
+
+    \sa QWebPage::userAgentForUrl()
 */
 QString qWebKitVersion()
 {
@@ -34,11 +44,13 @@ QString qWebKitVersion()
 }
 
 /*!
-
+    \relates QWebPage
+    \since 4.6
     Returns the 'major' version number of WebKit at run-time as an integer
     (for example, 531). This is the version of WebKit the application
     was compiled against.
 
+    \sa qWebKitVersion()
 */
 int qWebKitMajorVersion()
 {
@@ -46,13 +58,57 @@ int qWebKitMajorVersion()
 }
 
 /*!
-
+    \relates QWebPage
+    \since 4.6
     Returns the 'minor' version number of WebKit at run-time as an integer
     (for example, 3). This is the version of WebKit the application
     was compiled against.
 
+    \sa qWebKitVersion()
 */
 int qWebKitMinorVersion()
 {
     return WEBKIT_MINOR_VERSION;
 }
+
+/*!
+    \macro QTWEBKIT_VERSION
+    \relates QWebPage
+
+    This macro expands a numeric value of the form 0xMMNNPP (MM =
+    major, NN = minor, PP = patch) that specifies QtWebKit's version
+    number. For example, if you compile your application against QtWebKit
+    2.1.2, the QTWEBKIT_VERSION macro will expand to 0x020102.
+
+    You can use QTWEBKIT_VERSION to use the latest QtWebKit API where
+    available.
+
+    \sa QT_VERSION
+*/
+
+/*!
+    \macro QTWEBKIT_VERSION_STR
+    \relates QWebPage
+
+    This macro expands to a string that specifies QtWebKit's version number
+    (for example, "2.1.2"). This is the version against which the
+    application is compiled.
+
+    \sa QTWEBKIT_VERSION
+*/
+
+/*!
+    \macro QTWEBKIT_VERSION_CHECK
+    \relates QWebPage
+
+    Turns the major, minor and patch numbers of a version into an
+    integer, 0xMMNNPP (MM = major, NN = minor, PP = patch). This can
+    be compared with another similarly processed version id, for example
+    in a preprocessor statement:
+
+    \code
+    #if QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 1, 0)
+    // code to use API new in QtWebKit 2.1.0
+    #endif
+    \endcode
+*/
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index e9ebce5..c5f508f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -1627,7 +1627,7 @@ InspectorController* QWebPagePrivate::inspectorController()
 /*!
    \enum QWebPage::FindFlag
 
-   This enum describes the options available to QWebPage's findText() function. The options
+   This enum describes the options available to the findText() function. The options
    can be OR-ed together from the following list:
 
    \value FindBackward Searches backwards instead of forwards.
@@ -1648,6 +1648,8 @@ InspectorController* QWebPagePrivate::inspectorController()
     \value DelegateExternalLinks When activating links that point to documents not stored on the
     local filesystem or an equivalent - such as the Qt resource system - then linkClicked() is emitted.
     \value DelegateAllLinks Whenever a link is activated the linkClicked() signal is emitted.
+
+    \sa QWebPage::linkDelegationPolicy
 */
 
 /*!
@@ -1662,6 +1664,8 @@ InspectorController* QWebPagePrivate::inspectorController()
     \value NavigationTypeReload The user activated the reload action.
     \value NavigationTypeFormResubmitted An HTML form was submitted a second time.
     \value NavigationTypeOther A navigation to another document using a method not listed above.
+
+    \sa acceptNavigationRequest()
 */
 
 /*!
@@ -1671,7 +1675,7 @@ InspectorController* QWebPagePrivate::inspectorController()
 
     Actions only have an effect when they are applicable. The availability of
     actions can be be determined by checking \l{QAction::}{isEnabled()} on the
-    action returned by \l{QWebPage::}{action()}.
+    action returned by action().
 
     One method of enabling the text editing, cursor movement, and text selection actions
     is by setting \l contentEditable to true.
@@ -1753,6 +1757,8 @@ InspectorController* QWebPagePrivate::inspectorController()
 /*!
     \enum QWebPage::WebWindowType
 
+    This enum describes the types of window that can be created by the createWindow() function.
+
     \value WebBrowserWindow The window is a regular web browser window.
     \value WebModalDialog The window acts as modal dialog.
 */
@@ -1769,11 +1775,13 @@ InspectorController* QWebPagePrivate::inspectorController()
     to provide functionality like QWebView in a widget-less environment.
 
     QWebPage's API is very similar to QWebView, as you are still provided with
-    common functions like action() (known as \l{QWebView::}{pageAction()} in
-    QWebView), triggerAction(), findText() and settings(). More QWebView-like
-    functions can be found in the main frame of QWebPage, obtained via
-    QWebPage::mainFrame(). For example, the load(), setUrl() and setHtml()
-    unctions for QWebPage can be accessed using QWebFrame.
+    common functions like action() (known as
+    \l{QWebView::pageAction()}{pageAction}() in QWebView), triggerAction(),
+    findText() and settings(). More QWebView-like functions can be found in the
+    main frame of QWebPage, obtained via the mainFrame() function. For example,
+    the \l{QWebFrame::load()}{load}(), \l{QWebFrame::setUrl()}{setUrl}() and
+    \l{QWebFrame::setHtml()}{setHtml}() functions for QWebPage can be accessed
+    using QWebFrame.
 
     The loadStarted() signal is emitted when the page begins to load.The
     loadProgress() signal, on the other hand, is emitted whenever an element
@@ -1877,7 +1885,8 @@ QWebFrame *QWebPage::currentFrame() const
 /*!
     \since 4.6
 
-    Returns the frame at the given point \a pos.
+    Returns the frame at the given point \a pos, or 0 if there is no frame at
+    that position.
 
     \sa mainFrame(), currentFrame()
 */
@@ -1996,7 +2005,7 @@ bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
     result should be written to \a result and true should be returned. If the prompt was not cancelled by the
     user, the implementation should return true and the result string must not be null.
 
-    The default implementation uses QInputDialog::getText.
+    The default implementation uses QInputDialog::getText().
 */
 bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result)
 {
@@ -2210,6 +2219,8 @@ QSize QWebPage::viewportSize() const
 
     By default, for a newly-created Web page, this property contains a size with
     zero width and height.
+
+    \sa QWebFrame::render(), preferredContentsSize
 */
 void QWebPage::setViewportSize(const QSize &size) const
 {
@@ -2238,11 +2249,12 @@ QSize QWebPage::preferredContentsSize() const
 /*!
     \property QWebPage::preferredContentsSize
     \since 4.6
-    \brief the size of the fixed layout
+    \brief the preferred size of the contents
 
-    The size affects the layout of the page in the viewport.  If set to a fixed size of
-    1024x768 for example then webkit will layout the page as if the viewport were that size
-    rather than something different.
+    If this property is set to a valid size, it is used to lay out the page.
+    If it is not set (the default), the viewport size is used instead.
+
+    \sa viewportSize
 */
 void QWebPage::setPreferredContentsSize(const QSize &size) const
 {
@@ -2590,9 +2602,11 @@ QAction *QWebPage::action(WebAction action) const
 
 /*!
     \property QWebPage::modified
-    \brief whether the page contains unsubmitted form data
+    \brief whether the page contains unsubmitted form data, or the contents have been changed.
 
     By default, this property is false.
+
+    \sa contentsChanged(), contentEditable, undoStack()
 */
 bool QWebPage::isModified() const
 {
@@ -2608,6 +2622,8 @@ bool QWebPage::isModified() const
 #ifndef QT_NO_UNDOSTACK
 /*!
     Returns a pointer to the undo stack used for editable content.
+
+    \sa modified
 */
 QUndoStack *QWebPage::undoStack() const
 {
@@ -2730,7 +2746,7 @@ bool QWebPage::event(QEvent *ev)
 }
 
 /*!
-    Similar to QWidget::focusNextPrevChild it focuses the next focusable web element
+    Similar to QWidget::focusNextPrevChild() it focuses the next focusable web element
     if \a next is true; otherwise the previous element is focused.
 
     Returns true if it can find a new focusable element, or false if it can't.
@@ -2757,6 +2773,8 @@ bool QWebPage::focusNextPrevChild(bool next)
     If this property is enabled the contents of the page can be edited by the user through a visible
     cursor. If disabled (the default) only HTML elements in the web page with their
     \c{contenteditable} attribute set are editable.
+
+    \sa modified, contentsChanged(), WebAction
 */
 void QWebPage::setContentEditable(bool editable)
 {
@@ -2926,17 +2944,21 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
     as a result of the user clicking on a "file upload" button in a HTML form where multiple
     file selection is allowed.
 
-    \omitvalue ErrorPageExtension (introduced in Qt 4.6)
+    \value ErrorPageExtension Whether the web page can provide an error page when loading fails.
+    (introduced in Qt 4.6)
+
+    \sa ChooseMultipleFilesExtensionOption, ChooseMultipleFilesExtensionReturn, ErrorPageExtensionOption, ErrorPageExtensionReturn
 */
 
 /*!
     \enum QWebPage::ErrorDomain
     \since 4.6
-    \internal
 
-    \value QtNetwork
-    \value Http
-    \value WebKit
+    This enum describes the domain of an ErrorPageExtensionOption object (i.e. the layer in which the error occurred).
+
+    \value QtNetwork The error occurred in the QtNetwork layer; the error code is of type QNetworkReply::NetworkError.
+    \value Http The error occurred in the HTTP layer; the error code is a HTTP status code (see QNetworkRequest::HttpStatusCodeAttribute).
+    \value WebKit The error is an internal WebKit error.
 */
 
 /*!
@@ -2946,7 +2968,18 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
 
     \inmodule QtWebKit
 
-    \sa QWebPage::extension()
+    \sa QWebPage::extension() QWebPage::ExtensionReturn
+*/
+
+
+/*!
+    \class QWebPage::ExtensionReturn
+    \since 4.4
+    \brief The ExtensionReturn class provides an output result from a QWebPage's extension.
+
+    \inmodule QtWebKit
+
+    \sa QWebPage::extension() QWebPage::ExtensionOption
 */
 
 /*!
@@ -2957,12 +2990,38 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
 
     \inmodule QtWebKit
 
-    The ErrorPageExtensionOption class holds the \a url for which an error occoured as well as
+    The ErrorPageExtensionOption class holds the \a url for which an error occurred as well as
     the associated \a frame.
 
     The error itself is reported by an error \a domain, the \a error code as well as \a errorString.
 
-    \sa QWebPage::ErrorPageExtensionReturn
+    \sa QWebPage::extension() QWebPage::ErrorPageExtensionReturn
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::url
+    \brief the url for which an error occurred
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::frame
+    \brief the frame associated with the error
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::domain
+    \brief the domain that reported the error
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::error
+    \brief the error code. Interpretation of the value depends on the \a domain
+    \sa QWebPage::ErrorDomain
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionOption::errorString
+    \brief a string that describes the error
 */
 
 /*!
@@ -2983,7 +3042,7 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
     External objects such as stylesheets or images referenced in the HTML are located relative to
     \a baseUrl.
 
-    \sa QWebPage::ErrorPageExtensionOption, QString::toUtf8()
+    \sa QWebPage::extension() QWebPage::ErrorPageExtensionOption, QString::toUtf8()
 */
 
 /*!
@@ -2992,6 +3051,29 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
     Constructs a new error page object.
 */
 
+
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::contentType
+    \brief the error page's content type
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::encoding
+    \brief the error page encoding
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::baseUrl
+    \brief the base url
+
+    External objects such as stylesheets or images referenced in the HTML are located relative to this url.
+*/
+
+/*!
+    \variable QWebPage::ErrorPageExtensionReturn::content
+    \brief the HTML content of the error page
+*/
+
 /*!
     \class QWebPage::ChooseMultipleFilesExtensionOption
     \since 4.5
@@ -3003,7 +3085,22 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
     The ChooseMultipleFilesExtensionOption class holds the frame originating the request
     and the suggested filenames which might be provided.
 
-    \sa QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn
+    \sa QWebPage::extension() QWebPage::chooseFile(), QWebPage::ChooseMultipleFilesExtensionReturn
+*/
+
+/*!
+    \variable QWebPage::ChooseMultipleFilesExtensionOption::parentFrame
+    \brief The frame in which the request originated
+*/
+
+/*!
+    \variable QWebPage::ChooseMultipleFilesExtensionOption::suggestedFileNames
+    \brief The suggested filenames
+*/
+
+/*!
+    \variable QWebPage::ChooseMultipleFilesExtensionReturn::fileNames
+    \brief The selected filenames
 */
 
 /*!
@@ -3017,14 +3114,17 @@ void QWebPage::updatePositionDependentActions(const QPoint &pos)
     The ChooseMultipleFilesExtensionReturn class holds the filenames selected by the user
     when the extension is invoked.
 
-    \sa QWebPage::ChooseMultipleFilesExtensionOption
+    \sa QWebPage::extension() QWebPage::ChooseMultipleFilesExtensionOption
 */
 
 /*!
     This virtual function can be reimplemented in a QWebPage subclass to provide support for extensions. The \a option
     argument is provided as input to the extension; the output results can be stored in \a output.
 
-    The behavior of this function is determined by \a extension.
+    The behavior of this function is determined by \a extension. The \a option
+    and \a output values are typically casted to the corresponding types (for
+    example, ChooseMultipleFilesExtensionOption and
+    ChooseMultipleFilesExtensionReturn for ChooseMultipleFilesExtension).
 
     You can call supportsExtension() to check if an extension is supported by the page.
 
@@ -3116,6 +3216,8 @@ QWebSettings *QWebPage::settings() const
 
     A suggested filename may be provided in \a suggestedFile. The frame originating the
     request is provided as \a parentFrame.
+
+    \sa ChooseMultipleFilesExtension
 */
 QString QWebPage::chooseFile(QWebFrame *parentFrame, const QString& suggestedFile)
 {
@@ -3369,6 +3471,15 @@ QString QWebPage::userAgentForUrl(const QUrl&) const
         case QSysInfo::SV_9_4:
             firstPartTemp += QString::fromLatin1("/9.4");
             break;
+        case QSysInfo::SV_SF_2:
+            firstPartTemp += QString::fromLatin1("^2");
+            break;
+        case QSysInfo::SV_SF_3:
+            firstPartTemp += QString::fromLatin1("^3");
+            break;
+        case QSysInfo::SV_SF_4:
+            firstPartTemp += QString::fromLatin1("^4");
+            break;
         default:
             firstPartTemp += QString::fromLatin1("/Unknown");
         }
@@ -3479,7 +3590,7 @@ quint64 QWebPage::totalBytes() const
 /*!
     Returns the number of bytes that were received from the network to render the current page.
 
-    \sa totalBytes()
+    \sa totalBytes(), loadProgress()
 */
 quint64 QWebPage::bytesReceived() const
 {
@@ -3511,7 +3622,7 @@ quint64 QWebPage::bytesReceived() const
     This signal is emitted when a load of the page is finished.
     \a ok will indicate whether the load was successful or any error occurred.
 
-    \sa loadStarted()
+    \sa loadStarted(), ErrorPageExtension
 */
 
 /*!
@@ -3538,12 +3649,15 @@ quint64 QWebPage::bytesReceived() const
     \fn void QWebPage::frameCreated(QWebFrame *frame)
 
     This signal is emitted whenever the page creates a new \a frame.
+
+    \sa currentFrame()
 */
 
 /*!
     \fn void QWebPage::selectionChanged()
 
-    This signal is emitted whenever the selection changes.
+    This signal is emitted whenever the selection changes, either interactively
+    or programmatically (e.g. by calling triggerAction() with a selection action).
 
     \sa selectedText()
 */
@@ -3555,7 +3669,7 @@ quint64 QWebPage::bytesReceived() const
     This signal is emitted whenever the text in form elements changes
     as well as other editable content.
 
-    \sa contentEditable, QWebFrame::toHtml(), QWebFrame::toPlainText()
+    \sa contentEditable, modified, QWebFrame::toHtml(), QWebFrame::toPlainText()
 */
 
 /*!
@@ -3631,9 +3745,9 @@ quint64 QWebPage::bytesReceived() const
     \fn void QWebPage::microFocusChanged()
 
     This signal is emitted when for example the position of the cursor in an editable form
-    element changes. It is used inform input methods about the new on-screen position where
-    the user is able to enter text. This signal is usually connected to QWidget's updateMicroFocus()
-    slot.
+    element changes. It is used to inform input methods about the new on-screen position where
+    the user is able to enter text. This signal is usually connected to the
+    QWidget::updateMicroFocus() slot.
 */
 
 /*!
@@ -3674,6 +3788,8 @@ quint64 QWebPage::bytesReceived() const
 
     This signal is emitted whenever the web site shown in \a frame is asking to store data
     to the database \a databaseName and the quota allocated to that web site is exceeded.
+
+    \sa QWebDatabase
 */
 
 /*!
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
index 8ff13b1..f715430 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
@@ -23,25 +23,40 @@
 /*!
     \class QWebPluginFactory
     \since 4.4
-    \brief The QWebPluginFactory class creates plugins to be embedded into web
-    pages.
+    \brief The QWebPluginFactory class is used to embed custom data types in web pages.
 
     \inmodule QtWebKit
 
-    QWebPluginFactory is a factory for creating plugins for QWebPage. A plugin
-    factory can be installed on a QWebPage using QWebPage::setPluginFactory().
+    The HTML \c{} tag is used to embed arbitrary content into a web page,
+    for example:
+
+    \code
+    
+    \endcode
+
+    QtWebkit will natively handle the most basic data types like \c{text/html} and
+    \c{image/jpeg}, but for any advanced or custom data types you will need to
+    provide a handler yourself.
+
+    QWebPluginFactory is a factory for creating plugins for QWebPage, where each
+    plugin provides support for one or more data types. A plugin factory can be
+    installed on a QWebPage using QWebPage::setPluginFactory().
 
     \note The plugin factory is only used if plugins are enabled through QWebSettings.
 
-    You can provide a QWebPluginFactory by implementing the plugins() and the
-    create() method. For plugins() it is necessary to describe the plugins the
+    You provide a QWebPluginFactory by implementing the plugins() and the
+    create() methods. For plugins() it is necessary to describe the plugins the
     factory can create, including a description and the supported MIME types.
     The MIME types each plugin can handle should match the ones specified in
-    in the HTML \c{} tag.
+    in the HTML \c{} tag of your content.
 
     The create() method is called if the requested MIME type is supported. The
     implementation has to return a new instance of the plugin requested for the
     given MIME type and the specified URL.
+
+    The plugins themselves are subclasses of QObject, but currently only plugins
+    based on either QWidget or QGraphicsWidget are supported.
+
 */
 
 
@@ -183,6 +198,7 @@ void QWebPluginFactory::refreshPlugins()
 
 /*!
     \enum QWebPluginFactory::Extension
+    \internal
 
     This enum describes the types of extensions that the plugin factory can support. Before using these extensions, you
     should verify that the extension is supported by calling supportsExtension().
@@ -192,6 +208,7 @@ void QWebPluginFactory::refreshPlugins()
 
 /*!
     \class QWebPluginFactory::ExtensionOption
+    \internal
     \since 4.4
     \brief The ExtensionOption class provides an extended input argument to QWebPluginFactory's extension support.
 
@@ -202,6 +219,7 @@ void QWebPluginFactory::refreshPlugins()
 
 /*!
     \class QWebPluginFactory::ExtensionReturn
+    \internal
     \since 4.4
     \brief The ExtensionOption class provides an extended output argument to QWebPluginFactory's extension support.
 
@@ -214,6 +232,8 @@ void QWebPluginFactory::refreshPlugins()
     This virtual function can be reimplemented in a QWebPluginFactory subclass to provide support for extensions. The \a option
     argument is provided as input to the extension; the output results can be stored in \a output.
 
+    \internal
+
     The behaviour of this function is determined by \a extension.
 
     You can call supportsExtension() to check if an extension is supported by the factory.
@@ -233,6 +253,8 @@ bool QWebPluginFactory::extension(Extension extension, const ExtensionOption *op
 /*!
     This virtual function returns true if the plugin factory supports \a extension; otherwise false is returned.
 
+    \internal
+
     \sa extension()
 */
 bool QWebPluginFactory::supportsExtension(Extension extension) const
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
index 6c26bd7..7179eaa 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsecurityorigin.cpp
@@ -63,6 +63,16 @@ void QWEBKIT_EXPORT qt_drt_setDomainRelaxationForbiddenForURLScheme(bool forbidd
     \c{http://www.malicious.com/evil.html} from accessing \c{http://www.example.com/}'s resources,
     because they are of a different security origin.
 
+    By default local schemes like \c{file://} and \c{qrc://} are concidered to be in the same
+    security origin, and can access each other's resources. You can add additional local schemes
+    by using QWebSecurityOrigin::addLocalScheme(), or override the default same-origin behavior
+    by setting QWebSettings::LocalContentCanAccessFileUrls to \c{false}.
+
+    \note Local resources are by default restricted from accessing remote content, which
+    means your \c{file://} will not be able to access \c{http://domain.com/foo.html}. You
+    can relax this restriction by setting QWebSettings::LocalContentCanAccessRemoteUrls to
+    \c{true}.
+
     Call QWebFrame::securityOrigin() to get the QWebSecurityOrigin for a frame in a
     web page, and use host(), scheme() and port() to identify the security origin.
 
@@ -219,7 +229,11 @@ QList QWebSecurityOrigin::databases() const
     \since 4.6
 
     Adds the given \a scheme to the list of schemes that are considered equivalent
-    to the \c file: scheme. They are not subject to cross domain restrictions.
+    to the \c file: scheme.
+
+    Cross domain restrictions depend on the two web settings QWebSettings::LocalContentCanAccessFileUrls
+    and QWebSettings::LocalContentCanAccessFileUrls. By default all local schemes are concidered to be
+    in the same security origin, and local schemes can not access remote content.
 */
 void QWebSecurityOrigin::addLocalScheme(const QString& scheme)
 {
@@ -231,6 +245,9 @@ void QWebSecurityOrigin::addLocalScheme(const QString& scheme)
 
     Removes the given \a scheme from the list of local schemes.
 
+    \note You can not remove the \c{file://} scheme from the list
+    of local schemes.
+
     \sa addLocalScheme()
 */
 void QWebSecurityOrigin::removeLocalScheme(const QString& scheme)
@@ -240,7 +257,10 @@ void QWebSecurityOrigin::removeLocalScheme(const QString& scheme)
 
 /*!
     \since 4.6
-    Returns a list of all the schemes that were set by the application as local schemes,
+    Returns a list of all the schemes concidered to be local.
+
+    By default this is \c{file://} and \c{qrc://}.
+
     \sa addLocalScheme(), removeLocalScheme()
 */
 QStringList QWebSecurityOrigin::localSchemes()
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
index ae7f6a8..115f9fc 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
@@ -289,8 +289,8 @@ QWebSettings* QWebSettings::globalSettings()
     function. The \l{QWebSettings::WebAttribute}{WebAttribute} enum further describes
     each attribute.
 
-    QWebSettings also configures global properties such as the Web page memory
-    cache and the Web page icon database, local database storage and offline
+    QWebSettings also configures global properties such as the web page memory
+    cache, icon database, local database storage and offline
     applications storage.
 
     \section1 Enabling Plugins
@@ -299,8 +299,8 @@ QWebSettings* QWebSettings::globalSettings()
     \l{QWebSettings::PluginsEnabled}{PluginsEnabled} attribute. For many applications,
     this attribute is enabled for all pages by setting it on the
     \l{globalSettings()}{global settings object}. QtWebKit will always ignore this setting
-    \when processing Qt plugins. The decision to allow a Qt plugin is made by the client
-    \in its reimplementation of QWebPage::createPlugin.
+    when processing Qt plugins. The decision to allow a Qt plugin is made by the client
+    in its reimplementation of QWebPage::createPlugin().
 
     \section1 Web Application Support
 
@@ -339,7 +339,7 @@ QWebSettings* QWebSettings::globalSettings()
 
     \value MinimumFontSize The hard minimum font size.
     \value MinimumLogicalFontSize The minimum logical font size that is applied
-        after zooming with QWebFrame's textSizeMultiplier().
+        when zooming out with QWebFrame::setTextSizeMultiplier().
     \value DefaultFontSize The default font size for regular text.
     \value DefaultFixedFontSize The default font size for fixed-pitch text.
 */
@@ -361,66 +361,74 @@ QWebSettings* QWebSettings::globalSettings()
     This enum describes various attributes that are configurable through QWebSettings.
 
     \value AutoLoadImages Specifies whether images are automatically loaded in
-        web pages.
+        web pages. This is enabled by default.
     \value DnsPrefetchEnabled Specifies whether QtWebkit will try to pre-fetch DNS entries to
-        speed up browsing. This only works as a global attribute. Only for Qt 4.6 and later.
+        speed up browsing. This only works as a global attribute. Only for Qt 4.6 and later. This is disabled by default.
     \value JavascriptEnabled Enables or disables the running of JavaScript
-        programs.
+        programs. This is enabled by default
     \value JavaEnabled Enables or disables Java applets.
         Currently Java applets are not supported.
-    \value PluginsEnabled Enables or disables plugins in Web pages. Qt plugins
-        with a mimetype such as "application/x-qt-plugin" are not affected by this setting.
+    \value PluginsEnabled Enables or disables plugins in Web pages (e.g. using NPAPI). Qt plugins
+        with a mimetype such as "application/x-qt-plugin" are not affected by this setting. This is disabled by default.
     \value PrivateBrowsingEnabled Private browsing prevents WebKit from
-        recording visited pages in the history and storing web page icons.
+        recording visited pages in the history and storing web page icons. This is disabled by default.
     \value JavascriptCanOpenWindows Specifies whether JavaScript programs
-        can open new windows.
+        can open new windows. This is disabled by default.
     \value JavascriptCanAccessClipboard Specifies whether JavaScript programs
-        can read or write to the clipboard.
+        can read or write to the clipboard. This is disabled by default.
     \value DeveloperExtrasEnabled Enables extra tools for Web developers.
         Currently this enables the "Inspect" element in the context menu as
-        well as the use of QWebInspector which controls the WebKit WebInspector
-        for web site debugging.
+        well as the use of QWebInspector which controls the web inspector
+        for web site debugging. This is disabled by default.
     \value SpatialNavigationEnabled Enables or disables the Spatial Navigation
         feature, which consists in the ability to navigate between focusable
         elements in a Web page, such as hyperlinks and form controls, by using
-        Left, Right, Up and Down arrow keys. For example, if an user presses the
+        Left, Right, Up and Down arrow keys. For example, if a user presses the
         Right key, heuristics determine whether there is an element he might be
-        trying to reach towards the right, and if there are multiple elements,
-        which element he probably wants.
+        trying to reach towards the right and which element he probably wants.
+        This is disabled by default.
     \value LinksIncludedInFocusChain Specifies whether hyperlinks should be
-        included in the keyboard focus chain.
-    \value ZoomTextOnly Specifies whether the zoom factor on a frame applies to
-        only the text or all content.
+        included in the keyboard focus chain. This is enabled by default.
+    \value ZoomTextOnly Specifies whether the zoom factor on a frame applies
+        only to the text or to all content. This is disabled by default.
     \value PrintElementBackgrounds Specifies whether the background color and images
-        are also drawn when the page is printed.
+        are also drawn when the page is printed. This is enabled by default.
     \value OfflineStorageDatabaseEnabled Specifies whether support for the HTML 5
-        offline storage feature is enabled or not. Disabled by default.
+        offline storage feature is enabled or not. This is disabled by default.
     \value OfflineWebApplicationCacheEnabled Specifies whether support for the HTML 5
-        web application cache feature is enabled or not. Disabled by default.
+        web application cache feature is enabled or not. This is disabled by default.
     \value LocalStorageEnabled Specifies whether support for the HTML 5
-        local storage feature is enabled or not. Disabled by default.
+        local storage feature is enabled or not. This is disabled by default.
     \value LocalStorageDatabaseEnabled \e{This enum value is deprecated.} Use
         QWebSettings::LocalStorageEnabled instead.
-    \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
-    \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls.
-    \value XSSAuditorEnabled Specifies whether load requests should be monitored for cross-site scripting attempts.
+    \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are
+        allowed to access remote urls. This is disabled by default. For more information
+        about security origins and local vs. remote content see QWebSecurityOrigin.
+    \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are
+        allowed to access other local urls. This is enabled by default. For more information
+        about security origins and local vs. remote content see QWebSecurityOrigin.
+    \value XSSAuditingEnabled Specifies whether load requests should be monitored for cross-site
+        scripting attempts. Suspicious scripts will be blocked and reported in the inspector's
+        JavaScript console. Enabling this feature might have an impact on performance
+        and it is disabled by default.
     \value AcceleratedCompositingEnabled This feature, when used in conjunction with
         QGraphicsWebView, accelerates animations of web content. CSS animations of the transform and
         opacity properties will be rendered by composing the cached content of the animated elements.
-        This feature is enabled by default
+        This is enabled by default.
     \value TiledBackingStoreEnabled This setting enables the tiled backing store feature
         for a QGraphicsWebView. With the tiled backing store enabled, the web page contents in and around
         the current visible area is speculatively cached to bitmap tiles. The tiles are automatically kept
         in sync with the web page as it changes. Enabling tiling can significantly speed up painting heavy 
         operations like scrolling. Enabling the feature increases memory consumption. It does not work well 
         with contents using CSS fixed positioning (see also \l{QGraphicsWebView::}{resizesToContents} property).
-        \l{QGraphicsWebView::}{tiledBackingStoreFrozen} property allows application to temporarily freeze the contents of the backing store.
+        \l{QGraphicsWebView::}{tiledBackingStoreFrozen} property allows application to temporarily
+        freeze the contents of the backing store. This is disabled by default.
     \value FrameFlatteningEnabled With this setting each subframe is expanded to its contents.
         On touch devices, it is desired to not have any scrollable sub parts of the page
         as it results in a confusing user experience, with scrolling sometimes scrolling sub parts
         and at other times scrolling the page itself. For this reason iframes and framesets are
         barely usable on touch devices. This will flatten all the frames to become one scrollable page.
-        Disabled by default.
+        This is disabled by default.
 */
 
 /*!
@@ -525,7 +533,8 @@ void QWebSettings::resetFontSize(FontSize type)
     with UTF-8 and Base64 encoded data, such as:
 
     "data:text/css;charset=utf-8;base64,cCB7IGJhY2tncm91bmQtY29sb3I6IHJlZCB9Ow=="
-    NOTE: In case the base 64 data is not valid the style will not be applied.
+
+    \note If the base64 data is not valid, the style will not be applied.
 
     \sa userStyleSheetUrl()
 */
@@ -576,9 +585,11 @@ QString QWebSettings::defaultTextEncoding() const
     Sets the path of the icon database to \a path. The icon database is used
     to store "favicons" associated with web sites.
 
-    \a path must point to an existing directory where the icons are stored.
+    \a path must point to an existing directory.
 
     Setting an empty path disables the icon database.
+
+    \sa iconDatabasePath(), clearIconDatabase()
 */
 void QWebSettings::setIconDatabasePath(const QString& path)
 {
@@ -621,7 +632,7 @@ void QWebSettings::clearIconDatabase()
 /*!
     Returns the web site's icon for \a url.
 
-    If the web site does not specify an icon, or the icon is not in the
+    If the web site does not specify an icon \bold OR if the icon is not in the
     database, a null QIcon is returned.
 
     \note The returned icon's size is arbitrary.
@@ -658,7 +669,7 @@ QWebPluginDatabase *QWebSettings::pluginDatabase()
     Sets \a graphic to be drawn when QtWebKit needs to draw an image of the
     given \a type.
 
-    For example, when an image cannot be loaded the pixmap specified by
+    For example, when an image cannot be loaded, the pixmap specified by
     \l{QWebSettings::WebGraphic}{MissingImageGraphic} is drawn instead.
 
     \sa webGraphic()
@@ -676,9 +687,6 @@ void QWebSettings::setWebGraphic(WebGraphic type, const QPixmap& graphic)
     Returns a previously set pixmap used to draw replacement graphics of the
     specified \a type.
 
-    For example, when an image cannot be loaded the pixmap specified by
-    \l{QWebSettings::WebGraphic}{MissingImageGraphic} is drawn instead.
-
     \sa setWebGraphic()
 */
 QPixmap QWebSettings::webGraphic(WebGraphic type)
@@ -719,8 +727,7 @@ void QWebSettings::clearMemoryCaches()
     Sets the maximum number of pages to hold in the memory page cache to \a pages.
 
     The Page Cache allows for a nicer user experience when navigating forth or back
-    to pages in the forward/back history, by pausing and resuming up to \a pages
-    per page group.
+    to pages in the forward/back history, by pausing and resuming up to \a pages.
 
     For more information about the feature, please refer to:
 
@@ -792,8 +799,8 @@ QString QWebSettings::fontFamily(FontFamily which) const
 }
 
 /*!
-    Resets the actual font family to the default font family, specified by
-    \a which.
+    Resets the actual font family specified by \a which to the one set
+    in the global QWebSettings instance.
 
     This function has no effect on the global QWebSettings instance.
 */
@@ -835,7 +842,9 @@ bool QWebSettings::testAttribute(WebAttribute attr) const
 /*!
     \fn void QWebSettings::resetAttribute(WebAttribute attribute)
 
-    Resets the setting of \a attribute.
+    Resets the setting of \a attribute to the value specified in the
+    global QWebSettings instance.
+
     This function has no effect on the global QWebSettings instance.
 
     \sa globalSettings()
@@ -851,12 +860,15 @@ void QWebSettings::resetAttribute(WebAttribute attr)
 /*!
     \since 4.5
 
-    Sets the path for HTML5 offline storage to \a path.
+    Sets \a path as the save location for HTML5 client-side database storage data.
 
-    \a path must point to an existing directory where the databases are stored.
+    \a path must point to an existing directory.
 
     Setting an empty path disables the feature.
 
+    Support for client-side databases can enabled by setting the
+    \l{QWebSettings::OfflineStorageDatabaseEnabled}{OfflineStorageDatabaseEnabled} attribute.
+
     \sa offlineStoragePath()
 */
 void QWebSettings::setOfflineStoragePath(const QString& path)
@@ -869,7 +881,7 @@ void QWebSettings::setOfflineStoragePath(const QString& path)
 /*!
     \since 4.5
 
-    Returns the path of the HTML5 offline storage or an empty string if the
+    Returns the path of the HTML5 client-side database storage or an empty string if the
     feature is disabled.
 
     \sa setOfflineStoragePath()
@@ -906,22 +918,24 @@ qint64 QWebSettings::offlineStorageDefaultQuota()
 
 /*!
     \since 4.6
-    \relates QWebSettings
 
     Sets the path for HTML5 offline web application cache storage to \a path.
 
     An application cache acts like an HTTP cache in some sense. For documents
-    that use the application cache via JavaScript, the loader mechinery will
+    that use the application cache via JavaScript, the loader engine will
     first ask the application cache for the contents, before hitting the
     network.
 
     The feature is described in details at:
     http://dev.w3.org/html5/spec/Overview.html#appcache
 
-    \a path must point to an existing directory where the cache is stored.
+    \a path must point to an existing directory.
 
     Setting an empty path disables the feature.
 
+    Support for offline web application cache storage can enabled by setting the
+    \l{QWebSettings::OfflineWebApplicationCacheEnabled}{OfflineWebApplicationCacheEnabled} attribute.
+
     \sa offlineWebApplicationCachePath()
 */
 void QWebSettings::setOfflineWebApplicationCachePath(const QString& path)
@@ -933,7 +947,6 @@ void QWebSettings::setOfflineWebApplicationCachePath(const QString& path)
 
 /*!
     \since 4.6
-    \relates QWebSettings
 
     Returns the path of the HTML5 offline web application cache storage
     or an empty string if the feature is disabled.
@@ -980,7 +993,6 @@ qint64 QWebSettings::offlineWebApplicationCacheQuota()
 
 /*!
     \since 4.6
-    \relates QWebSettings
 
     Sets the path for HTML5 local storage to \a path.
     
@@ -1025,7 +1037,6 @@ QUrl QWebSettings::inspectorUrl() const
 
 /*!
     \since 4.6
-    \relates QWebSettings
 
     Returns the path for HTML5 local storage.
     
@@ -1038,13 +1049,14 @@ QString QWebSettings::localStoragePath() const
 
 /*!
     \since 4.6
-    \relates QWebSettings
 
-    Enables WebKit persistent data and sets the path to \a path.
-    If the \a path is empty the path for persistent data is set to the 
-    user-specific data location specified by 
-    \l{QDesktopServices::DataLocation}{DataLocation}.
-    
+    Enables WebKit data persistence and sets the path to \a path.
+    If \a path is empty, the user-specific data location specified by
+    \l{QDesktopServices::DataLocation}{DataLocation} will be used instead.
+
+    This method will simultaneously set and enable the iconDatabasePath(),
+    localStoragePath(), offlineStoragePath() and offlineWebApplicationCachePath().
+
     \sa localStoragePath()
 */
 void QWebSettings::enablePersistentStorage(const QString& path)
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
index d2e536e..3592e2c 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
@@ -63,7 +63,7 @@ public:
         OfflineStorageDatabaseEnabled,
         OfflineWebApplicationCacheEnabled,
         LocalStorageEnabled,
-#ifdef QT_DEPRECATED
+#if defined(QT_DEPRECATED) || defined(qdoc)
         LocalStorageDatabaseEnabled = LocalStorageEnabled,
 #endif
         LocalContentCanAccessRemoteUrls,
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 6ddaa2b..efc8f27 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,102 @@
+2010-05-14  Kent Hansen , Jocelyn Turcotte , Tor Arne Vestbø , Henry Haverinen , Jedrzej Nowacki , Andreas Kling 
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Merge overhaul of the QtWebKit API documentation
+
+        Numerous improvements in wording, qdoc warning fixes and
+        clarifications, done in a team work effort.
+
+        No functional changes.
+
+        * Api/qwebdatabase.cpp:
+        * Api/qwebelement.cpp:
+        * Api/qwebframe.cpp:
+        * Api/qwebhistoryinterface.cpp:
+        * Api/qwebinspector.cpp:
+        * Api/qwebkitversion.cpp:
+        * Api/qwebpage.cpp:
+        * Api/qwebpluginfactory.cpp:
+        * Api/qwebsecurityorigin.cpp:
+        * Api/qwebsettings.cpp:
+        * Api/qwebsettings.h:
+        * docs/qtwebkit.qdoc:
+        * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp:
+        (wrapInFunction):
+        * docs/webkitsnippets/webelement/main.cpp:
+        (findButtonAndClick):
+        (autocomplete1):
+        (autocomplete2):
+        (main):
+
+2010-05-14  Martin Smith  
+
+        Reviewed by Simon Hausmann.
+
+        Documentation: Fix overview grouping.
+
+        * docs/qtwebkit.qdoc:
+
+2010-05-14  Benjamin Poulain  
+
+        Reviewed by Laszlo Gombos.
+
+        [QT] Update the Symbian version for the user agent
+        https://bugs.webkit.org/show_bug.cgi?id=38389
+
+        Update the user agent for Symbian^2 to Symbian^4
+
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+
+2010-05-11  Antonio Gomes  
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout
+        https://bugs.webkit.org/show_bug.cgi?id=38921
+
+        Emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout
+        instead of FrameLoaderClientQt::dispatchDidFirstLayout , because the former ensures that a
+        visual content layed out on the frame.
+
+        It matches to QWebFrame::initialLayoutCompleted signal documentation at:
+
+        "... This is the first time you will see contents displayed on the frame ..."
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidFirstLayout):
+        (WebCore::FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout):
+
+2010-05-11  Kenneth Rohde Christiansen  
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing
+        https://bugs.webkit.org/show_bug.cgi?id=38655
+
+        Fix double free by moving the connect till after the resize.
+
+        The bug is causes by the fact that a resize of an empty page causes a
+        layout, thus deleting the qgraphicswebview before setHtml is called,
+        which then deletes it again, causing a double free.
+
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::crashOnViewlessWebPages):
+
+2010-05-11  Diego Gonzalez  
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] tst_QWebPage::inputMethods failing on Maemo5
+        https://bugs.webkit.org/show_bug.cgi?id=38685
+
+        Check if the SIP (Software Input Panel) is triggered, which normally
+        happens on mobile platforms, when a user input form receives a mouse click.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
 2010-05-09  Noam Rosenthal  
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 4ad008b..686bfcc 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -414,13 +414,13 @@ void FrameLoaderClientQt::dispatchDidFinishLoad()
 
 void FrameLoaderClientQt::dispatchDidFirstLayout()
 {
-    if (m_webFrame)
-        emit m_webFrame->initialLayoutCompleted();
+    notImplemented();
 }
 
 void FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout()
 {
-    notImplemented();
+    if (m_webFrame)
+        emit m_webFrame->initialLayoutCompleted();
 }
 
 void FrameLoaderClientQt::dispatchShow()
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 96eb16e..c6dd550 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -7,63 +7,9 @@
     \ingroup modules
     \ingroup technology-apis
 
-    \brief The QtWebKit module provides a web browser engine and
+    \brief The QtWebKit module provides a web browser engine as well as
     classes to render and interact with web content.
 
-    To include the definitions of the module's classes, use the
-    following directive:
-
-    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 1
-
-    To link against the module, add this line to your \l qmake \c
-    .pro file:
-
-    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0
-
-    \section1 License Information
-
-    This is a snapshot of the Qt port of WebKit. The exact version information
-    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
-
-    Qt Commercial Edition licensees that wish to distribute applications that
-    use the QtWebKit module need to be aware of their obligations under the
-    GNU Library General Public License (LGPL).
-
-    Developers using the Open Source Edition can choose to redistribute
-    the module under the appropriate version of the GNU LGPL.
-
-    \legalese
-    WebKit is licensed under the GNU Library General Public License.
-    Individual contributor names and copyright dates can be found
-    inline in the code.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-    \endlegalese
-*/
-
-/*!
-    \page webintegration.html
-    \title Integrating Web Content with QtWebKit
-    \since 4.4
-
-    \ingroup frameworks-technologies
-
-    \keyword Browser
-    \keyword Web Browser
-
     QtWebKit provides a Web browser engine that makes it easy to embed content
     from the World Wide Web into your Qt application. At the same time Web
     content can be enhanced with native controls.
@@ -85,6 +31,20 @@
     QtWebKit is based on the Open Source WebKit engine. More information about
     WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
 
+    \section1 Including In Your Project
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 1
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0
+
+    \section1 Notes 
+
     \note Building the QtWebKit module with debugging symbols is problematic
     on many platforms due to the size of the WebKit engine. We recommend
     building the module only in release mode for embedded platforms.
@@ -99,10 +59,6 @@
     Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
     document for more information.
 
-    Topics:
-
-    \tableofcontents
-
     \section1 Architecture
 
     The easiest way to render content is through the QWebView class. As a
@@ -195,4 +151,39 @@
     \o The system \c{/Library/Internet Plug-Ins} directory
     \endlist
     \endtable
+    
+
+    \section1 License Information
+
+    This is a snapshot of the Qt port of WebKit. The exact version information
+    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
+
+    Qt Commercial Edition licensees that wish to distribute applications that
+    use the QtWebKit module need to be aware of their obligations under the
+    GNU Library General Public License (LGPL).
+
+    Developers using the Open Source Edition can choose to redistribute
+    the module under the appropriate version of the GNU LGPL.
+
+    \legalese
+    WebKit is licensed under the GNU Library General Public License.
+    Individual contributor names and copyright dates can be found
+    inline in the code.
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+    \endlegalese
 */
+
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
index a6b6620..07f1d45 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp
@@ -9,8 +9,6 @@ void wrapInFunction()
 
     QWebInspector *inspector = new QWebInspector;
     inspector->setPage(page);
-
-    connect(page, SIGNAL(webInspectorTriggered(QWebElement)), inspector, SLOT(show()));
 //! [0]
 
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
index 822b61c..b1781a6 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webelement/main.cpp
@@ -36,6 +36,59 @@ static void traverse()
 //! [Traversing with QWebElement]
 }
 
+static void findButtonAndClick()
+{
+
+    frame->setHtml("
      "
+                   ""
+                   ""
+                   "
      ");
+
+//! [Calling a DOM element method]
+
+    QWebElement document = frame->documentElement();
+    /* Assume that the document has the following structure:
+
+        
      
+            
+            
+        
      
+
+     */
+
+    QWebElement button = document.findFirst("input[type=submit]");
+    button.evaluateJavaScript("click()");
+
+//! [Calling a DOM element method]
+
+ }
+
+static void autocomplete1()
+{
+    QWebElement document = frame->documentElement();
+
+//! [autocomplete1]
+    QWebElement firstTextInput = document.findFirst("input[type=text]");
+    QString storedText = firstTextInput.attribute("value");
+//! [autocomplete1]
+
+}
+
+
+static void autocomplete2()
+{
+
+    QWebElement document = frame->documentElement();
+    QString storedText = "text";
+
+//! [autocomplete2]
+    QWebElement firstTextInput = document.findFirst("input[type=text]");
+    textInput.setAttribute("value", storedText);
+//! [autocomplete2]
+
+}
+
+
 static void findAll()
 {
 //! [FindAll]
@@ -65,5 +118,8 @@ int main(int argc, char *argv[])
     frame = view->page()->mainFrame();
     traverse();
     findAll();
+    findButtonAndClick();
+    autocomplete1();
+    autocomplete2();
     return 0;
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
index 14f5820..ebe847d 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
@@ -84,16 +84,19 @@ void tst_QGraphicsWebView::crashOnViewlessWebPages()
     WebPage* page = new WebPage;
     webView->setPage(page);
     page->webView = webView;
-    connect(page->mainFrame(), SIGNAL(initialLayoutCompleted()), page, SLOT(aborting()));
-
     scene.addItem(webView);
 
     view.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     view.resize(600, 480);
     webView->resize(view.geometry().size());
+
     QCoreApplication::processEvents();
     view.show();
 
+    // Resizing the page will resize and layout the empty "about:blank"
+    // page, so we first connect the signal afterward.
+    connect(page->mainFrame(), SIGNAL(initialLayoutCompleted()), page, SLOT(aborting()));
+
     page->mainFrame()->setHtml(QString("data:text/html,"
                                             ""
                                                 ""
@@ -101,6 +104,7 @@ void tst_QGraphicsWebView::crashOnViewlessWebPages()
                                             ""));
 
     QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool))));
+    delete page;
 }
 
 void tst_QGraphicsWebView::microFocusCoordinates()
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 834a394..12fb9b3 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1367,7 +1368,27 @@ void tst_QWebPage::inputMethods()
     page->event(&evrel);
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
+    // This part of the test checks if the SIP (Software Input Panel) is triggered,
+    // which normally happens on mobile platforms, when a user input form receives
+    // a mouse click.
+    int  inputPanel = 0;
+    if (viewType == "QWebView") {
+        if (QWebView* wv = qobject_cast(view))
+            inputPanel = wv->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
+    } else if (viewType == "QGraphicsWebView") {
+        if (QGraphicsWebView* wv = qobject_cast(view))
+            inputPanel = wv->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
+    }
+
+    // For non-mobile platforms RequestSoftwareInputPanel event is not called
+    // because there is no SIP (Software Input Panel) triggered. In the case of a
+    // mobile platform, an input panel, e.g. virtual keyboard, is usually invoked
+    // and the RequestSoftwareInputPanel event is called. For these two situations
+    // this part of the test can verified as the checks below.
+    if (inputPanel)
+        QVERIFY(viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
+    else
+        QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
 #endif
     viewEventSpy.clear();
 
-- 
cgit v0.12


From c25737a44fb22668c67568eefb61c72457166dfe Mon Sep 17 00:00:00 2001
From: Kai Koehne 
Date: Fri, 14 May 2010 11:29:35 +0200
Subject: Fix compilation of QtDeclarative module (gcc)

Broke with commit 645b9ee9dd6
---
 src/declarative/qml/qdeclarativeinclude.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp
index 97220f1..619264a 100644
--- a/src/declarative/qml/qdeclarativeinclude.cpp
+++ b/src/declarative/qml/qdeclarativeinclude.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativeinclude_p.h"
 
-#include 
+#include 
 #include 
 #include 
 #include 
-- 
cgit v0.12


From 37c817ac5d19fe70e1457dddc8ba62ad6702cfdb Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Fri, 14 May 2010 11:32:01 +0200
Subject: doc: Added some \briefs to how-to docs.

---
 doc/src/frameworks-technologies/dbus-adaptors.qdoc |  1 +
 doc/src/howtos/HWacceleration.qdoc                 | 15 +++++++++------
 doc/src/howtos/accelerators.qdoc                   |  1 +
 doc/src/howtos/appicon.qdoc                        |  1 +
 doc/src/howtos/guibooks.qdoc                       |  1 +
 doc/src/howtos/qtdesigner.qdoc                     |  1 +
 doc/src/howtos/restoring-geometry.qdoc             |  2 +-
 doc/src/howtos/session.qdoc                        |  2 +-
 doc/src/howtos/sharedlibrary.qdoc                  |  2 +-
 doc/src/howtos/timers.qdoc                         |  2 +-
 doc/src/sql-programming/qsqldatatype-table.qdoc    | 19 ++++++++++---------
 11 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 11c5998..25c6a43 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -43,6 +43,7 @@
     \page usingadaptors.html
     \title Using QtDBus Adaptors
     \ingroup technology-apis
+    \brief How to create and use DBus adaptors in Qt.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc
index fbc657c..c7b1a72 100644
--- a/doc/src/howtos/HWacceleration.qdoc
+++ b/doc/src/howtos/HWacceleration.qdoc
@@ -41,17 +41,20 @@
 
 /*!
     \page HWAcc_rendering.html
-    \title Using hardware acceleration on embedded platforms.
+    \title Hardware Acceleration & Embedded Platforms.
+    \brief How to use hardware acceleration for fast rendering.
 
     \ingroup best-practices
 
     \section1 Abstract
+
     This document describes how to use hardware acceleration for fast
-    rendering on embedded platforms supported by Qt. In short, it explains
-    how the graphics pipeline works. Since there might be differences to 
-	how the APIs are being used on different embedded platforms, a table
-	links to documentation dedicated to platform specific documentation
-	for each supported hardware acceleration API.
+    rendering on embedded platforms supported by Qt. In short, it
+    explains how the graphics pipeline works. Since there might be
+    differences to how the APIs are being used on different embedded
+    platforms, a table links to documentation dedicated to platform
+    specific documentation for each supported hardware acceleration
+    API.
 
     \input platforms/emb-hardwareacceleration.qdocinc
 
diff --git a/doc/src/howtos/accelerators.qdoc b/doc/src/howtos/accelerators.qdoc
index 65f1def..b6ef5c2 100644
--- a/doc/src/howtos/accelerators.qdoc
+++ b/doc/src/howtos/accelerators.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page accelerators.html
     \title Standard Accelerator Keys
+    \brief Recommended accelerator keys.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index dd39509..9377961 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page appicon.html
     \title Setting the Application Icon
+    \brief How to set your application's icon.
 
     \ingroup best-practices
 
diff --git a/doc/src/howtos/guibooks.qdoc b/doc/src/howtos/guibooks.qdoc
index 1a70670..bccfbe6 100644
--- a/doc/src/howtos/guibooks.qdoc
+++ b/doc/src/howtos/guibooks.qdoc
@@ -43,6 +43,7 @@
     \page guibooks.html
     \title Books about GUI Design
     \ingroup best-practices
+    \brief Some recommended books about GUI design.
 
     This is not a comprehensive list -- there are many other books worth
     buying. Here we mention just a few user interface books that don't
diff --git a/doc/src/howtos/qtdesigner.qdoc b/doc/src/howtos/qtdesigner.qdoc
index 2dd7fcf..92041f0 100644
--- a/doc/src/howtos/qtdesigner.qdoc
+++ b/doc/src/howtos/qtdesigner.qdoc
@@ -42,6 +42,7 @@
 /*!
     \page qtdesigner-components.html
     \title Creating and Using Components for Qt Designer
+    \brief How to create and use custom widget plugins.
     \ingroup best-practices
 
     \tableofcontents
diff --git a/doc/src/howtos/restoring-geometry.qdoc b/doc/src/howtos/restoring-geometry.qdoc
index 36c5e4f..e72b993 100644
--- a/doc/src/howtos/restoring-geometry.qdoc
+++ b/doc/src/howtos/restoring-geometry.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page restoring-geometry.html
     \title Restoring a Window's Geometry
-
+    \brief How to save & restore window geometry.
     \ingroup best-practices
 
     This document describes how to save and restore a \l{Window
diff --git a/doc/src/howtos/session.qdoc b/doc/src/howtos/session.qdoc
index e2e87a8..f53af04 100644
--- a/doc/src/howtos/session.qdoc
+++ b/doc/src/howtos/session.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page session.html
     \title Session Management
-
+    \brief How to do session management with Qt.
     \ingroup best-practices
 
     A \e session is a group of running applications, each of which has a
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc
index 70fc4db..ed803ed 100644
--- a/doc/src/howtos/sharedlibrary.qdoc
+++ b/doc/src/howtos/sharedlibrary.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page sharedlibrary.html
     \title Creating Shared Libraries
-
+    \brief How to create shared libraries.
     \ingroup best-practices
 
     The following sections list certain things that should be taken into
diff --git a/doc/src/howtos/timers.qdoc b/doc/src/howtos/timers.qdoc
index cfc2fb4..b001916 100644
--- a/doc/src/howtos/timers.qdoc
+++ b/doc/src/howtos/timers.qdoc
@@ -42,7 +42,7 @@
 /*!
     \page timers.html
     \title Timers
-    \brief How to use timers in your application.
+    \brief How to use Qt timers in your application.
 
     \ingroup best-practices
 
diff --git a/doc/src/sql-programming/qsqldatatype-table.qdoc b/doc/src/sql-programming/qsqldatatype-table.qdoc
index fc961f5..398e659 100644
--- a/doc/src/sql-programming/qsqldatatype-table.qdoc
+++ b/doc/src/sql-programming/qsqldatatype-table.qdoc
@@ -41,19 +41,20 @@
 
 /*!
   \page sql-types.html
-  \title Recommended Use of Data Types in Databases
+  \title Data Types for Qt-supported Database Systems
+  \brief Recommended data types for database systems
   
   \ingroup best-practices
 
-  \section1 Recommended Use of Types in Qt Supported Databases
+  \section1 Data Types for Qt Supported Database Systems
 
-  This table shows the recommended data types used when extracting data 
-  from the databases supported in Qt. It is important to note that the
-  types used in Qt are not necessarily valid as input to the specific
-  database. One example could be that a double would work perfectly as
-  input for floating point records in a database, but not necessarily
-  as a storage format for output from the database since it would be stored
-  with 64-bit precision in C++.
+  This table shows the recommended data types for extracting data from
+  the databases supported in Qt. Note that types used in Qt are not
+  necessarily valid as input types to a specific database
+  system. e.g., A double might work perfectly as input for floating
+  point records in a particular database, but not necessarily as a
+  storage format for output from that database, because it would be
+  stored with 64-bit precision in C++.
 
   \tableofcontents
 
-- 
cgit v0.12


From 23f1fa2e47f3bd4cea92510d70c2e9d0fbbcfc92 Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara 
Date: Fri, 14 May 2010 10:36:27 +0200
Subject: [Regression] Build failure on Mac Carbon

Including objc/runtime.h when using Carbon produced problems so I
protected that include via ifdef.

Task-number: QTBUG-10519
Reviewed-by: Jason Mcdonald
---
 src/gui/kernel/qt_mac_p.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/kernel/qt_mac_p.h
index 3341ce1..ca9541a 100644
--- a/src/gui/kernel/qt_mac_p.h
+++ b/src/gui/kernel/qt_mac_p.h
@@ -57,7 +57,9 @@
 
 #ifdef __OBJC__
 #include 
+#ifdef QT_MAC_USE_COCOA
 #include 
+#endif // QT_MAC_USE_COCOA
 #endif
 
 #include 
-- 
cgit v0.12


From e0c4899b46a68b37ce743c5a1ffd17596cbaa44c Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara 
Date: Fri, 14 May 2010 11:41:05 +0200
Subject: Mac: restoreGeometry()

The problem here is the fact that when zooming (maximizing) a window,
we should update the starting position since the window is now starting
at 0,0. However when restoring the window should be placed in the
original position. The bug here occurs because we kept the original
position and the new size. So the window was drawn were it was using
the new size. This patch introduces a boolean flag that keeps track of
the maximized state. We are interested in knowing if the window was
maximized but not restored, so when saving the geometry we have a way
to know that we need to "move" the window to 0,0.

Task-number: QTBUG-10504
Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoawindowdelegate_mac.mm | 21 ++++++++++++++++++---
 src/gui/kernel/qwidget.cpp                 | 22 ++++++++++++++++++++++
 src/gui/kernel/qwidget_p.h                 |  8 ++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index 24498f8..2b9cf85 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -202,6 +202,11 @@ static void cleanupCocoaWindowDelegate()
         QWindowStateChangeEvent e(Qt::WindowStates(widgetData->window_state
                                                    & ~Qt::WindowMaximized));
         qt_sendSpontaneousEvent(qwidget, &e);
+    } else {
+        widgetData->window_state = widgetData->window_state & ~Qt::WindowMaximized;
+        QWindowStateChangeEvent e(Qt::WindowStates(widgetData->window_state
+                                                   | Qt::WindowMaximized));
+        qt_sendSpontaneousEvent(qwidget, &e);
     }
     NSRect rect = [[window contentView] frame];
     const QSize newSize(rect.size.width, rect.size.height);
@@ -305,9 +310,19 @@ static void cleanupCocoaWindowDelegate()
     Q_UNUSED(newFrame);
     // saving the current window geometry before the window is maximized
     QWidget *qwidget = m_windowHash->value(window);
-    if (qwidget->isWindow() && !(qwidget->windowState() & Qt::WindowMaximized)) {
-        QWidgetPrivate *widgetPrivate = qt_widget_private(qwidget);
-        widgetPrivate->topData()->normalGeometry = qwidget->geometry();
+    QWidgetPrivate *widgetPrivate = qt_widget_private(qwidget);
+    if (qwidget->isWindow()) {
+        if(qwidget->windowState() & Qt::WindowMaximized) {
+            // Restoring
+            widgetPrivate->topData()->wasMaximized = false;
+        } else {
+            // Maximizing
+            widgetPrivate->topData()->normalGeometry = qwidget->geometry();
+            // If the window was maximized we need to update the coordinates since now it will start at 0,0.
+            // We do this in a special field that is only used when not restoring but manually resizing the window.
+            // Since the coordinates are fixed we just set a boolean flag.
+            widgetPrivate->topData()->wasMaximized = true;
+        }
     }
     return YES;
 }
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index e39526e..420eda6 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1581,6 +1581,11 @@ void QWidgetPrivate::createTLExtra()
         x->inTopLevelResize = false;
         x->inRepaint = false;
         x->embedded = 0;
+#ifdef Q_WS_MAC
+#ifdef QT_MAC_USE_COCOA
+        x->wasMaximized = false;
+#endif // QT_MAC_USE_COCOA
+#endif // Q_WS_MAC
         createTLSysExtra();
 #ifdef QWIDGET_EXTRA_DEBUG
         static int count = 0;
@@ -6749,6 +6754,18 @@ void QWidget::setGeometry(const QRect &r)
 */
 QByteArray QWidget::saveGeometry() const
 {
+#ifdef QT_MAC_USE_COCOA
+    // We check if the window was maximized during this invocation. If so, we need to record the
+    // starting position as 0,0.
+    Q_D(const QWidget);
+    QRect newFramePosition = frameGeometry();
+    QRect newNormalPosition = normalGeometry();
+    if(d->topData()->wasMaximized) {
+        // Change the starting position
+        newFramePosition.moveTo(0, 0);
+        newNormalPosition.moveTo(0, 0);
+    }
+#endif // QT_MAC_USE_COCOA
     QByteArray array;
     QDataStream stream(&array, QIODevice::WriteOnly);
     stream.setVersion(QDataStream::Qt_4_0);
@@ -6758,8 +6775,13 @@ QByteArray QWidget::saveGeometry() const
     stream << magicNumber
            << majorVersion
            << minorVersion
+#ifdef QT_MAC_USE_COCOA
+           << newFramePosition
+           << newNormalPosition
+#else
            << frameGeometry()
            << normalGeometry()
+#endif // QT_MAC_USE_COCOA
            << qint32(QApplication::desktop()->screenNumber(this))
            << quint8(windowState() & Qt::WindowMaximized)
            << quint8(windowState() & Qt::WindowFullScreen);
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index cad60b5..3f494d8 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -170,6 +170,14 @@ struct QTLWExtra {
     WindowGroupRef group;
     IconRef windowIcon; // the current window icon, if set with setWindowIcon_sys.
     quint32 savedWindowAttributesFromMaximized; // Saved attributes from when the calling updateMaximizeButton_sys()
+#ifdef QT_MAC_USE_COCOA
+    // This value is just to make sure we maximize and restore to the right location, yet we allow apps to be maximized and
+    // manually resized.
+    // The name is misleading, since this is set when maximizing the window. It is a hint to saveGeometry(..) to record the
+    // starting position as 0,0 instead of the normal starting position.
+    bool wasMaximized;
+#endif // QT_MAC_USE_COCOA
+
 #elif defined(Q_WS_QWS) // <--------------------------------------------------------- QWS
 #ifndef QT_NO_QWS_MANAGER
     QWSManager *qwsManager;
-- 
cgit v0.12


From 02bc8c45f2cae1b6cd417631be8e98bc79c9c42d Mon Sep 17 00:00:00 2001
From: Martin Smith 
Date: Fri, 14 May 2010 14:47:42 +0200
Subject: doc: Another upgrade of the top page and overviews.

More to come.
---
 doc/src/development/developing-on-mac.qdoc         |   5 +-
 doc/src/frameworks-technologies/accessible.qdoc    |   3 +
 doc/src/frameworks-technologies/dbus-adaptors.qdoc |   2 +-
 doc/src/frameworks-technologies/phonon.qdoc        |   2 +
 doc/src/getting-started/known-issues.qdoc          |  10 +-
 doc/src/overviews.qdoc                             |  19 +-
 doc/src/sql-programming/qsqldatatype-table.qdoc    |   2 +-
 doc/src/sql-programming/sql-driver.qdoc            |   2 +-
 doc/src/sql-programming/sql-programming.qdoc       |   6 +
 doc/src/widgets-and-layouts/styles.qdoc            |  12 +-
 doc/src/widgets-and-layouts/widgets.qdoc           | 202 ++++++++++-----------
 doc/src/windows-and-dialogs/mainwindow.qdoc        |  14 +-
 12 files changed, 141 insertions(+), 138 deletions(-)

diff --git a/doc/src/development/developing-on-mac.qdoc b/doc/src/development/developing-on-mac.qdoc
index 785858f..0c0af79 100644
--- a/doc/src/development/developing-on-mac.qdoc
+++ b/doc/src/development/developing-on-mac.qdoc
@@ -41,9 +41,8 @@
 
 /*!
     \page developing-on-mac.html
-    \title Developing Qt Applications on Mac OS X
-    \brief A overview of items to be aware of when developing Qt applications
-        on Mac OS X
+    \title Developing Qt Applications for Mac OS X
+    \brief Information for developing Qt applications for Mac OS X
     \ingroup platform-specific
 
     \tableofcontents
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 35f1c75..0aff214 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -47,7 +47,10 @@
 /*!
     \page accessible.html
     \title Accessibility
+    \brief How to make your applications accessible to those with disabilities.
+
     \ingroup technology-apis
+    \ingroup best-practices
 
     \tableofcontents
 
diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
index 25c6a43..3dd0e4d 100644
--- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc
+++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc
@@ -42,9 +42,9 @@
 /*!
     \page usingadaptors.html
     \title Using QtDBus Adaptors
-    \ingroup technology-apis
     \brief How to create and use DBus adaptors in Qt.
 
+    \ingroup technology-apis
     \ingroup best-practices
 
     Adaptors are special classes that are attached to any QObject-derived class
diff --git a/doc/src/frameworks-technologies/phonon.qdoc b/doc/src/frameworks-technologies/phonon.qdoc
index 61d7926..61b906e 100644
--- a/doc/src/frameworks-technologies/phonon.qdoc
+++ b/doc/src/frameworks-technologies/phonon.qdoc
@@ -42,7 +42,9 @@
 /*!
     \page phonon-overview.html
     \title Phonon multimedia framework
+    \brief Using the Phonon multimedia framework in Qt.
     \ingroup technology-apis
+    \ingroup best-practices
 
     \tableofcontents
 
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index b73e15d..cedebf9 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -41,15 +41,15 @@
 
 /*!
     \page known-issues.html
-    \title Known Issues in %VERSION%
+    \title Known Issues in this Qt Version
     \ingroup platform-specific
-    \brief A summary of known issues in Qt %VERSION% at the time of release.
+    \brief A summary of known issues in this Qt version at the time of release.
 
-    An up-to-date list of known issues with Qt %VERSION% can be found via the
+    An up-to-date list of known issues can be found at
     \l{http://bugreports.qt.nokia.com/}{Qt Bug Tracker}.
 
-    For a list list of known bugs in Qt %VERSION%, see the \l{Task Tracker}
-    on the Qt website.
+    For a list list of known bugs, see the \l{Task Tracker} at the Qt
+    website.
 
     An overview of known issues may also be found at:
     \l{http://qt.gitorious.org/qt/pages/QtKnownIssues}
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 0b82388..c3c59af 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -117,13 +117,28 @@
 */
 
 /*!
+  \group qt-sql
+  \title Using SQL in Qt
+  \brief Qt API's for using SQL.
+  \ingroup technology-apis
+  \ingroup best-practices
+
+  These pages document Qt's API's for using SQL database systems
+  in Qt applications.
+
+  \generatelist{related}
+*/
+
+/*!
     \group best-practices
     \title How-To's and Best Practices
 
     \brief How-To Guides and Best Practices
 
-    These documents provide guidelines and best practices explaining
-    how to use Qt to solve specific technical problems.
+    These documents provide guidelines and best practices for using Qt
+    to solve specific technical problems. They are listed
+    alphabetically by the first word in the title, so scan the entire
+    list to find what you want.
 
     \generatelist{related}
 */
diff --git a/doc/src/sql-programming/qsqldatatype-table.qdoc b/doc/src/sql-programming/qsqldatatype-table.qdoc
index 398e659..fb5fb49 100644
--- a/doc/src/sql-programming/qsqldatatype-table.qdoc
+++ b/doc/src/sql-programming/qsqldatatype-table.qdoc
@@ -44,7 +44,7 @@
   \title Data Types for Qt-supported Database Systems
   \brief Recommended data types for database systems
   
-  \ingroup best-practices
+  \ingroup qt-sql
 
   \section1 Data Types for Qt Supported Database Systems
 
diff --git a/doc/src/sql-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc
index 6bccd83..f0e4e52 100644
--- a/doc/src/sql-programming/sql-driver.qdoc
+++ b/doc/src/sql-programming/sql-driver.qdoc
@@ -44,7 +44,7 @@
     \title SQL Database Drivers
     \brief How to configure and install QtSql drivers for supported databases.
 
-    \ingroup best-practices
+    \ingroup qt-sql
 
     The QtSql module uses driver \l{How to Create Qt
     Plugins}{plugins} to communicate with the different database
diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc
index f1f3e5e..b34810c 100644
--- a/doc/src/sql-programming/sql-programming.qdoc
+++ b/doc/src/sql-programming/sql-programming.qdoc
@@ -49,6 +49,7 @@
 /*!
     \page sql-programming.html
     \title SQL Programming
+    \ingroup qt-sql
     \nextpage Connecting to Databases
 
     \brief Database integration for Qt applications.
@@ -118,6 +119,7 @@
 /*!
     \page sql-connecting.html
     \title Connecting to Databases
+    \ingroup qt-sql
 
     \contentspage SQL Programming
     \previouspage SQL Programming
@@ -187,6 +189,7 @@
 /*!
     \page sql-sqlstatements.html
     \title Executing SQL Statements
+    \ingroup qt-sql
     
     \previouspage Connecting to Databases
     \contentspage SQL Programming
@@ -337,6 +340,7 @@
 /*!
     \page sql-model.html
     \title Using the SQL Model Classes
+    \ingroup qt-sql
     
     \previouspage Executing SQL Statements
     \contentspage SQL Programming
@@ -483,6 +487,7 @@
 /*!
     \page sql-presenting.html
     \title Presenting Data in a Table View
+    \ingroup qt-sql
     
     \previouspage Using the SQL Model Classes
     \contentspage SQL Programming
@@ -587,6 +592,7 @@
 /*!
     \page sql-forms.html
     \title Creating Data-Aware Forms
+    \ingroup qt-sql
     
     \previouspage Presenting Data in a Table View
     \contentspage SQL Programming
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index b4bec8c..31dfe40 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -47,15 +47,9 @@
 
 /*!
     \page style-reference.html
-    \title Implementing Styles and Style Aware Widgets
+    \title Styles and Style Aware Widgets
     \ingroup qt-gui-concepts
-    \brief An overview of styles and the styling of widgets.
-
-    \ingroup frameworks-technologies
-
-    \previouspage Widget Classes
-    \contentspage Widgets and Layouts
-    \nextpage {Qt Style Sheets}{Style sheets}
+    \brief Styles and the styling of widgets.
 
     Styles (classes that inherit QStyle) draw on behalf of widgets
     and encapsulate the look and feel of a GUI. The QStyle class is
@@ -91,8 +85,6 @@
     current style. This document shows how widgets draw themselves
     and which possibilities the style gives them.
 
-    \tableofcontents
-
     \section1 Classes for Widget Styling
 
     These classes are used to customize an application's appearance and
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index ac0bf77..9fe2d69 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -40,131 +40,121 @@
 ****************************************************************************/
 
 /*!
-    \page widgets-and-layouts.html
-    \title Widgets and Layouts
-    \ingroup qt-gui-concepts
-
-    \ingroup frameworks-technologies
-
-    \nextpage Widget Classes
-
-    The primary elements for designing user interfaces in Qt are widgets and layouts.
-    
-    \section1 Widgets
-
-    \l{Widget Classes}{Widgets} can display data and status information, receive
-    user input, and provide a container for other widgets that should be grouped
-    together. A widget that is not embedded in a parent widget is called a
-    \l{Application Windows and Dialogs}{window}.
-
-    \image parent-child-widgets.png A parent widget containing various child widgets.
-
-    The QWidget class provides the basic capability to render to the screen, and to
-    handle user input events. All UI elements that Qt provides are either subclasses
-    of QWidget, or are used in connection with a QWidget subclass. Creating custom
-    widgets is done by subclassing QWidget or a suitable subclass and reimplementing
-    the virtual event handlers.
-
-    \section1 Layouts
-
-    \l{Layout Management}{Layouts} are an elegant and flexible way to automatically
-    arrange child widgets within their container. Each widget reports its size requirements
-    to the layout through the \l{QWidget::}{sizeHint} and \l{QWidget::}{sizePolicy}
-    properties, and the layout distributes the available space accordingly.
-
-    \table
-    \row    
-    \o \image qgridlayout-with-5-children.png
-    \o \image qformlayout-with-6-children.png
-    \endtable
-
-    \l{Qt Designer Manual}{\QD} is a powerful tool for interactively creating and
-    arranging widgets in layouts.
-
-    \section1 Widget Styles
-
-    \l{Implementing Styles and Style Aware Widgets}{Styles} draw on behalf of widgets
-    and encapsulate the look and feel of a GUI. Qt's built-in widgets use the QStyle
-    class to perform nearly all of their drawing, ensuring that they look exactly like
-    the equivalent native widgets.
+  \page widgets-and-layouts.html
+  \title Widgets and Layouts
+  \ingroup qt-gui-concepts
+  \brief The primary elements for designing user interfaces in Qt.
+
+  \section1 Widgets
+
+  Widgets are the primary elements for creating user interfaces in Qt.
+  \l{Widget Classes}{Widgets} can display data and status information,
+  receive user input, and provide a container for other widgets that
+  should be grouped together. A widget that is not embedded in a
+  parent widget is called a \l{Application Windows and
+  Dialogs}{window}.
+
+  \image parent-child-widgets.png A parent widget containing various child widgets.
+
+  The QWidget class provides the basic capability to render to the
+  screen, and to handle user input events. All UI elements that Qt
+  provides are either subclasses of QWidget, or are used in connection
+  with a QWidget subclass. Creating custom widgets is done by
+  subclassing QWidget or a suitable subclass and reimplementing the
+  virtual event handlers.
+
+  \section1 Layouts
+
+  \l{Layout Management}{Layouts} are an elegant and flexible way to
+  automatically arrange child widgets within their container. Each
+  widget reports its size requirements to the layout through the
+  \l{QWidget::}{sizeHint} and \l{QWidget::}{sizePolicy} properties,
+  and the layout distributes the available space accordingly.
+
+  \table
+  \row    
+  \o \image qgridlayout-with-5-children.png
+  \o \image qformlayout-with-6-children.png
+  \endtable
+
+  \l{Qt Designer Manual}{\QD} is a powerful tool for interactively creating and
+  arranging widgets in layouts.
+
+  \section1 Widget Styles
+
+  \l{Implementing Styles and Style Aware Widgets}{Styles} draw on
+  behalf of widgets and encapsulate the look and feel of a GUI. Qt's
+  built-in widgets use the QStyle class to perform nearly all of their
+  drawing, ensuring that they look exactly like the equivalent native
+  widgets.
     
-    \table
-    \row
-    \o \image windowsxp-tabwidget.png
-    \o \image plastique-tabwidget.png
-    \o \image macintosh-tabwidget.png
-    \endtable
-
-    \l{Qt Style Sheets} are a powerful mechanism that allows you to customize the
-    appearance of widgets, in addition to what is already possible by subclassing QStyle.
-*/
-
-/*!
-    \page widget-classes.html
-    \title Widget Classes
+  \table
+  \row
+  \o \image windowsxp-tabwidget.png
+  \o \image plastique-tabwidget.png
+  \o \image macintosh-tabwidget.png
+  \endtable
 
-    \contentspage Widgets and Layouts
-    \nextpage Layout Management
+  \l{Qt Style Sheets} are a powerful mechanism that allows you to customize the
+  appearance of widgets, in addition to what is already possible by subclassing QStyle.
 
-    Below you find a list of all widget classes in Qt. You can also browse the
-    widget classes Qt provides in the various supported styles in the
-    \l{Qt Widget Gallery}.
+  \section1 The Widget Classes
 
-    \tableofcontents
+  The following sections list the widget classes. See the \l{Qt Widget
+  Gallery} for some examples.
 
-    \section1 Basic Widgets
+  \section2 Basic Widgets
 
-    These basic widgets (controls), such as buttons, comboboxes and scroll bars, are
-    designed for direct use.
+  These basic widgets (controls), e.g. buttons, comboboxes and
+  scroll bars, are designed for direct use.
 
-    \table
-    \row
-    \o \image windows-label.png
-    \o \image windowsvista-pushbutton.png
-    \o \image gtk-progressbar.png
-    \row
-    \o \image plastique-combobox.png
-    \o \image macintosh-radiobutton.png
-    \o \image cde-lineedit.png
-    \endtable
+  \table
+  \row
+  \o \image windows-label.png
+  \o \image windowsvista-pushbutton.png
+  \o \image gtk-progressbar.png
+  \row
+  \o \image plastique-combobox.png
+  \o \image macintosh-radiobutton.png
+  \o \image cde-lineedit.png
+  \endtable
 
-    \annotatedlist basicwidgets
+  \annotatedlist basicwidgets
 
-    \section1 Advanced Widgets
+  \section2 Advanced Widgets
 
-    Advanced GUI widgets such as tab widgets and progress bars provide more
-    complex user interface controls.
+  Advanced GUI widgets, e.g. tab widgets and progress bars, provide
+  more complex user interface controls.
 
-    \table
-    \row
-    \o \image windowsxp-treeview.png
-    \o \image gtk-calendarwidget.png
-    \o \image qundoview.png
-    \endtable
+  \table
+  \row
+  \o \image windowsxp-treeview.png
+  \o \image gtk-calendarwidget.png
+  \o \image qundoview.png
+  \endtable
 
-    \annotatedlist advanced
+  \annotatedlist advanced
 
-    \table
-    \row
-    \o \image windowsvista-tabwidget.png 
-    \o \image macintosh-groupbox.png
-    \endtable
+  \table
+  \row
+  \o \image windowsvista-tabwidget.png 
+  \o \image macintosh-groupbox.png
+  \endtable
 
-    \section1 Organizer Widgets
+  \section2 Organizer Widgets
 
-    Classes like splitters, tab bars, button groups, etc are used to
-    organize and group GUI primitives into more complex applications or
-    dialogs.
+  Classes like splitters, tab bars, button groups, etc are used for
+  organizing and grouping GUI primitives into more complex
+  applications and dialogs.
 
-    \annotatedlist organizers
+  \annotatedlist organizers
 
-    \section1 Abstract Widget Classes
+  \section2 Abstract Widget Classes
 
-    Abstract widget classes usable through subclassing. They are generally
-    not usable in themselves, but provide functionality that can be used
-    by inheriting these classes.
+  The abstract widget classes are base classes. They are not usable as
+  standalone classes but provide functionality when they are subclassed.
 
-    \annotatedlist abstractwidgets
+  \annotatedlist abstractwidgets
 */
 
 /*!
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index b282dab..c1e66d9 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -46,12 +46,11 @@
 
 /*!
     \page application-windows.html
-    \title Application Windows and Dialogs
+    \title Window and Dialog Widgets
+    \brief Windows and Dialogs in Qt.
     \ingroup qt-gui-concepts
     \ingroup frameworks-technologies
 
-    \nextpage The Application Main Window
-
     A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
     Usually, windows have a frame and a title bar, although it is also possible to create
     windows without such decoration using suitable window flags). In Qt, QMainWindow
@@ -165,12 +164,9 @@
 
 /*!
     \page mainwindow.html
-    \title The Application Main Window
-    \brief Everything you need for a typical modern main application window,
-    including menus, toolbars, workspace, etc.
-
-    \contentspage Application Windows and Dialogs
-    \nextpage Dialog Windows
+    \title Application Main Window
+    \ingroup qt-gui-concepts
+    \brief Creating the application window.
 
     \tableofcontents
 
-- 
cgit v0.12


From b8f1d7fd87985375a373ca85052c475241822b03 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig 
Date: Wed, 12 May 2010 16:44:20 +0200
Subject: Optimized pixmapcache key generation for icons and styles

If we sacrifice the readability we can make cache keys much faster.
Since there is rarely a usecase where we need these as human
readable strings we can take advantage of this fact and remove
almost all memory allocations while still keeping them unique.

Task-number: QTBUG-9850
Reviewed-by: brad
---
 src/gui/image/qicon.cpp         | 23 +++++++------
 src/gui/styles/qgtkpainter.cpp  | 16 +++++++--
 src/gui/styles/qstylehelper.cpp | 74 ++++++++++++-----------------------------
 3 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 891b1db..9f1eea2 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -261,16 +261,19 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    QString key = QLatin1String("$qt_icon_")
-                  + QString::number(pm.cacheKey())
-                  + QString::number(pe->mode)
-                  + QString::number(QApplication::palette().cacheKey())
-                  + QLatin1Char('_')
-                  + QString::number(actualSize.width())
-                  + QLatin1Char('_')
-                  + QString::number(actualSize.height())
-                  + QLatin1Char('_');
-
+    int digits = sizeof(qint64)/sizeof(QChar);
+    quint64 tkey = pm.cacheKey(),
+            tmode = pe->mode,
+            tpalkey = QApplication::palette().cacheKey(),
+            twidth = actualSize.width(),
+            theight = actualSize.height();
+
+    QString key = QLatin1Literal("qt_")
+                  % QString::fromRawData((QChar*)&tkey, digits)
+                  % QString::fromRawData((QChar*)&tmode, digits)
+                  % QString::fromRawData((QChar*)&tpalkey, digits)
+                  % QString::fromRawData((QChar*)&twidth, digits)
+                  % QString::fromRawData((QChar*)&theight, digits);
 
     if (mode == QIcon::Active) {
         if (QPixmapCache::find(key + QString::number(mode), pm))
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp
index 1f68f2f..a6686e2 100644
--- a/src/gui/styles/qgtkpainter.cpp
+++ b/src/gui/styles/qgtkpainter.cpp
@@ -154,9 +154,21 @@ QGtkPainter::QGtkPainter(QPainter *_painter)
 static QString uniqueName(const QString &key, GtkStateType state, GtkShadowType shadow,
                           const QSize &size, GtkWidget *widget = 0)
 {
+
+    int digits = sizeof(qint64)/sizeof(QChar);
+    quint64 tstate= state,
+            tshadow = shadow,
+            twidth = size.width(),
+            theight = size.height(),
+            twidget = quint64(widget);
+
     // Note the widget arg should ideally use the widget path, though would compromise performance
-    QString tmp = QString(QLS("%0-%1-%2-%3x%4-%5")).arg(key).arg(uint(state)).arg(shadow)
-                          .arg(size.width()).arg(size.height()).arg(quintptr(widget));
+    QString tmp = key
+                  % QString::fromRawData((QChar*)&tstate, digits)
+                  % QString::fromRawData((QChar*)&tshadow, digits)
+                  % QString::fromRawData((QChar*)&twidth, digits)
+                  % QString::fromRawData((QChar*)&theight, digits)
+                  % QString::fromRawData((QChar*)&twidget, digits);
     return tmp;
 }
 
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index 296c51c..22f2014 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -58,67 +58,35 @@
 
 QT_BEGIN_NAMESPACE
 
-// internal helper. Converts an integer value to an unique string token
-template 
-struct HexString
-{
-    inline HexString(const T t)
-        : val(t)
-    {}
-
-    inline void write(QChar *&dest) const
-    {
-        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-        const char *c = reinterpret_cast(&val);
-        for (uint i = 0; i < sizeof(T); ++i) {
-            *dest++ = hexChars[*c & 0xf];
-            *dest++ = hexChars[(*c & 0xf0) >> 4];
-            ++c;
-        }
-    }
-
-    const T val;
-};
-
-// specialization to enable fast concatenating of our string tokens to a string
-template 
-struct QConcatenable >
-{
-    typedef HexString type;
-    enum { ExactSize = true };
-    static int size(const HexString &str) { return sizeof(str.val) * 2; }
-    static inline void appendTo(const HexString &str, QChar *&out) { str.write(out); }
-};
-
 namespace QStyleHelper {
 
 QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size)
 {
     const QStyleOptionComplex *complexOption = qstyleoption_cast(option);
-
-    QString tmp = key
-                  % QLatin1Char('-')
-                  % HexString(option->state)
-                  % QLatin1Char('-')
-                  % HexString(option->direction)
-                  % QLatin1Char('-')
-                  % HexString(complexOption ? uint(complexOption->activeSubControls) : 0u)
-                  % QLatin1Char('-')
-                  % HexString(option->palette.cacheKey())
-                  % QLatin1Char('-')
-                  % HexString(size.width())
-                  % QLatin1Char('x')
-                  % HexString(size.height());
+    int digits = sizeof(qint64)/sizeof(QChar);
+    quint64 state = option->state,
+            direction = option->direction,
+            subcontrols = (complexOption ? uint(complexOption->activeSubControls) : 0u),
+            palettekey = option->palette.cacheKey(),
+            width = size.width(),
+            height = size.height();
+
+    QString tmp = key % QString::fromRawData((QChar*)&state, digits)
+                      % QString::fromRawData((QChar*)&direction, digits)
+                      % QString::fromRawData((QChar*)&subcontrols, digits)
+                      % QString::fromRawData((QChar*)&palettekey, digits)
+                      % QString::fromRawData((QChar*)&width, digits)
+                      % QString::fromRawData((QChar*)&height, digits);
 
 #ifndef QT_NO_SPINBOX
     if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) {
-        tmp = tmp
-              % QLatin1Char('-')
-              % HexString(spinBox->buttonSymbols)
-              % QLatin1Char('-')
-              % HexString(spinBox->stepEnabled)
-              % QLatin1Char('-')
-              % QLatin1Char(spinBox->frame ? '1' : '0');
+        quint64 buttonsymbols = spinBox->buttonSymbols,
+                stepEnabled = spinBox->stepEnabled,
+                frame = spinBox->frame;
+
+        tmp = tmp % QString::fromRawData((QChar*)&buttonsymbols, digits)
+                  % QString::fromRawData((QChar*)&stepEnabled, digits)
+                  % QString::fromRawData((QChar*)&frame, digits);
     }
 #endif // QT_NO_SPINBOX
     return tmp;
-- 
cgit v0.12


From 9a69656bd64016933124813ea5403e7e5d454719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= 
Date: Fri, 14 May 2010 15:42:43 +0200
Subject: Added workarounds for two MBX/SGX specific GL ES bugs/problems.

The workaround flags are put into the platform independent section
for now, since there might be a general need for these as we expand
our GL and GL ES usage. The workaround_needsFullClearOnEveryFrame flag
covers the case where you get a performance penalty on PowerVR hw
if all rendering buffers are not cleared. The
workaround_brokenFBOReadBack flag covers the case where copying pixels
from a texture (e.g. via glCopyTexSubImage2d()) bound in an FBO doesn't
work.

Task-number: QTBUG-10670
Reviewed-by: Gunnar
---
 .../gl2paintengineex/qtextureglyphcache_gl.cpp       | 18 +++++-------------
 .../gl2paintengineex/qtextureglyphcache_gl_p.h       |  2 --
 src/opengl/qgl.cpp                                   |  3 +++
 src/opengl/qgl.h                                     |  1 +
 src/opengl/qgl_egl.cpp                               | 20 +++++++++++++++++++-
 src/opengl/qgl_p.h                                   |  8 +++++++-
 src/opengl/qglpaintdevice.cpp                        |  5 ++++-
 7 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index 452d37d..cc42c63 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -57,21 +57,13 @@ QGLTextureGlyphCache::QGLTextureGlyphCache(QGLContext *context, QFontEngineGlyph
     , ctx(context)
     , m_width(0)
     , m_height(0)
-    , m_broken_fbo_readback(false)
 {
     // broken FBO readback is a bug in the SGX 1.3 and 1.4 drivers for the N900 where
     // copying between FBO's is broken if the texture is either GL_ALPHA or POT. The
     // workaround is to use a system-memory copy of the glyph cache for this device.
     // Switching to NPOT and GL_RGBA would both cost a lot more graphics memory and
     // be slower, so that is not desireable.
-#if defined QT_OPENGL_ES_2 && !defined(QT_NO_EGL)
-    if (QByteArray((char*) glGetString(GL_RENDERER)).contains("SGX")) {
-        QGLContextPrivate *ctxd = context->d_func();
-        m_broken_fbo_readback = QByteArray((char *) eglQueryString(ctxd->eglContext->display(), EGL_VERSION)).contains("1.3");
-    }
-#endif
-
-    if (!m_broken_fbo_readback)
+    if (!ctx->d_ptr->workaround_brokenFBOReadBack)
         glGenFramebuffers(1, &m_fbo);
 
     connect(QGLSignalProxy::instance(), SIGNAL(aboutToDestroyContext(const QGLContext*)),
@@ -83,7 +75,7 @@ QGLTextureGlyphCache::~QGLTextureGlyphCache()
     if (ctx) {
         QGLShareContextScope scope(ctx);
 
-        if (!m_broken_fbo_readback)
+        if (!ctx->d_ptr->workaround_brokenFBOReadBack)
             glDeleteFramebuffers(1, &m_fbo);
 
         if (m_width || m_height)
@@ -96,7 +88,7 @@ void QGLTextureGlyphCache::createTextureData(int width, int height)
     // create in QImageTextureGlyphCache baseclass is meant to be called
     // only to create the initial image and does not preserve the content,
     // so we don't call when this function is called from resize.
-    if (m_broken_fbo_readback && image().isNull())
+    if (ctx->d_ptr->workaround_brokenFBOReadBack && image().isNull())
         QImageTextureGlyphCache::createTextureData(width, height);
 
     glGenTextures(1, &m_texture);
@@ -126,7 +118,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
     GLuint oldTexture = m_texture;
     createTextureData(width, height);
     
-    if (m_broken_fbo_readback) {
+    if (ctx->d_ptr->workaround_brokenFBOReadBack) {
         QImageTextureGlyphCache::resizeTextureData(width, height);
         Q_ASSERT(image().depth() == 8);
         glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, oldWidth, oldHeight, GL_ALPHA, GL_UNSIGNED_BYTE, image().constBits());
@@ -209,7 +201,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
 
 void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
 {
-    if (m_broken_fbo_readback) {
+    if (ctx->d_ptr->workaround_brokenFBOReadBack) {
         QImageTextureGlyphCache::fillTexture(c, glyph);
 
         glBindTexture(GL_TEXTURE_2D, m_texture);
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index efb7435..6bcd655 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -115,8 +115,6 @@ private:
     int m_height;
 
     QGLShaderProgram *m_program;
-
-    bool m_broken_fbo_readback;
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 7c457de..922a96c 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1612,6 +1612,9 @@ void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format)
     current_fbo = 0;
     default_fbo = 0;
     active_engine = 0;
+    workaround_needsFullClearOnEveryFrame = false;
+    workaround_brokenFBOReadBack = false;
+    workaroundsCached = false;
     for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
         vertexAttributeArraysEnabledState[i] = false;
 }
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 92a064f..f297009 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -431,6 +431,7 @@ private:
     friend class QGLFramebufferObjectPrivate;
     friend class QGLFBOGLPaintDevice;
     friend class QGLPaintDevice;
+    friend class QGLWidgetGLPaintDevice;
     friend class QX11GLPixmapData;
     friend class QX11GLSharedContexts;
 private:
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp
index 0fbbbf9..44e8ae9 100644
--- a/src/opengl/qgl_egl.cpp
+++ b/src/opengl/qgl_egl.cpp
@@ -185,8 +185,26 @@ void QGLContext::makeCurrent()
         return;
     }
 
-    if (d->eglContext->makeCurrent(d->eglSurfaceForDevice()))
+    if (d->eglContext->makeCurrent(d->eglSurfaceForDevice())) {
         QGLContextPrivate::setCurrentContext(this);
+        if (!d->workaroundsCached) {
+            d->workaroundsCached = true;
+            const char *renderer = reinterpret_cast(glGetString(GL_RENDERER));
+            if (strstr(renderer, "SGX") || strstr(renderer, "MBX")) {
+                // PowerVR MBX/SGX chips needs to clear all buffers when starting to render
+                // a new frame, otherwise there will be a performance penalty to pay for
+                // each frame.
+                d->workaround_needsFullClearOnEveryFrame = true;
+
+                // Older PowerVR SGX drivers (like the one in the N900) have a
+                // bug which prevents glCopyTexSubImage2D() to work with a POT
+                // or GL_ALPHA texture bound to an FBO. The only way to
+                // identify that driver is to check the EGL version number for it.
+                if (strstr(eglQueryString(d->eglContext->display(), EGL_VERSION), "1.3"))
+                    d->workaround_brokenFBOReadBack = true;
+            }
+        }
+    }
 }
 
 void QGLContext::doneCurrent()
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index f19e394..d92f963 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -345,7 +345,7 @@ public:
     HDC hbitmap_hdc;
 #endif
 #ifndef QT_NO_EGL
-    bool ownsEglContext;
+    uint ownsEglContext : 1;
     QEglContext *eglContext;
     EGLSurface eglSurface;
     void destroyEglSurfaceForDevice();
@@ -382,6 +382,12 @@ public:
     uint internal_context : 1;
     uint version_flags_cached : 1;
     uint extension_flags_cached : 1;
+
+    // workarounds for driver/hw bugs on different platforms
+    uint workaround_needsFullClearOnEveryFrame : 1;
+    uint workaround_brokenFBOReadBack : 1;
+    uint workaroundsCached : 1;
+
     QPaintDevice *paintDevice;
     QColor transpColor;
     QGLContext *q_ptr;
diff --git a/src/opengl/qglpaintdevice.cpp b/src/opengl/qglpaintdevice.cpp
index e874e85..e1dcbfd 100644
--- a/src/opengl/qglpaintdevice.cpp
+++ b/src/opengl/qglpaintdevice.cpp
@@ -175,7 +175,10 @@ void QGLWidgetGLPaintDevice::beginPaint()
             float alpha = c.alphaF();
             glClearColor(c.redF() * alpha, c.greenF() * alpha, c.blueF() * alpha, alpha);
         }
-        glClear(GL_COLOR_BUFFER_BIT);
+        if (context()->d_func()->workaround_needsFullClearOnEveryFrame)
+            glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        else
+            glClear(GL_COLOR_BUFFER_BIT);
     }
 }
 
-- 
cgit v0.12


From 92ea8a1df59cb00178cd7670d2ce167bba3dd953 Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara 
Date: Fri, 14 May 2010 15:55:48 +0200
Subject: Fix for autotest failure in qwidget::saveRestoreGeometry()

The problem was that the fix for bug QTBUG-10519 introduced a new state
for saving the geometry. However there is an exception and that
exception comes into play when saving a maximized window. This fixes
that by making sure we only enter into that state when the window is not
currently maximized.

Reviewed-by: tbastian
---
 src/gui/kernel/qwidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 82eb12b..1f2cd8c 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -6731,7 +6731,7 @@ QByteArray QWidget::saveGeometry() const
     Q_D(const QWidget);
     QRect newFramePosition = frameGeometry();
     QRect newNormalPosition = normalGeometry();
-    if(d->topData()->wasMaximized) {
+    if(d->topData()->wasMaximized && !(windowState() & Qt::WindowMaximized)) {
         // Change the starting position
         newFramePosition.moveTo(0, 0);
         newNormalPosition.moveTo(0, 0);
-- 
cgit v0.12


From c60045ad8df097ebcb7efa89a5fc18b3a4614df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= 
Date: Fri, 14 May 2010 16:37:48 +0200
Subject: Limit the lower glyph texture cache size to 16x16 in GL.

The SGX chip has a limitation regarding FBOs in that it doesn't support
FBO sizes that are POT and less than 16 pixels in width/height.
Since the FBO we use in the GL glyph cache always mirrors the size
of the texture itself, we limit that instead to avoid creating
invalid FBOs.

Task-number: QTBUG-10645
Reviewed-by: Gunnar
---
 src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index cc42c63..410cf21 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -91,6 +91,12 @@ void QGLTextureGlyphCache::createTextureData(int width, int height)
     if (ctx->d_ptr->workaround_brokenFBOReadBack && image().isNull())
         QImageTextureGlyphCache::createTextureData(width, height);
 
+    // Make the lower glyph texture size 16 x 16.
+    if (width < 16)
+        width = 16;
+    if (height < 16)
+        height = 16;
+
     glGenTextures(1, &m_texture);
     glBindTexture(GL_TEXTURE_2D, m_texture);
 
@@ -115,6 +121,12 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
     int oldWidth = m_width;
     int oldHeight = m_height;
 
+    // Make the lower glyph texture size 16 x 16.
+    if (width < 16)
+        width = 16;
+    if (height < 16)
+        height = 16;
+
     GLuint oldTexture = m_texture;
     createTextureData(width, height);
     
-- 
cgit v0.12


From 336feccaf4517605306844690103baf331f11d50 Mon Sep 17 00:00:00 2001
From: Kai Koehne 
Date: Fri, 14 May 2010 08:24:00 +0200
Subject: Remove skins from qml launcher.

---
 tools/qml/main.cpp       |  21 ----
 tools/qml/qml.pri        |   2 -
 tools/qml/qmlruntime.cpp | 244 +----------------------------------------------
 tools/qml/qmlruntime.h   |   6 --
 4 files changed, 2 insertions(+), 271 deletions(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 116ca71..d1fc118 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -119,9 +119,6 @@ void usage()
     qWarning("  -maximized................................ run maximized");
     qWarning("  -fullscreen............................... run fullscreen");
     qWarning("  -stayontop................................ keep viewer window on top");
-    qWarning("  -skin  ...................... run with a skin window frame");
-    qWarning("                                             \"list\" for a list of built-ins");
-    qWarning("  -resizeview .............................. resize the view, not the skin");
     qWarning("  -sizeviewtorootobject .................... the view resizes to the changes in the content");
     qWarning("  -sizerootobjecttoview .................... the content resizes to the changes in the view");
     qWarning("  -qmlbrowser .............................. use a QML-based file browser");
@@ -209,7 +206,6 @@ int main(int argc, char ** argv)
     QDeclarativeFolderListModel::registerTypes();
 
     bool frameless = false;
-    bool resizeview = false;
     QString fileName;
     double fps = 0;
     int autorecord_from = 0;
@@ -219,7 +215,6 @@ int main(int argc, char ** argv)
     QStringList recordargs;
     QStringList imports;
     QStringList plugins;
-    QString skin;
     QString script;
     QString scriptopts;
     bool runScript = false;
@@ -252,11 +247,6 @@ int main(int argc, char ** argv)
             fullScreen = true;
         } else if (arg == "-stayontop") {
             stayOnTop = true;
-        } else if (arg == "-skin") {
-            if (lastArg) usage();
-            skin = QString(argv[++i]);
-        } else if (arg == "-resizeview") {
-            resizeview = true;
         } else if (arg == "-netcache") {
             if (lastArg) usage();
             cache = QString(argv[++i]).toInt();
@@ -418,21 +408,10 @@ int main(int argc, char ** argv)
     viewer->setNetworkCacheSize(cache);
     viewer->setRecordFile(recordfile);
     viewer->setSizeToView(sizeToView);
-    if (resizeview)
-        viewer->setScaleView();
     if (fps>0)
         viewer->setRecordRate(fps);
     if (autorecord_to)
         viewer->setAutoRecord(autorecord_from,autorecord_to);
-    if (!skin.isEmpty()) {
-        if (skin == "list") {
-            foreach (QString s, viewer->builtinSkins())
-                qWarning() << qPrintable(s);
-            exit(0);
-        } else {
-            viewer->setSkin(skin);
-        }
-    }
     if (devkeys)
         viewer->setDeviceKeys(true);
     viewer->setRecordDither(dither);
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index 3c86d31..a2058c7 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -32,5 +32,3 @@ symbian {
 
 FORMS = $$PWD/recopts.ui \
         $$PWD/proxysettings.ui
-
-include(../shared/deviceskin/deviceskin.pri)
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 16b0ffb..911bf8c 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -53,7 +53,6 @@
 #include "qdeclarative.h"
 #include 
 #include 
-#include "deviceskin.h"
 
 #include 
 #include 
@@ -168,89 +167,6 @@ private:
     QWidget *refWidget;
 };
 
-
-class PreviewDeviceSkin : public DeviceSkin
-{
-    Q_OBJECT
-public:
-    explicit PreviewDeviceSkin(const DeviceSkinParameters ¶meters, QWidget *parent);
-
-    void setPreview(QWidget *formWidget);
-    void setPreviewAndScale(QWidget *formWidget);
-
-    void setScreenSize(const QSize& size)
-    {
-        QMatrix fit;
-        fit = fit.scale(qreal(size.width())/m_screenSize.width(),
-            qreal(size.height())/m_screenSize.height());
-        setTransform(fit);
-        QApplication::syncX();
-    }
-
-    QSize standardScreenSize() const { return m_screenSize; }
-
-    QMenu* menu;
-
-private slots:
-    void slotSkinKeyPressEvent(int code, const QString& text, bool autorep);
-    void slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep);
-    void slotPopupMenu();
-
-private:
-    const QSize m_screenSize;
-};
-
-
-PreviewDeviceSkin::PreviewDeviceSkin(const DeviceSkinParameters ¶meters, QWidget *parent) :
-    DeviceSkin(parameters, parent),
-    m_screenSize(parameters.screenSize())
-{
-    menu = new QMenu(this);
-    connect(this, SIGNAL(skinKeyPressEvent(int,QString,bool)),
-            this, SLOT(slotSkinKeyPressEvent(int,QString,bool)));
-    connect(this, SIGNAL(skinKeyReleaseEvent(int,QString,bool)),
-            this, SLOT(slotSkinKeyReleaseEvent(int,QString,bool)));
-    connect(this, SIGNAL(popupMenu()), this, SLOT(slotPopupMenu()));
-}
-
-void PreviewDeviceSkin::setPreview(QWidget *formWidget)
-{
-    formWidget->setFixedSize(m_screenSize);
-    formWidget->setParent(this, Qt::SubWindow);
-    formWidget->setAutoFillBackground(true);
-    setView(formWidget);
-}
-
-void PreviewDeviceSkin::setPreviewAndScale(QWidget *formWidget)
-{
-    setScreenSize(formWidget->sizeHint());
-    formWidget->setParent(this, Qt::SubWindow);
-    formWidget->setAutoFillBackground(true);
-    setView(formWidget);
-}
-
-void PreviewDeviceSkin::slotSkinKeyPressEvent(int code, const QString& text, bool autorep)
-{
-    if (QWidget *focusWidget =  QApplication::focusWidget()) {
-        QKeyEvent e(QEvent::KeyPress,code,0,text,autorep);
-        QApplication::sendEvent(focusWidget, &e);
-    }
-
-}
-
-void PreviewDeviceSkin::slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep)
-{
-    if (QWidget *focusWidget =  QApplication::focusWidget()) {
-        QKeyEvent e(QEvent::KeyRelease,code,0,text,autorep);
-        QApplication::sendEvent(focusWidget, &e);
-    }
-}
-
-void PreviewDeviceSkin::slotPopupMenu()
-{
-    menu->exec(QCursor::pos());
-}
-
 static struct { const char *name, *args; } ffmpegprofiles[] = {
     {"Maximum Quality", "-sameq"},
     {"High Quality", "-qmax 2"},
@@ -463,7 +379,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags)
 #endif
       , loggerWindow(new LoggerWidget())
-      , frame_stream(0), scaleSkin(true), mb(0)
+      , frame_stream(0), mb(0)
       , portraitOrientation(0), landscapeOrientation(0)
       , showWarningsWindow(0)
       , m_scriptOptions(0)
@@ -475,7 +391,6 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
     setWindowTitle(tr("Qt Qml Runtime"));
 
     devicemode = false;
-    skin = 0;
     canvas = 0;
     record_autotime = 0;
     record_rate = 50;
@@ -653,51 +568,6 @@ void QDeclarativeViewer::createMenu(QMenuBar *menu, QMenu *flatmenu)
 
     if (flatmenu) flatmenu->addSeparator();
 
-    QMenu *skinMenu = flatmenu ? flatmenu->addMenu(tr("&Skin")) : menu->addMenu(tr("&Skin"));
-
-    QActionGroup *skinActions;
-    QAction *skinAction;
-
-    skinActions = new QActionGroup(parent);
-    skinAction = new QAction(tr("Scale skin"), parent);
-    skinAction->setCheckable(true);
-    skinAction->setChecked(scaleSkin);
-    skinActions->addAction(skinAction);
-    skinMenu->addAction(skinAction);
-    connect(skinAction, SIGNAL(triggered()), this, SLOT(setScaleSkin()));
-    skinAction = new QAction(tr("Resize view"), parent);
-    skinAction->setCheckable(true);
-    skinAction->setChecked(!scaleSkin);
-    skinActions->addAction(skinAction);
-    skinMenu->addAction(skinAction);
-    connect(skinAction, SIGNAL(triggered()), this, SLOT(setScaleView()));
-    skinMenu->addSeparator();
-
-    skinActions = new QActionGroup(parent);
-    QSignalMapper *mapper = new QSignalMapper(parent);
-    skinAction = new QAction(tr("None"), parent);
-    skinAction->setCheckable(true);
-    if (currentSkin.isEmpty())
-        skinAction->setChecked(true);
-    skinActions->addAction(skinAction);
-    skinMenu->addAction(skinAction);
-    mapper->setMapping(skinAction, "");
-    connect(skinAction, SIGNAL(triggered()), mapper, SLOT(map()));
-    skinMenu->addSeparator();
-
-    foreach (QString name, builtinSkins()) {
-        skinAction = new QAction(name, parent);
-        skinActions->addAction(skinAction);
-        skinMenu->addAction(skinAction);
-        skinAction->setCheckable(true);
-        if (":skin/"+name+".skin" == currentSkin)
-            skinAction->setChecked(true);
-        mapper->setMapping(skinAction, name);
-        connect(skinAction, SIGNAL(triggered()), mapper, SLOT(map()));
-    }
-    connect(mapper, SIGNAL(mapped(QString)), this, SLOT(setSkin(QString)));
-
-    if (flatmenu) flatmenu->addSeparator();
 #endif // Q_OS_SYMBIAN
 
     QMenu *settingsMenu = flatmenu ? flatmenu : menu->addMenu(tr("S&ettings"));
@@ -813,31 +683,6 @@ void QDeclarativeViewer::warningsWidgetClosed()
     showWarningsWindow->setChecked(false);
 }
 
-void QDeclarativeViewer::setScaleSkin()
-{
-    if (scaleSkin)
-        return;
-    scaleSkin = true;
-    if (skin) {
-        canvas->resize(initialSize);
-        canvas->setFixedSize(initialSize);
-        canvas->setResizeMode(QDeclarativeView::SizeViewToRootObject);
-        updateSizeHints();
-    }
-}
-
-void QDeclarativeViewer::setScaleView()
-{
-    if (!scaleSkin)
-        return;
-    scaleSkin = false;
-    if (skin) {
-        canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView);
-        updateSizeHints();
-    }
-}
-
-
 void QDeclarativeViewer::takeSnapShot()
 {
     static int snapshotcount = 1;
@@ -1091,83 +936,6 @@ void QDeclarativeViewer::startNetwork()
 #endif
 }
 
-QStringList QDeclarativeViewer::builtinSkins() const
-{
-    QDir dir(":/skins/","*.skin");
-    const QFileInfoList l = dir.entryInfoList();
-    QStringList r;
-    for (QFileInfoList::const_iterator it = l.begin(); it != l.end(); ++it) {
-        r += (*it).baseName();
-    }
-    return r;
-}
-
-void QDeclarativeViewer::setSkin(const QString& skinDirOrName)
-{
-    QString skinDirectory = skinDirOrName;
-
-    if (!QDir(skinDirOrName).exists() && QDir(":/skins/"+skinDirOrName+".skin").exists())
-        skinDirectory = ":/skins/"+skinDirOrName+".skin";
-
-    if (currentSkin == skinDirectory)
-        return;
-
-    currentSkin = skinDirectory;
-
-    // XXX QWidget::setMask does not handle changes well, and we may
-    // XXX have been signalled from an item in a menu we're replacing,
-    // XXX hence some rather convoluted resetting here...
-
-    QString err;
-    if (skin) {
-        skin->hide();
-        skin->deleteLater();
-    }
-
-    DeviceSkinParameters parameters;
-    if (!skinDirectory.isEmpty() && parameters.read(skinDirectory,DeviceSkinParameters::ReadAll,&err)) {
-        layout()->setEnabled(false);
-        if (mb)
-            mb->hide();
-        if (!err.isEmpty())
-            qWarning() << err;
-        skin = new PreviewDeviceSkin(parameters,this);
-        if (scaleSkin)
-            skin->setPreviewAndScale(canvas);
-        else
-            skin->setPreview(canvas);
-        createMenu(0,skin->menu);
-        if (scaleSkin) {
-            canvas->setResizeMode(QDeclarativeView::SizeViewToRootObject);
-        }
-        updateSizeHints();
-        skin->show();
-    } else if (skin) {
-        skin = 0;
-        clearMask();
-        if ((windowFlags() & Qt::FramelessWindowHint)) {
-            menuBar()->clear();
-            createMenu(menuBar(),0);
-        }
-        canvas->setParent(this, Qt::SubWindow);
-        setParent(0,windowFlags()); // recreate
-        mb->show();
-        canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView);
-        updateSizeHints();
-
-        layout()->setEnabled(true);
-        if (!scaleSkin) {
-            canvas->resize(initialSize);
-            canvas->setFixedSize(initialSize);
-        }
-        QSize newWindowSize = canvas->size();
-        newWindowSize.setHeight(newWindowSize.height()+menuBarHeight());
-        resize(newWindowSize);
-        show();
-    }
-    canvas->show();
-}
-
 void QDeclarativeViewer::setAutoRecord(int from, int to)
 {
     if (from==0) from=1; // ensure resized
@@ -1496,24 +1264,16 @@ void QDeclarativeViewer::updateSizeHints()
 {
     if (canvas->resizeMode() == QDeclarativeView::SizeViewToRootObject) {
         QSize newWindowSize = canvas->sizeHint();
-        if (!skin)
-            newWindowSize.setHeight(newWindowSize.height()+menuBarHeight());
+        newWindowSize.setHeight(newWindowSize.height()+menuBarHeight());
         if (!isFullScreen() && !isMaximized()) {
             resize(newWindowSize);
             setFixedSize(newWindowSize);
-            if (skin && scaleSkin) {
-                skin->setScreenSize(newWindowSize);
-            }
         }
     } else { // QDeclarativeView::SizeRootObjectToView
         canvas->setMinimumSize(QSize(0,0));
         canvas->setMaximumSize(QSize(16777215,16777215));
         setMinimumSize(QSize(0,0));
         setMaximumSize(QSize(16777215,16777215));
-        if (skin && !scaleSkin) {
-            canvas->setFixedSize(skin->standardScreenSize());
-            skin->setScreenSize(skin->standardScreenSize());
-        }
     }
     updateGeometry();
 }
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index b021d0d..0416b32 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -105,7 +105,6 @@ public:
     void setUseNativeFileBrowser(bool);
     void updateSizeHints();
     void setSizeToView(bool sizeToView);
-    QStringList builtinSkins() const;
 
     QMenuBar *menuBar() const;
 
@@ -123,10 +122,8 @@ public slots:
     void toggleRecording();
     void toggleRecordingWithSelection();
     void ffmpegFinished(int code);
-    void setSkin(const QString& skinDirectory);
     void showProxySettings ();
     void proxySettingsChanged ();
-    void setScaleView();
     void toggleOrientation();
     void statusChanged();
     void setSlowMode(bool);
@@ -143,7 +140,6 @@ private slots:
     void recordFrame();
     void chooseRecordingOptions();
     void pickRecordingFile();
-    void setScaleSkin();
     void setPortrait();
     void setLandscape();
     void startNetwork();
@@ -159,8 +155,6 @@ private:
     int menuBarHeight() const;
 
     LoggerWidget *loggerWindow;
-    PreviewDeviceSkin *skin;
-    QSize skinscreensize;
     QDeclarativeView *canvas;
     QSize initialSize;
     QString currentFileOrUrl;
-- 
cgit v0.12


From 77e1ef8cb41f790115ff7552717e0ba4d33c3cf0 Mon Sep 17 00:00:00 2001
From: Kai Koehne 
Date: Fri, 14 May 2010 13:18:33 +0200
Subject: Rename QML Runtime (executable) to QML Launcher

The qml executable was first referred to as  QML Viewer, then QML Runtime ...
however, the latter one caused much confusion (see old version of
qmlruntime.qdoc).

Doc changes reviewed by Leena Miettinen.
---
 .gitignore                                         |  1 -
 doc/src/declarative/qmlruntime.qdoc                | 47 +++++++++++-----------
 doc/src/snippets/declarative/gridview/gridview.qml |  2 +-
 .../snippets/declarative/listview/highlight.qml    |  2 +-
 doc/src/snippets/declarative/listview/listview.qml |  2 +-
 examples/declarative/listview/highlight.qml        |  2 +-
 src/declarative/QmlChanges.txt                     |  5 +++
 tools/qdoc3/test/macros.qdocconf                   |  1 +
 tools/qml/content/Browser.qml                      |  6 +--
 tools/qml/main.cpp                                 | 14 +++----
 tools/qml/qml.pro                                  |  2 +-
 tools/qml/qmlruntime.cpp                           | 12 +++---
 12 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad8e3ea..5707371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ bin/Qt*.dll
 bin/assistant*
 bin/designer*
 bin/dumpcpp*
-bin/duiviewer*
 bin/idc*
 bin/linguist*
 bin/lrelease*
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc
index 10aeac0..b105df4 100644
--- a/doc/src/declarative/qmlruntime.qdoc
+++ b/doc/src/declarative/qmlruntime.qdoc
@@ -46,15 +46,14 @@
     \ingroup qttools
 
     This page documents the \e{Declarative UI Runtime} for the Qt GUI
-    toolkit, and the \c qml executable which can be used to run apps
-    written for the runtime. The \c qml executable reads a declarative user interface definition
-    (\c .qml) file and displays the user interface it describes.
+    toolkit, and the \QQL which can be used to run apps
+    written for the runtime. The \QQL reads a declarative
+    user interface definition (\c .qml) file and displays the user interface it describes.
 
-    QML is a runtime, as you can run plain qml files which pull in their required modules.
+    QML is a runtime, as you can run plain QML files which pull in their required modules.
     To run apps with the QML runtime, you can either start the runtime
-    from your own application (using a QDeclarativeView) or with the simple \c qml application.
-    The \c qml application can be
-    installed in a production environment, assuming that it is not already
+    from your own application (using a QDeclarativeView) or with the simple \QQL.
+    The launcher can be installed in a production environment, assuming that it is not already
     present in the system. It is generally packaged alongside Qt.
 
     To deploy an application using the QML runtime, you have two options:
@@ -62,18 +61,18 @@
     \list
     \o Write your own Qt application including a QDeclarative view and deploy it the same as
     any other Qt application (not discussed further on this page), or
-    \o Write a main QML file for your application, and run your application using the included \c qml tool.
+    \o Write a main QML file for your application, and run your application using the included \QQL.
     \endlist
 
-    To run an application with the \c qml tool, pass the filename as an argument:
+    To run an application with the \QQL, pass the filename as an argument:
 
     \code
     qml myQmlFile.qml
     \endcode
 
-    Deploying a QML application via the \c qml executable allows for QML only deployments, but can also
+    Deploying a QML application via the \QQL allows for QML only deployments, but can also
     include custom C++ modules just as easily. Below is an example of how you might structure
-    a complex application deployed via the qml runtime, it is a listing of the files that would
+    a complex application deployed via the QML runtime, it is a listing of the files that would
     be included in the deployment package.
 
     \code
@@ -94,7 +93,7 @@
     modules must contain a QDeclarativeExtentionPlugin subclass.
 
     The application would be executed either with your own application, the command 'qml MyApp.qml' or by 
-    opening the qml file if your system has the \c qml executable registered as the handler for qml files. The MyApp.qml file would have access
+    opening the  file if your system has the \QQL registered as the handler for QML files. The MyApp.qml file would have access
     to all of the deployed types using the import statements such as the following:
 
     \code
@@ -102,19 +101,19 @@
     import "OtherModule" 1.0 as Other
     \endcode
 
-    \section1 \c qml application functionality
-    The \c qml application implements some additional functionality to help it serve the role of a launcher
-    for myriad applications. If you implement your own launcher application, you may also wish to reimplement
+    \section1 Qt QML Launcher functionality
+    The \QQL implements some additional functionality to help it supporting
+    myriad applications. If you implement your own application, you may also wish to reimplement
     some or all of this functionality. However, much of this functionality is intended to aid the prototyping of
-    qml applications and may not be necessary for a deployed application.
+    QML applications and may not be necessary for a deployed application.
 
     \section2 Options
 
-    When run with the \c -help option, qml shows available options.
+    When run with the \c -help option, \c qml shows available options.
 
     \section2 Translations
 
-    When the runtime loads an initial QML file, it will install a translation file from
+    When the launcher loads an initial QML file, it will install a translation file from
     a "i18n" subdirectory relative to that initial QML file. The actual translation file
     loaded will be according to the system locale and have the form
     "qml_.qm", where  is a two-letter ISO 639 language,
@@ -126,12 +125,12 @@
     See the \l{scripting.html#internationalization}{Qt Internationalization} documentation for information about how to make
     the JavaScript in QML files use translatable strings.
 
-    Additionally, the QML runtime will load translation files specified on the
+    Additionally, the launcher will load translation files specified on the
     command line via the \c -translation option.
 
     \section2 Dummy Data
 
-    The secondary use of the qml runtime is to allow QML files to be viewed with
+    The secondary use of the launcher is to allow QML files to be viewed with
     dummy data. This is useful when prototyping the UI, as the dummy data can
     be later replaced with actual data and bindings from a C++ plugin. 
     To provide dummy data: create a directory called "dummydata" in the same directory as
@@ -153,13 +152,13 @@
 
     \section2 Runtime Object
 
-    All applications using the qmlruntime will have access to the 'runtime'
+    All applications using the launcher will have access to the 'runtime'
     property on the root context. This property contains several pieces of
     information about the runtime environment of the application.
 
     \section3 Screen Orientation
 
-    A special piece of dummy data which is integrated into the runtime is
+    A special piece of dummy data which is integrated into the launcher is
     a simple orientation property. The orientation can be set via the
     settings menu in the application, or by pressing Ctrl+T to toggle it.
 
@@ -173,13 +172,13 @@
     }
     \endcode
 
-    This allows your application to respond to the orientation of the screen changing. The runtime
+    This allows your application to respond to the orientation of the screen changing. The launcher
     will automatically update this on some platforms (currently the N900 only) to match the physical
     screen's orientation. On other plaforms orientation changes will only happen when explictly asked for.
 
     \section3 Window Active
 
-    The runtime.isActiveWindow property tells whether the main window of the qml runtime is currently active
+    The runtime.isActiveWindow property tells whether the main window of the launcher is currently active
     or not. This is especially useful for embedded devices when you want to pause parts of your application,
     including animations, when your application loses focus or goes to the background.
 
diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml
index 1d3df97..cf345aa 100644
--- a/doc/src/snippets/declarative/gridview/gridview.qml
+++ b/doc/src/snippets/declarative/gridview/gridview.qml
@@ -4,7 +4,7 @@ import Qt 4.7
 Rectangle {
     width: 240; height: 180; color: "white"
     // ContactModel model is defined in dummydata/ContactModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
+    // The launcher automatically loads files in dummydata/* to assist
     // development without a real data source.
 
     // Define a delegate component.  A component will be
diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml
index 794b3f2..1282f8d 100644
--- a/doc/src/snippets/declarative/listview/highlight.qml
+++ b/doc/src/snippets/declarative/listview/highlight.qml
@@ -4,7 +4,7 @@ Rectangle {
     width: 180; height: 200; color: "white"
 
     // ContactModel model is defined in dummydata/ContactModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
+    // The launcher automatically loads files in dummydata/* to assist
     // development without a real data source.
 
     // Define a delegate component.  A component will be
diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml
index 61bf126..44f0540 100644
--- a/doc/src/snippets/declarative/listview/listview.qml
+++ b/doc/src/snippets/declarative/listview/listview.qml
@@ -5,7 +5,7 @@ Rectangle {
     width: 180; height: 200; color: "white"
 
     // ContactModel model is defined in dummydata/ContactModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
+    // The launcher automatically loads files in dummydata/* to assist
     // development without a real data source.
 
     // Define a delegate component.  A component will be
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml
index 50ba2f7..ade355d 100644
--- a/examples/declarative/listview/highlight.qml
+++ b/examples/declarative/listview/highlight.qml
@@ -4,7 +4,7 @@ Rectangle {
     width: 400; height: 300
 
     // MyPets model is defined in dummydata/MyPetsModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
+    // The launcher automatically loads files in dummydata/* to assist
     // development without a real data source.
     // This one contains my pets.
 
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 604c14c..ec8f508 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -18,6 +18,11 @@ C++ API
 QDeclarativeExpression::value() has been renamed to
 QDeclarativeExpression::evaluate()
 
+QML Launcher
+------------
+The standalone executable has been renamed to qml launcher. Runtime warnings
+can be now accessed via the menu (Debugging->Show Warnings).
+
 =============================================================================
 The changes below are pre Qt 4.7.0 beta 1
 
diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf
index 22db23e..e7a1dbc 100644
--- a/tools/qdoc3/test/macros.qdocconf
+++ b/tools/qdoc3/test/macros.qdocconf
@@ -18,6 +18,7 @@ macro.ouml.HTML         = "ö"
 macro.QA                = "\\e{Qt Assistant}"
 macro.QD                = "\\e{Qt Designer}"
 macro.QL                = "\\e{Qt Linguist}"
+macro.QQL               = "\\e{Qt QML Launcher}"
 macro.param             = "\\e"
 macro.raisedaster.HTML  = "*"
 macro.rarrow.HTML       = "→"
diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index 0912f58..c3a2cc0 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -12,12 +12,12 @@ Rectangle {
     FolderListModel {
         id: folders1
         nameFilters: [ "*.qml" ]
-        folder: qmlViewerFolder
+        folder: qmlLauncherFolder
     }
     FolderListModel {
         id: folders2
         nameFilters: [ "*.qml" ]
-        folder: qmlViewerFolder
+        folder: qmlLauncherFolder
     }
 
     SystemPalette { id: palette }
@@ -62,7 +62,7 @@ Rectangle {
                 if (folders.isFolder(index)) {
                     down(filePath);
                 } else {
-                    qmlViewer.launch(filePath);
+                    qmlLauncher.launch(filePath);
                 }
             }
             width: root.width
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index d1fc118..380f5cc 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -86,7 +86,7 @@ QString warnings;
 void showWarnings()
 {
     if (!warnings.isEmpty()) {
-        QMessageBox::warning(0, QApplication::tr("Qt Declarative UI Runtime"), warnings);
+        QMessageBox::warning(0, QApplication::tr("Qt QML Launcher"), warnings);
     }
 }
 
@@ -118,7 +118,7 @@ void usage()
     qWarning("  -frameless ............................... run with no window frame");
     qWarning("  -maximized................................ run maximized");
     qWarning("  -fullscreen............................... run fullscreen");
-    qWarning("  -stayontop................................ keep viewer window on top");
+    qWarning("  -stayontop................................ keep launcher window on top");
     qWarning("  -sizeviewtorootobject .................... the view resizes to the changes in the content");
     qWarning("  -sizerootobjecttoview .................... the content resizes to the changes in the view");
     qWarning("  -qmlbrowser .............................. use a QML-based file browser");
@@ -157,9 +157,9 @@ void scriptOptsUsage()
     qWarning("  testerror ................................ test 'error' property of root item on playback");
     qWarning("  snapshot ................................. file being recorded is static,");
     qWarning("                                             only one frame will be recorded or tested");
-    qWarning("  exitoncomplete ........................... cleanly exit the viewer on script completion");
-    qWarning("  exitonfailure ............................ immediately exit the viewer on script failure");
-    qWarning("  saveonexit ............................... save recording on viewer exit");
+    qWarning("  exitoncomplete ........................... cleanly exit the launcher on script completion");
+    qWarning("  exitonfailure ............................ immediately exit the launcher on script failure");
+    qWarning("  saveonexit ............................... save recording on launcher exit");
     qWarning(" ");
     qWarning(" One of record, play or both must be specified.");
     exit(1);
@@ -197,7 +197,7 @@ int main(int argc, char ** argv)
 #endif
 
     QApplication app(argc, argv);
-    app.setApplicationName("QtQmlRuntime");
+    app.setApplicationName("QtQmlLauncher");
     app.setOrganizationName("Nokia");
     app.setOrganizationDomain("nokia.com");
 
@@ -275,7 +275,7 @@ int main(int argc, char ** argv)
             if (lastArg) usage();
             app.setStartDragDistance(QString(argv[++i]).toInt());
         } else if (arg == QLatin1String("-v") || arg == QLatin1String("-version")) {
-            qWarning("Qt Qml Runtime version %s", QT_VERSION_STR);
+            qWarning("Qt QML Launcher version %s", QT_VERSION_STR);
             exit(0);
         } else if (arg == "-translation") {
             if (lastArg) usage();
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 77a9533..847ed3a 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -37,5 +37,5 @@ symbian {
 }
 mac {
     QMAKE_INFO_PLIST=Info_mac.plist
-    TARGET=Qml
+    TARGET="QML Launcher"
 }
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 911bf8c..9700090 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -350,7 +350,7 @@ QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
     setupProxy(manager);
     if (cacheSize > 0) {
         QNetworkDiskCache *cache = new QNetworkDiskCache;
-        cache->setCacheDirectory(QDir::tempPath()+QLatin1String("/qml-duiviewer-network-cache"));
+        cache->setCacheDirectory(QDir::tempPath()+QLatin1String("/qml-launcher-network-cache"));
         cache->setMaximumCacheSize(cacheSize);
         manager->setCache(cache);
     } else {
@@ -388,7 +388,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
       , translator(0)
 {
     QDeclarativeViewer::registerTypes();
-    setWindowTitle(tr("Qt Qml Runtime"));
+    setWindowTitle(tr("Qt QML Launcher"));
 
     devicemode = false;
     canvas = 0;
@@ -887,7 +887,7 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
         url = QUrl::fromLocalFile(fi.absoluteFilePath());
     else
         url = QUrl(file_or_url);
-    setWindowTitle(tr("%1 - Qt Qml Runtime").arg(file_or_url));
+    setWindowTitle(tr("%1 - Qt QML Launcher").arg(file_or_url));
 
     if (!m_script.isEmpty())
         tester = new QDeclarativeTester(m_script, m_scriptOptions, canvas);
@@ -895,11 +895,11 @@ bool QDeclarativeViewer::open(const QString& file_or_url)
     delete canvas->rootObject();
     canvas->engine()->clearComponentCache();
     QDeclarativeContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("qmlViewer", this);
+    ctxt->setContextProperty("qmlLauncher", this);
 #ifdef Q_OS_SYMBIAN
-    ctxt->setContextProperty("qmlViewerFolder", "E:\\"); // Documents on your S60 phone
+    ctxt->setContextProperty("qmlLauncherFolder", "E:\\"); // Documents on your S60 phone
 #else
-    ctxt->setContextProperty("qmlViewerFolder", QDir::currentPath());
+    ctxt->setContextProperty("qmlLauncherFolder", QDir::currentPath());
 #endif
 
     ctxt->setContextProperty("runtime", Runtime::instance());
-- 
cgit v0.12


From 1f5ae3138ea4c436fe04d2c882d6debac5b061b8 Mon Sep 17 00:00:00 2001
From: Kai Koehne 
Date: Fri, 14 May 2010 16:24:27 +0200
Subject: Add new logo for QML Launcher (Mac OS X)

---
 tools/qml/Info_mac.plist |   2 ++
 tools/qml/qml.icns       | Bin 0 -> 196156 bytes
 tools/qml/qml.pro        |   1 +
 3 files changed, 3 insertions(+)
 create mode 100644 tools/qml/qml.icns

diff --git a/tools/qml/Info_mac.plist b/tools/qml/Info_mac.plist
index ce4ebe3..80ca6a3 100644
--- a/tools/qml/Info_mac.plist
+++ b/tools/qml/Info_mac.plist
@@ -2,6 +2,8 @@
 
 
 
+	CFBundleIconFile
+	@ICON@
 	CFBundleIdentifier
 	com.nokia.qt.qml
 	CFBundlePackageType
diff --git a/tools/qml/qml.icns b/tools/qml/qml.icns
new file mode 100644
index 0000000..c760516
Binary files /dev/null and b/tools/qml/qml.icns differ
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 847ed3a..6129639 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -38,4 +38,5 @@ symbian {
 mac {
     QMAKE_INFO_PLIST=Info_mac.plist
     TARGET="QML Launcher"
+    ICON=qml.icns
 }
-- 
cgit v0.12


From f00a96efb66303a453f984e60a41120200b2c0c3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Tue, 11 May 2010 14:57:02 +0200
Subject: QtDeclarative doesn't use QtXml, so don't link to it or require
 others to

---
 src/declarative/declarative.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 4287e25..8037a16 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,13 +1,13 @@
 TARGET     = QtDeclarative
 QPRO_PWD   = $$PWD
-QT         = core gui xml script network
+QT         = core gui script network
 contains(QT_CONFIG, svg): QT += svg
 contains(QT_CONFIG, opengl): QT += opengl
 DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
 
-unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml
+unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
 
 exists("qdeclarative_enable_gcov") {
     QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
-- 
cgit v0.12


From 25484ef9b55f0a017163a05228bb9b6b0e7a772d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= 
Date: Fri, 14 May 2010 18:04:39 +0200
Subject: More 4.7 stuff.

---
 dist/changes-4.7.0 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 47992f9..1e3a69c 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -67,6 +67,9 @@ QtGui
       functions, and replaced them with setCopyCount(), copyCount() and
       supportsMultipleCopies().
 
+ - QPrintDialog/QPrinter
+    * Added support for printing the current page.
+
  - QCommonStyle
     * Fixed a bug that led to missing text pixels in QTabBar when using
       small font sizes. (QTBUG-7137)
-- 
cgit v0.12


From 3849cd0cca618fac88a54861a3ec30780711ce75 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 14 May 2010 18:34:03 +0200
Subject: Update the dependencies in src.pro because we don't have a good
 buildsystem

QtXml is not required by QtSvg, QtWebKit or QtDeclarative. And
QtDeclarative doesn't link to QtWebKit anymore (imports do). But it
does link to QtOpenGL.
---
 src/src.pro | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/src.pro b/src/src.pro
index 9c4831c..3ceeb9c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -94,7 +94,7 @@ src_declarative.target = sub-declarative
    src_xml.depends = src_corelib
    src_xmlpatterns.depends = src_corelib src_network
    src_dbus.depends = src_corelib src_xml
-   src_svg.depends = src_xml src_gui
+   src_svg.depends = src_corelib src_gui
    src_script.depends = src_corelib
    src_scripttools.depends = src_script src_gui src_network
    src_network.depends = src_corelib
@@ -110,15 +110,14 @@ src_declarative.target = sub-declarative
    contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl
    src_mediaservices.depends = src_multimedia
    src_tools_activeqt.depends = src_tools_idc src_gui
-   src_declarative.depends = src_xml src_gui src_script src_network src_svg
+   src_declarative.depends = src_gui src_script src_network
    src_plugins.depends = src_gui src_sql src_svg src_multimedia
    src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    src_imports.depends = src_gui src_declarative
    contains(QT_CONFIG, webkit)  {
-      src_webkit.depends = src_gui src_sql src_network src_xml 
+      src_webkit.depends = src_gui src_sql src_network
       contains(QT_CONFIG, mediaservices):src_webkit.depends += src_mediaservices
       contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns
-      contains(QT_CONFIG, declarative):src_declarative.depends += src_webkit
       src_imports.depends += src_webkit
       exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): src_webkit.depends += src_javascriptcore
    }
@@ -127,7 +126,18 @@ src_declarative.target = sub-declarative
       src_plugins.depends += src_dbus
       src_phonon.depends +=  src_dbus
    }
-   contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
+   contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
+      src_plugins.depends += src_opengl
+      src_declarative.depends += src_opengl
+      src_webkit.depends += src_opengl
+   }
+   contains(QT_CONFIG, xmlpatterns) {
+      src_declarative.depends += src_xmlpatterns
+      src_webkit.depends += src_xmlpatterns
+   }
+   contains(QT_CONFIG, svg) {
+      src_declarative.depends += src_svg
+   }
 }
 
 
-- 
cgit v0.12


From c8d2e18c4b431870560f324a17f20904bb47ae68 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig 
Date: Fri, 14 May 2010 18:43:20 +0200
Subject: More improvements to pixmap cache key generation

HexString is actually more optimal than fromRawData since we dont
need any allocations while using it. Arguably the code is also
a bit nicer.

Task-number: QTBUG-9850
Reviewed-by: ogoffart
---
 src/gui/image/qicon.cpp         | 26 ++++++++++----------------
 src/gui/styles/qgtkpainter.cpp  | 19 ++++++-------------
 src/gui/styles/qstylehelper.cpp | 30 +++++++++---------------------
 src/gui/styles/qstylehelper_p.h | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 9f1eea2..7696632 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -55,6 +55,7 @@
 #include "qcache.h"
 #include "qdebug.h"
 #include "private/qguiplatformplugin_p.h"
+#include "private/qstylehelper_p.h"
 
 #ifdef Q_WS_MAC
 #include 
@@ -261,24 +262,17 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    int digits = sizeof(qint64)/sizeof(QChar);
-    quint64 tkey = pm.cacheKey(),
-            tmode = pe->mode,
-            tpalkey = QApplication::palette().cacheKey(),
-            twidth = actualSize.width(),
-            theight = actualSize.height();
-
     QString key = QLatin1Literal("qt_")
-                  % QString::fromRawData((QChar*)&tkey, digits)
-                  % QString::fromRawData((QChar*)&tmode, digits)
-                  % QString::fromRawData((QChar*)&tpalkey, digits)
-                  % QString::fromRawData((QChar*)&twidth, digits)
-                  % QString::fromRawData((QChar*)&theight, digits);
+                  % HexString(pm.cacheKey())
+                  % HexString(pe->mode)
+                  % HexString(QApplication::palette().cacheKey())
+                  % HexString(actualSize.width())
+                  % HexString(actualSize.height());
 
     if (mode == QIcon::Active) {
-        if (QPixmapCache::find(key + QString::number(mode), pm))
+        if (QPixmapCache::find(key % HexString(mode), pm))
             return pm; // horray
-        if (QPixmapCache::find(key + QString::number(QIcon::Normal), pm)) {
+        if (QPixmapCache::find(key % HexString(QIcon::Normal), pm)) {
             QStyleOption opt(0);
             opt.palette = QApplication::palette();
             QPixmap active = QApplication::style()->generatedIconPixmap(QIcon::Active, pm, &opt);
@@ -287,7 +281,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
         }
     }
 
-    if (!QPixmapCache::find(key + QString::number(mode), pm)) {
+    if (!QPixmapCache::find(key % HexString(mode), pm)) {
         if (pm.size() != actualSize)
             pm = pm.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         if (pe->mode != mode && mode != QIcon::Normal) {
@@ -297,7 +291,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
             if (!generated.isNull())
                 pm = generated;
         }
-        QPixmapCache::insert(key + QString::number(mode), pm);
+        QPixmapCache::insert(key % HexString(mode), pm);
     }
     return pm;
 }
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp
index a6686e2..79c53e9 100644
--- a/src/gui/styles/qgtkpainter.cpp
+++ b/src/gui/styles/qgtkpainter.cpp
@@ -47,6 +47,7 @@
 // This class is primarily a wrapper around the gtk painter functions
 // and takes care of converting all such calls into cached Qt pixmaps.
 
+#include 
 #include 
 #include 
 #include 
@@ -154,21 +155,13 @@ QGtkPainter::QGtkPainter(QPainter *_painter)
 static QString uniqueName(const QString &key, GtkStateType state, GtkShadowType shadow,
                           const QSize &size, GtkWidget *widget = 0)
 {
-
-    int digits = sizeof(qint64)/sizeof(QChar);
-    quint64 tstate= state,
-            tshadow = shadow,
-            twidth = size.width(),
-            theight = size.height(),
-            twidget = quint64(widget);
-
     // Note the widget arg should ideally use the widget path, though would compromise performance
     QString tmp = key
-                  % QString::fromRawData((QChar*)&tstate, digits)
-                  % QString::fromRawData((QChar*)&tshadow, digits)
-                  % QString::fromRawData((QChar*)&twidth, digits)
-                  % QString::fromRawData((QChar*)&theight, digits)
-                  % QString::fromRawData((QChar*)&twidget, digits);
+                  % HexString(state)
+                  % HexString(shadow)
+                  % HexString(size.width())
+                  % HexString(size.height())
+                  % HexString(quint64(widget));
     return tmp;
 }
 
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index 22f2014..d09d7fa 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -63,30 +63,18 @@ namespace QStyleHelper {
 QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size)
 {
     const QStyleOptionComplex *complexOption = qstyleoption_cast(option);
-    int digits = sizeof(qint64)/sizeof(QChar);
-    quint64 state = option->state,
-            direction = option->direction,
-            subcontrols = (complexOption ? uint(complexOption->activeSubControls) : 0u),
-            palettekey = option->palette.cacheKey(),
-            width = size.width(),
-            height = size.height();
-
-    QString tmp = key % QString::fromRawData((QChar*)&state, digits)
-                      % QString::fromRawData((QChar*)&direction, digits)
-                      % QString::fromRawData((QChar*)&subcontrols, digits)
-                      % QString::fromRawData((QChar*)&palettekey, digits)
-                      % QString::fromRawData((QChar*)&width, digits)
-                      % QString::fromRawData((QChar*)&height, digits);
+    QString tmp = key % HexString(option->state)
+                      % HexString(option->direction)
+                      % HexString(complexOption ? uint(complexOption->activeSubControls) : 0u)
+                      % HexString(option->palette.cacheKey())
+                      % HexString(size.width())
+                      % HexString(size.height());
 
 #ifndef QT_NO_SPINBOX
     if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) {
-        quint64 buttonsymbols = spinBox->buttonSymbols,
-                stepEnabled = spinBox->stepEnabled,
-                frame = spinBox->frame;
-
-        tmp = tmp % QString::fromRawData((QChar*)&buttonsymbols, digits)
-                  % QString::fromRawData((QChar*)&stepEnabled, digits)
-                  % QString::fromRawData((QChar*)&frame, digits);
+        tmp = tmp % HexString(spinBox->buttonSymbols)
+                  % HexString(spinBox->stepEnabled)
+                  % QLatin1Char(spinBox->frame ? '1' : '0'); ;
     }
 #endif // QT_NO_SPINBOX
     return tmp;
diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h
index 31cc4ed..555ad60 100644
--- a/src/gui/styles/qstylehelper_p.h
+++ b/src/gui/styles/qstylehelper_p.h
@@ -41,6 +41,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #ifndef QSTYLEHELPER_P_H
@@ -79,6 +80,37 @@ namespace QStyleHelper
                      int bottom = 0);
 }
 
+// internal helper. Converts an integer value to an unique string token
+template 
+        struct HexString
+{
+    inline HexString(const T t)
+        : val(t)
+    {}
+
+    inline void write(QChar *&dest) const
+    {
+        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+        const char *c = reinterpret_cast(&val);
+        for (uint i = 0; i < sizeof(T); ++i) {
+            *dest++ = hexChars[*c & 0xf];
+            *dest++ = hexChars[(*c & 0xf0) >> 4];
+            ++c;
+        }
+    }
+    const T val;
+};
+
+// specialization to enable fast concatenating of our string tokens to a string
+template 
+        struct QConcatenable >
+{
+    typedef HexString type;
+    enum { ExactSize = true };
+    static int size(const HexString &str) { return sizeof(str.val) * 2; }
+    static inline void appendTo(const HexString &str, QChar *&out) { str.write(out); }
+};
+
 QT_END_NAMESPACE
 
 #endif // QSTYLEHELPER_P_H
-- 
cgit v0.12


From 77ddabd7fdf0c8ba2e15951e83abbcce18270285 Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Fri, 14 May 2010 20:06:15 +0200
Subject: Revert "Optimize QPixmapIconEngine's pixmap() function"

This reverts commit ad6dafee9be288bcef6b2c4b318b234d2995abff.

This is replaced by commit c8d2e18c4b431870560f324a17f20904bb47ae68
---
 src/gui/image/qicon.cpp | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 5ef0ff9..891b1db 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -261,28 +261,21 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    struct {
-        quint64 pmc;
-        qint32  w;
-        qint32  h;
-        quint64 pac;
-        qint32  m;     // Make struct size a multiple of 4, for safety's sake
-    } dill;
-
-    dill.pmc = pm.cacheKey();
-    dill.w = actualSize.width();
-    dill.h = actualSize.height();
-    dill.pac = QApplication::palette().cacheKey();
-    dill.m = pe->mode;
-
-    QString keyBase = QLatin1String("$qt_icon_")
-                      + QString::fromRawData((QChar *)&dill, sizeof(dill)/sizeof(QChar));
-    QString key = keyBase + QString::number(mode, 16);
+    QString key = QLatin1String("$qt_icon_")
+                  + QString::number(pm.cacheKey())
+                  + QString::number(pe->mode)
+                  + QString::number(QApplication::palette().cacheKey())
+                  + QLatin1Char('_')
+                  + QString::number(actualSize.width())
+                  + QLatin1Char('_')
+                  + QString::number(actualSize.height())
+                  + QLatin1Char('_');
+
 
     if (mode == QIcon::Active) {
-        if (QPixmapCache::find(key, pm))
+        if (QPixmapCache::find(key + QString::number(mode), pm))
             return pm; // horray
-        if (QPixmapCache::find(keyBase + QString::number(QIcon::Normal, 16), pm)) {
+        if (QPixmapCache::find(key + QString::number(QIcon::Normal), pm)) {
             QStyleOption opt(0);
             opt.palette = QApplication::palette();
             QPixmap active = QApplication::style()->generatedIconPixmap(QIcon::Active, pm, &opt);
@@ -291,7 +284,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
         }
     }
 
-    if (!QPixmapCache::find(key, pm)) {
+    if (!QPixmapCache::find(key + QString::number(mode), pm)) {
         if (pm.size() != actualSize)
             pm = pm.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         if (pe->mode != mode && mode != QIcon::Normal) {
@@ -301,7 +294,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
             if (!generated.isNull())
                 pm = generated;
         }
-        QPixmapCache::insert(key, pm);
+        QPixmapCache::insert(key + QString::number(mode), pm);
     }
     return pm;
 }
-- 
cgit v0.12


From b0f4dab4c825650c3a7a72b87508bf6f3e5ffd50 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 14 May 2010 23:47:37 +0200
Subject: Revert "More improvements to pixmap cache key generation"

This reverts commit c8d2e18c4b431870560f324a17f20904bb47ae68.
---
 src/gui/image/qicon.cpp         | 26 ++++++++++++++++----------
 src/gui/styles/qgtkpainter.cpp  | 19 +++++++++++++------
 src/gui/styles/qstylehelper.cpp | 30 +++++++++++++++++++++---------
 src/gui/styles/qstylehelper_p.h | 32 --------------------------------
 4 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 7696632..9f1eea2 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -55,7 +55,6 @@
 #include "qcache.h"
 #include "qdebug.h"
 #include "private/qguiplatformplugin_p.h"
-#include "private/qstylehelper_p.h"
 
 #ifdef Q_WS_MAC
 #include 
@@ -262,17 +261,24 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
+    int digits = sizeof(qint64)/sizeof(QChar);
+    quint64 tkey = pm.cacheKey(),
+            tmode = pe->mode,
+            tpalkey = QApplication::palette().cacheKey(),
+            twidth = actualSize.width(),
+            theight = actualSize.height();
+
     QString key = QLatin1Literal("qt_")
-                  % HexString(pm.cacheKey())
-                  % HexString(pe->mode)
-                  % HexString(QApplication::palette().cacheKey())
-                  % HexString(actualSize.width())
-                  % HexString(actualSize.height());
+                  % QString::fromRawData((QChar*)&tkey, digits)
+                  % QString::fromRawData((QChar*)&tmode, digits)
+                  % QString::fromRawData((QChar*)&tpalkey, digits)
+                  % QString::fromRawData((QChar*)&twidth, digits)
+                  % QString::fromRawData((QChar*)&theight, digits);
 
     if (mode == QIcon::Active) {
-        if (QPixmapCache::find(key % HexString(mode), pm))
+        if (QPixmapCache::find(key + QString::number(mode), pm))
             return pm; // horray
-        if (QPixmapCache::find(key % HexString(QIcon::Normal), pm)) {
+        if (QPixmapCache::find(key + QString::number(QIcon::Normal), pm)) {
             QStyleOption opt(0);
             opt.palette = QApplication::palette();
             QPixmap active = QApplication::style()->generatedIconPixmap(QIcon::Active, pm, &opt);
@@ -281,7 +287,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
         }
     }
 
-    if (!QPixmapCache::find(key % HexString(mode), pm)) {
+    if (!QPixmapCache::find(key + QString::number(mode), pm)) {
         if (pm.size() != actualSize)
             pm = pm.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         if (pe->mode != mode && mode != QIcon::Normal) {
@@ -291,7 +297,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
             if (!generated.isNull())
                 pm = generated;
         }
-        QPixmapCache::insert(key % HexString(mode), pm);
+        QPixmapCache::insert(key + QString::number(mode), pm);
     }
     return pm;
 }
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp
index 79c53e9..a6686e2 100644
--- a/src/gui/styles/qgtkpainter.cpp
+++ b/src/gui/styles/qgtkpainter.cpp
@@ -47,7 +47,6 @@
 // This class is primarily a wrapper around the gtk painter functions
 // and takes care of converting all such calls into cached Qt pixmaps.
 
-#include 
 #include 
 #include 
 #include 
@@ -155,13 +154,21 @@ QGtkPainter::QGtkPainter(QPainter *_painter)
 static QString uniqueName(const QString &key, GtkStateType state, GtkShadowType shadow,
                           const QSize &size, GtkWidget *widget = 0)
 {
+
+    int digits = sizeof(qint64)/sizeof(QChar);
+    quint64 tstate= state,
+            tshadow = shadow,
+            twidth = size.width(),
+            theight = size.height(),
+            twidget = quint64(widget);
+
     // Note the widget arg should ideally use the widget path, though would compromise performance
     QString tmp = key
-                  % HexString(state)
-                  % HexString(shadow)
-                  % HexString(size.width())
-                  % HexString(size.height())
-                  % HexString(quint64(widget));
+                  % QString::fromRawData((QChar*)&tstate, digits)
+                  % QString::fromRawData((QChar*)&tshadow, digits)
+                  % QString::fromRawData((QChar*)&twidth, digits)
+                  % QString::fromRawData((QChar*)&theight, digits)
+                  % QString::fromRawData((QChar*)&twidget, digits);
     return tmp;
 }
 
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index d09d7fa..22f2014 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -63,18 +63,30 @@ namespace QStyleHelper {
 QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size)
 {
     const QStyleOptionComplex *complexOption = qstyleoption_cast(option);
-    QString tmp = key % HexString(option->state)
-                      % HexString(option->direction)
-                      % HexString(complexOption ? uint(complexOption->activeSubControls) : 0u)
-                      % HexString(option->palette.cacheKey())
-                      % HexString(size.width())
-                      % HexString(size.height());
+    int digits = sizeof(qint64)/sizeof(QChar);
+    quint64 state = option->state,
+            direction = option->direction,
+            subcontrols = (complexOption ? uint(complexOption->activeSubControls) : 0u),
+            palettekey = option->palette.cacheKey(),
+            width = size.width(),
+            height = size.height();
+
+    QString tmp = key % QString::fromRawData((QChar*)&state, digits)
+                      % QString::fromRawData((QChar*)&direction, digits)
+                      % QString::fromRawData((QChar*)&subcontrols, digits)
+                      % QString::fromRawData((QChar*)&palettekey, digits)
+                      % QString::fromRawData((QChar*)&width, digits)
+                      % QString::fromRawData((QChar*)&height, digits);
 
 #ifndef QT_NO_SPINBOX
     if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) {
-        tmp = tmp % HexString(spinBox->buttonSymbols)
-                  % HexString(spinBox->stepEnabled)
-                  % QLatin1Char(spinBox->frame ? '1' : '0'); ;
+        quint64 buttonsymbols = spinBox->buttonSymbols,
+                stepEnabled = spinBox->stepEnabled,
+                frame = spinBox->frame;
+
+        tmp = tmp % QString::fromRawData((QChar*)&buttonsymbols, digits)
+                  % QString::fromRawData((QChar*)&stepEnabled, digits)
+                  % QString::fromRawData((QChar*)&frame, digits);
     }
 #endif // QT_NO_SPINBOX
     return tmp;
diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h
index 555ad60..31cc4ed 100644
--- a/src/gui/styles/qstylehelper_p.h
+++ b/src/gui/styles/qstylehelper_p.h
@@ -41,7 +41,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #ifndef QSTYLEHELPER_P_H
@@ -80,37 +79,6 @@ namespace QStyleHelper
                      int bottom = 0);
 }
 
-// internal helper. Converts an integer value to an unique string token
-template 
-        struct HexString
-{
-    inline HexString(const T t)
-        : val(t)
-    {}
-
-    inline void write(QChar *&dest) const
-    {
-        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-        const char *c = reinterpret_cast(&val);
-        for (uint i = 0; i < sizeof(T); ++i) {
-            *dest++ = hexChars[*c & 0xf];
-            *dest++ = hexChars[(*c & 0xf0) >> 4];
-            ++c;
-        }
-    }
-    const T val;
-};
-
-// specialization to enable fast concatenating of our string tokens to a string
-template 
-        struct QConcatenable >
-{
-    typedef HexString type;
-    enum { ExactSize = true };
-    static int size(const HexString &str) { return sizeof(str.val) * 2; }
-    static inline void appendTo(const HexString &str, QChar *&out) { str.write(out); }
-};
-
 QT_END_NAMESPACE
 
 #endif // QSTYLEHELPER_P_H
-- 
cgit v0.12


From b1749e9052c68dff6089bf5f0d2a41cd88dfcb50 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Sat, 15 May 2010 11:39:26 +0200
Subject: Revert "Optimized pixmapcache key generation for icons and styles"

This reverts commit b8f1d7fd87985375a373ca85052c475241822b03.
---
 src/gui/image/qicon.cpp         | 23 ++++++-------
 src/gui/styles/qgtkpainter.cpp  | 16 ++-------
 src/gui/styles/qstylehelper.cpp | 74 +++++++++++++++++++++++++++++------------
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 9f1eea2..891b1db 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -261,19 +261,16 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    int digits = sizeof(qint64)/sizeof(QChar);
-    quint64 tkey = pm.cacheKey(),
-            tmode = pe->mode,
-            tpalkey = QApplication::palette().cacheKey(),
-            twidth = actualSize.width(),
-            theight = actualSize.height();
-
-    QString key = QLatin1Literal("qt_")
-                  % QString::fromRawData((QChar*)&tkey, digits)
-                  % QString::fromRawData((QChar*)&tmode, digits)
-                  % QString::fromRawData((QChar*)&tpalkey, digits)
-                  % QString::fromRawData((QChar*)&twidth, digits)
-                  % QString::fromRawData((QChar*)&theight, digits);
+    QString key = QLatin1String("$qt_icon_")
+                  + QString::number(pm.cacheKey())
+                  + QString::number(pe->mode)
+                  + QString::number(QApplication::palette().cacheKey())
+                  + QLatin1Char('_')
+                  + QString::number(actualSize.width())
+                  + QLatin1Char('_')
+                  + QString::number(actualSize.height())
+                  + QLatin1Char('_');
+
 
     if (mode == QIcon::Active) {
         if (QPixmapCache::find(key + QString::number(mode), pm))
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp
index a6686e2..1f68f2f 100644
--- a/src/gui/styles/qgtkpainter.cpp
+++ b/src/gui/styles/qgtkpainter.cpp
@@ -154,21 +154,9 @@ QGtkPainter::QGtkPainter(QPainter *_painter)
 static QString uniqueName(const QString &key, GtkStateType state, GtkShadowType shadow,
                           const QSize &size, GtkWidget *widget = 0)
 {
-
-    int digits = sizeof(qint64)/sizeof(QChar);
-    quint64 tstate= state,
-            tshadow = shadow,
-            twidth = size.width(),
-            theight = size.height(),
-            twidget = quint64(widget);
-
     // Note the widget arg should ideally use the widget path, though would compromise performance
-    QString tmp = key
-                  % QString::fromRawData((QChar*)&tstate, digits)
-                  % QString::fromRawData((QChar*)&tshadow, digits)
-                  % QString::fromRawData((QChar*)&twidth, digits)
-                  % QString::fromRawData((QChar*)&theight, digits)
-                  % QString::fromRawData((QChar*)&twidget, digits);
+    QString tmp = QString(QLS("%0-%1-%2-%3x%4-%5")).arg(key).arg(uint(state)).arg(shadow)
+                          .arg(size.width()).arg(size.height()).arg(quintptr(widget));
     return tmp;
 }
 
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index 22f2014..296c51c 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -58,35 +58,67 @@
 
 QT_BEGIN_NAMESPACE
 
+// internal helper. Converts an integer value to an unique string token
+template 
+struct HexString
+{
+    inline HexString(const T t)
+        : val(t)
+    {}
+
+    inline void write(QChar *&dest) const
+    {
+        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+        const char *c = reinterpret_cast(&val);
+        for (uint i = 0; i < sizeof(T); ++i) {
+            *dest++ = hexChars[*c & 0xf];
+            *dest++ = hexChars[(*c & 0xf0) >> 4];
+            ++c;
+        }
+    }
+
+    const T val;
+};
+
+// specialization to enable fast concatenating of our string tokens to a string
+template 
+struct QConcatenable >
+{
+    typedef HexString type;
+    enum { ExactSize = true };
+    static int size(const HexString &str) { return sizeof(str.val) * 2; }
+    static inline void appendTo(const HexString &str, QChar *&out) { str.write(out); }
+};
+
 namespace QStyleHelper {
 
 QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size)
 {
     const QStyleOptionComplex *complexOption = qstyleoption_cast(option);
-    int digits = sizeof(qint64)/sizeof(QChar);
-    quint64 state = option->state,
-            direction = option->direction,
-            subcontrols = (complexOption ? uint(complexOption->activeSubControls) : 0u),
-            palettekey = option->palette.cacheKey(),
-            width = size.width(),
-            height = size.height();
-
-    QString tmp = key % QString::fromRawData((QChar*)&state, digits)
-                      % QString::fromRawData((QChar*)&direction, digits)
-                      % QString::fromRawData((QChar*)&subcontrols, digits)
-                      % QString::fromRawData((QChar*)&palettekey, digits)
-                      % QString::fromRawData((QChar*)&width, digits)
-                      % QString::fromRawData((QChar*)&height, digits);
+
+    QString tmp = key
+                  % QLatin1Char('-')
+                  % HexString(option->state)
+                  % QLatin1Char('-')
+                  % HexString(option->direction)
+                  % QLatin1Char('-')
+                  % HexString(complexOption ? uint(complexOption->activeSubControls) : 0u)
+                  % QLatin1Char('-')
+                  % HexString(option->palette.cacheKey())
+                  % QLatin1Char('-')
+                  % HexString(size.width())
+                  % QLatin1Char('x')
+                  % HexString(size.height());
 
 #ifndef QT_NO_SPINBOX
     if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) {
-        quint64 buttonsymbols = spinBox->buttonSymbols,
-                stepEnabled = spinBox->stepEnabled,
-                frame = spinBox->frame;
-
-        tmp = tmp % QString::fromRawData((QChar*)&buttonsymbols, digits)
-                  % QString::fromRawData((QChar*)&stepEnabled, digits)
-                  % QString::fromRawData((QChar*)&frame, digits);
+        tmp = tmp
+              % QLatin1Char('-')
+              % HexString(spinBox->buttonSymbols)
+              % QLatin1Char('-')
+              % HexString(spinBox->stepEnabled)
+              % QLatin1Char('-')
+              % QLatin1Char(spinBox->frame ? '1' : '0');
     }
 #endif // QT_NO_SPINBOX
     return tmp;
-- 
cgit v0.12


From fea180d80112faa1a314e240ab07c37e4c2e0d1d Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Wed, 5 May 2010 17:04:31 +0200
Subject: Autotest: some improvements to timeout testing of tst_QTcpSocket

---
 tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index cd512a1..d195d3c 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -144,6 +144,7 @@ private slots:
     void blockingIMAP();
     void nonBlockingIMAP();
     void hostNotFound();
+    void timeoutConnect_data();
     void timeoutConnect();
     void delayedClose();
     void partialRead();
@@ -544,19 +545,36 @@ void tst_QTcpSocket::hostNotFound()
 }
 
 //----------------------------------------------------------------------------------
+void tst_QTcpSocket::timeoutConnect_data()
+{
+    QTest::addColumn("address");
+    QTest::newRow("host") << QtNetworkSettings::serverName();
+    QTest::newRow("ip") << QtNetworkSettings::serverIP();
+}
 
 void tst_QTcpSocket::timeoutConnect()
 {
+    QFETCH(QString, address);
     QTcpSocket *socket = newSocket();
 
-    // Outgoing port 53 is firewalled in the Oslo office.
-    socket->connectToHost("cisco.com", 53);
+    QElapsedTimer timer;
+    timer.start();
+
+    // Port 1357 is configured to drop packets on the test server
+    socket->connectToHost(address, 1357);
+    QVERIFY(timer.elapsed() < 50);
     QVERIFY(!socket->waitForConnected(200));
     QCOMPARE(socket->state(), QTcpSocket::UnconnectedState);
     QCOMPARE(int(socket->error()), int(QTcpSocket::SocketTimeoutError));
 
-    socket->connectToHost("cisco.com", 53);
-    QTest::qSleep(50);
+    timer.start();
+    socket->connectToHost(address, 1357);
+    QVERIFY(timer.elapsed() < 50);
+    QTimer::singleShot(50, &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::enterLoop(5);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+    QVERIFY(socket->state() == QTcpSocket::ConnectingState
+            || socket->state() == QTcpSocket::HostLookupState);
     socket->abort();
     QCOMPARE(socket->state(), QTcpSocket::UnconnectedState);
     QCOMPARE(socket->openMode(), QIODevice::NotOpen);
-- 
cgit v0.12


From f8788e4202e51fb36b3dcb4a80c83e16ff389150 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Sat, 15 May 2010 18:36:56 +0200
Subject: Fix building of tst_QTcpSocket

---
 tests/auto/qtcpsocket/tst_qtcpsocket.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index d195d3c..31cae40 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -549,7 +549,7 @@ void tst_QTcpSocket::timeoutConnect_data()
 {
     QTest::addColumn("address");
     QTest::newRow("host") << QtNetworkSettings::serverName();
-    QTest::newRow("ip") << QtNetworkSettings::serverIP();
+    QTest::newRow("ip") << QtNetworkSettings::serverIP().toString();
 }
 
 void tst_QTcpSocket::timeoutConnect()
@@ -571,7 +571,7 @@ void tst_QTcpSocket::timeoutConnect()
     socket->connectToHost(address, 1357);
     QVERIFY(timer.elapsed() < 50);
     QTimer::singleShot(50, &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::enterLoop(5);
+    QTestEventLoop::instance().enterLoop(5);
     QVERIFY(!QTestEventLoop::instance().timeout());
     QVERIFY(socket->state() == QTcpSocket::ConnectingState
             || socket->state() == QTcpSocket::HostLookupState);
-- 
cgit v0.12


From 2e3d004ba736f5c77614feeaf3594217217bd29e Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Sat, 15 May 2010 23:53:16 +0200
Subject: tst_bic: Fix building on Mac 64

---
 tests/auto/bic/tst_bic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 010965c..400fcc1 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -191,7 +191,7 @@ void tst_Bic::sizesAndVTables_data()
 #elif defined Q_OS_MAC && defined(__i386__)
 #  define FILESUFFIX "macx-gcc-ia32"
 #elif defined Q_OS_MAC && defined(__amd64__)
-#  define FILESUFFIX "macx-gcc-amd64";
+#  define FILESUFFIX "macx-gcc-amd64"
 #elif defined Q_OS_WIN && defined Q_CC_GNU
 #  define FILESUFFIX "win32-gcc-ia32"
 #else
-- 
cgit v0.12


From e9a59ff4f650d878fd79fed1f605f3f4e9120d35 Mon Sep 17 00:00:00 2001
From: Thiago Macieira 
Date: Fri, 14 May 2010 19:04:40 +0200
Subject: Use case-insensitive comparison for the "data" scheme in URLs

---
 src/gui/text/qtextdocument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index afba678..c7a9756 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1947,7 +1947,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
 #endif
 
     // handle data: URLs
-    if (r.isNull() && name.scheme() == QLatin1String("data"))
+    if (r.isNull() && name.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0)
         r = qDecodeDataUrl(name).second;
 
     // if resource was not loaded try to load it here
-- 
cgit v0.12

-- 
cgit v0.12


From 792a06a6c1475a96bc756b72a8d85212742afa72 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Fri, 14 May 2010 09:54:52 +1000
Subject: Doc fix

---
 src/declarative/graphicsitems/qdeclarativeimage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 88e8520..fe642e0 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE
     An Image element displays a specified \l source image:
 
     \table
+    \row
     \o
     \image declarative-qtlogo.png
     \o
-- 
cgit v0.12


From 0aca20bf669ef7e7702ee96d0d0676392cfd1b72 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Fri, 14 May 2010 11:26:54 +1000
Subject: graphicsWidgets doc example was previously removed

---
 tests/auto/declarative/examples/tst_examples.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 3759cb5..1044035 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -80,7 +80,6 @@ tst_examples::tst_examples()
 
 
     // Add directories you want excluded here
-    excludedDirs << "doc/src/snippets/declarative/graphicswidgets";
 
 #ifdef QT_NO_WEBKIT
     excludedDirs << "examples/declarative/webview";
-- 
cgit v0.12


From 82d0b03c4f81c2832975d548917c03dbaddeee72 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Fri, 14 May 2010 11:32:57 +1000
Subject: Restructure the examples. They are now organized into various
 subdirectories to make it easier to locate examples for certain features
 (e.g. animation) and to distinguish between different types of examples (e.g.
 very basic examples vs complex demo-like examples).

---
 doc/src/declarative/example-slideswitch.qdoc       |  20 +-
 doc/src/declarative/examples.qdoc                  | 123 ++-
 doc/src/declarative/extending-examples.qdoc        |  50 +-
 doc/src/declarative/extending.qdoc                 |  46 +-
 doc/src/declarative/globalobject.qdoc              |   2 +-
 doc/src/declarative/integrating.qdoc               |   2 +-
 doc/src/examples/qml-examples.qdoc                 | 184 +++--
 doc/src/snippets/declarative/border-image.qml      |  29 -
 doc/src/snippets/declarative/borderimage.qml       |  29 +
 .../declarative/animation/animation.qmlproject     |  16 +
 .../declarative/animation/basics/basics.qmlproject |  16 +
 .../animation/basics/color-animation.qml           |  70 ++
 .../animation/basics/images/face-smile.png         | Bin 0 -> 15408 bytes
 .../declarative/animation/basics/images/moon.png   | Bin 0 -> 2433 bytes
 .../declarative/animation/basics/images/shadow.png | Bin 0 -> 425 bytes
 .../declarative/animation/basics/images/star.png   | Bin 0 -> 349 bytes
 .../declarative/animation/basics/images/sun.png    | Bin 0 -> 8153 bytes
 .../animation/basics/property-animation.qml        |  63 ++
 .../declarative/animation/behaviors/SideRect.qml   |  22 +
 .../animation/behaviors/behavior-example.qml       |  79 ++
 .../animation/behaviors/behaviors.qmlproject       |  16 +
 examples/declarative/animation/easing/easing.qml   | 105 +++
 .../declarative/animation/easing/easing.qmlproject |  16 +
 examples/declarative/animation/states/states.qml   |  61 ++
 .../declarative/animation/states/states.qmlproject |  16 +
 .../declarative/animation/states/transitions.qml   |  90 +++
 examples/declarative/animation/states/user.png     | Bin 0 -> 4886 bytes
 .../declarative/animations/animations.qmlproject   |  16 -
 .../declarative/animations/color-animation.qml     |  70 --
 examples/declarative/animations/easing.qml         | 105 ---
 .../declarative/animations/images/face-smile.png   | Bin 15408 -> 0 bytes
 examples/declarative/animations/images/moon.png    | Bin 2433 -> 0 bytes
 examples/declarative/animations/images/shadow.png  | Bin 425 -> 0 bytes
 examples/declarative/animations/images/star.png    | Bin 349 -> 0 bytes
 examples/declarative/animations/images/sun.png     | Bin 8153 -> 0 bytes
 .../declarative/animations/property-animation.qml  |  63 --
 .../declarative/aspectratio/aspectratio.qmlproject |  16 -
 examples/declarative/aspectratio/face_fit.qml      |  26 -
 .../declarative/aspectratio/face_fit_animated.qml  |  28 -
 examples/declarative/aspectratio/pics/face.png     | Bin 15408 -> 0 bytes
 .../declarative/aspectratio/scale_and_crop.qml     |  21 -
 .../aspectratio/scale_and_crop_simple.qml          |  20 -
 .../declarative/aspectratio/scale_and_sidecrop.qml |  22 -
 examples/declarative/aspectratio/scale_to_fit.qml  |  22 -
 .../aspectratio/scale_to_fit_simple.qml            |  20 -
 examples/declarative/behaviors/SideRect.qml        |  22 -
 .../declarative/behaviors/behavior-example.qml     |  79 --
 .../declarative/behaviors/behaviors.qmlproject     |  16 -
 examples/declarative/border-image/border-image.qml |  57 --
 .../border-image/border-image.qmlproject           |  16 -
 .../border-image/content/MyBorderImage.qml         |  50 --
 .../border-image/content/ShadowRectangle.qml       |  14 -
 examples/declarative/border-image/content/bw.png   | Bin 1357 -> 0 bytes
 .../border-image/content/colors-round.sci          |   7 -
 .../border-image/content/colors-stretch.sci        |   5 -
 .../declarative/border-image/content/colors.png    | Bin 1655 -> 0 bytes
 .../declarative/border-image/content/shadow.png    | Bin 588 -> 0 bytes
 examples/declarative/border-image/shadows.qml      |  24 -
 examples/declarative/clocks/clocks.qml             |  14 -
 examples/declarative/clocks/clocks.qmlproject      |  16 -
 examples/declarative/clocks/content/Clock.qml      |  83 --
 examples/declarative/clocks/content/background.png | Bin 46895 -> 0 bytes
 examples/declarative/clocks/content/center.png     | Bin 765 -> 0 bytes
 .../declarative/clocks/content/clock-night.png     | Bin 23359 -> 0 bytes
 examples/declarative/clocks/content/clock.png      | Bin 20653 -> 0 bytes
 examples/declarative/clocks/content/hour.png       | Bin 625 -> 0 bytes
 examples/declarative/clocks/content/minute.png     | Bin 625 -> 0 bytes
 examples/declarative/clocks/content/second.png     | Bin 303 -> 0 bytes
 .../connections/connections-example.qml            |  37 -
 .../declarative/connections/connections.qmlproject |  16 -
 .../declarative/connections/content/Button.qml     |  12 -
 examples/declarative/connections/content/bg1.jpg   | Bin 23771 -> 0 bytes
 .../connections/content/rotate-left.png            | Bin 3061 -> 0 bytes
 .../connections/content/rotate-right.png           | Bin 3115 -> 0 bytes
 .../declarative/cppextensions/cppextensions.pro    |  10 +
 .../cppextensions/cppextensions.qmlproject         |  16 +
 .../imageprovider/ImageProviderCore/qmldir         |   2 +
 .../imageprovider/imageprovider-example.qml        |  25 +
 .../cppextensions/imageprovider/imageprovider.cpp  | 118 +++
 .../cppextensions/imageprovider/imageprovider.pro  |  25 +
 .../imageprovider/imageprovider.qmlproject         |  16 +
 examples/declarative/cppextensions/plugins/README  |   9 +
 .../plugins/com/nokia/TimeExample/Clock.qml        |  50 ++
 .../plugins/com/nokia/TimeExample/center.png       | Bin 0 -> 765 bytes
 .../plugins/com/nokia/TimeExample/clock.png        | Bin 0 -> 20653 bytes
 .../plugins/com/nokia/TimeExample/hour.png         | Bin 0 -> 625 bytes
 .../plugins/com/nokia/TimeExample/minute.png       | Bin 0 -> 625 bytes
 .../plugins/com/nokia/TimeExample/qmldir           |   2 +
 .../declarative/cppextensions/plugins/plugin.cpp   | 152 ++++
 .../declarative/cppextensions/plugins/plugins.pro  |  31 +
 .../declarative/cppextensions/plugins/plugins.qml  |  11 +
 .../cppextensions/plugins/plugins.qmlproject       |  16 +
 .../declarative/cppextensions/proxyviewer/main.cpp | 109 +++
 .../cppextensions/proxyviewer/proxyviewer.pro      |   9 +
 .../cppextensions/proxyviewer/proxyviewer.qrc      |   5 +
 .../declarative/cppextensions/proxyviewer/view.qml |   7 +
 .../cppextensions/proxywidgets/ProxyWidgets/qmldir |   1 +
 .../declarative/cppextensions/proxywidgets/README  |   4 +
 .../cppextensions/proxywidgets/proxywidgets.cpp    |  97 +++
 .../cppextensions/proxywidgets/proxywidgets.pro    |  21 +
 .../cppextensions/proxywidgets/proxywidgets.qml    |  70 ++
 .../proxywidgets/proxywidgets.qmlproject           |  16 +
 .../graphicsLayouts/graphicslayouts.cpp            | 366 +++++++++
 .../graphicsLayouts/graphicslayouts.pro            |  13 +
 .../graphicsLayouts/graphicslayouts.qml            |  77 ++
 .../graphicsLayouts/graphicslayouts.qrc            |   5 +
 .../graphicsLayouts/graphicslayouts_p.h            | 303 +++++++
 .../qgraphicslayouts/graphicsLayouts/main.cpp      |  60 ++
 .../qgraphicslayouts/layoutItem/layoutItem.pro     |  13 +
 .../qgraphicslayouts/layoutItem/layoutItem.qml     |  15 +
 .../qgraphicslayouts/layoutItem/layoutItem.qrc     |   5 +
 .../qgraphicslayouts/layoutItem/main.cpp           |  73 ++
 .../qgraphicslayouts/qgraphicslayouts.qmlproject   |  16 +
 .../referenceexamples/adding/adding.pro            |  15 +
 .../referenceexamples/adding/adding.qrc            |   5 +
 .../referenceexamples/adding/example.qml           |   8 +
 .../referenceexamples/adding/main.cpp              |  65 ++
 .../referenceexamples/adding/person.cpp            |  69 ++
 .../referenceexamples/adding/person.h              |  66 ++
 .../referenceexamples/attached/attached.pro        |  17 +
 .../referenceexamples/attached/attached.qrc        |   5 +
 .../referenceexamples/attached/birthdayparty.cpp   |  92 +++
 .../referenceexamples/attached/birthdayparty.h     |  87 +++
 .../referenceexamples/attached/example.qml         |  31 +
 .../referenceexamples/attached/main.cpp            |  91 +++
 .../referenceexamples/attached/person.cpp          | 119 +++
 .../referenceexamples/attached/person.h            | 106 +++
 .../referenceexamples/binding/binding.pro          |  19 +
 .../referenceexamples/binding/binding.qrc          |   5 +
 .../referenceexamples/binding/birthdayparty.cpp    | 114 +++
 .../referenceexamples/binding/birthdayparty.h      | 103 +++
 .../referenceexamples/binding/example.qml          |  37 +
 .../binding/happybirthdaysong.cpp                  |  86 ++
 .../referenceexamples/binding/happybirthdaysong.h  |  75 ++
 .../referenceexamples/binding/main.cpp             |  93 +++
 .../referenceexamples/binding/person.cpp           | 139 ++++
 .../referenceexamples/binding/person.h             | 114 +++
 .../referenceexamples/coercion/birthdayparty.cpp   |  72 ++
 .../referenceexamples/coercion/birthdayparty.h     |  70 ++
 .../referenceexamples/coercion/coercion.pro        |  17 +
 .../referenceexamples/coercion/coercion.qrc        |   5 +
 .../referenceexamples/coercion/example.qml         |  15 +
 .../referenceexamples/coercion/main.cpp            |  78 ++
 .../referenceexamples/coercion/person.cpp          |  80 ++
 .../referenceexamples/coercion/person.h            |  83 ++
 .../referenceexamples/default/birthdayparty.cpp    |  72 ++
 .../referenceexamples/default/birthdayparty.h      |  71 ++
 .../referenceexamples/default/default.pro          |  17 +
 .../referenceexamples/default/default.qrc          |   5 +
 .../referenceexamples/default/example.qml          |  14 +
 .../referenceexamples/default/main.cpp             |  76 ++
 .../referenceexamples/default/person.cpp           |  79 ++
 .../referenceexamples/default/person.h             |  78 ++
 .../referenceexamples/extended/example.qml         |   7 +
 .../referenceexamples/extended/extended.pro        |  15 +
 .../referenceexamples/extended/extended.qrc        |   5 +
 .../referenceexamples/extended/lineedit.cpp        | 105 +++
 .../referenceexamples/extended/lineedit.h          |  74 ++
 .../referenceexamples/extended/main.cpp            |  65 ++
 .../referenceexamples/grouped/birthdayparty.cpp    |  72 ++
 .../referenceexamples/grouped/birthdayparty.h      |  70 ++
 .../referenceexamples/grouped/example.qml          |  33 +
 .../referenceexamples/grouped/grouped.pro          |  17 +
 .../referenceexamples/grouped/grouped.qrc          |   5 +
 .../referenceexamples/grouped/main.cpp             |  86 ++
 .../referenceexamples/grouped/person.cpp           | 119 +++
 .../referenceexamples/grouped/person.h             | 108 +++
 .../referenceexamples/properties/birthdayparty.cpp |  74 ++
 .../referenceexamples/properties/birthdayparty.h   |  76 ++
 .../referenceexamples/properties/example.qml       |  15 +
 .../referenceexamples/properties/main.cpp          |  69 ++
 .../referenceexamples/properties/person.cpp        |  67 ++
 .../referenceexamples/properties/person.h          |  64 ++
 .../referenceexamples/properties/properties.pro    |  18 +
 .../referenceexamples/properties/properties.qrc    |   5 +
 .../referenceexamples/referenceexamples.pro        |  13 +
 .../referenceexamples/referenceexamples.qmlproject |  16 +
 .../referenceexamples/signal/birthdayparty.cpp     |  99 +++
 .../referenceexamples/signal/birthdayparty.h       |  93 +++
 .../referenceexamples/signal/example.qml           |  32 +
 .../referenceexamples/signal/main.cpp              |  92 +++
 .../referenceexamples/signal/person.cpp            | 119 +++
 .../referenceexamples/signal/person.h              | 106 +++
 .../referenceexamples/signal/signal.pro            |  17 +
 .../referenceexamples/signal/signal.qrc            |   5 +
 .../valuesource/birthdayparty.cpp                  | 109 +++
 .../referenceexamples/valuesource/birthdayparty.h  |  98 +++
 .../referenceexamples/valuesource/example.qml      |  36 +
 .../valuesource/happybirthdaysong.cpp              |  81 ++
 .../valuesource/happybirthdaysong.h                |  80 ++
 .../referenceexamples/valuesource/main.cpp         |  94 +++
 .../referenceexamples/valuesource/person.cpp       | 119 +++
 .../referenceexamples/valuesource/person.h         | 106 +++
 .../referenceexamples/valuesource/valuesource.pro  |  19 +
 .../referenceexamples/valuesource/valuesource.qrc  |   5 +
 examples/declarative/declarative.pro               |  59 +-
 examples/declarative/dial/content/Dial.qml         |  37 -
 examples/declarative/dial/content/background.png   | Bin 35876 -> 0 bytes
 examples/declarative/dial/content/needle.png       | Bin 342 -> 0 bytes
 .../declarative/dial/content/needle_shadow.png     | Bin 632 -> 0 bytes
 examples/declarative/dial/content/overlay.png      | Bin 3564 -> 0 bytes
 examples/declarative/dial/dial-example.qml         |  44 --
 examples/declarative/dial/dial.qmlproject          |  16 -
 examples/declarative/dynamic/dynamic.qml           | 176 -----
 examples/declarative/dynamic/dynamic.qmlproject    |  16 -
 examples/declarative/dynamic/images/NOTE           |   1 -
 examples/declarative/dynamic/images/face-smile.png | Bin 15408 -> 0 bytes
 examples/declarative/dynamic/images/moon.png       | Bin 1757 -> 0 bytes
 .../declarative/dynamic/images/rabbit_brown.png    | Bin 1245 -> 0 bytes
 examples/declarative/dynamic/images/rabbit_bw.png  | Bin 1759 -> 0 bytes
 examples/declarative/dynamic/images/star.png       | Bin 349 -> 0 bytes
 examples/declarative/dynamic/images/sun.png        | Bin 8153 -> 0 bytes
 examples/declarative/dynamic/images/tree_s.png     | Bin 3406 -> 0 bytes
 examples/declarative/dynamic/qml/Button.qml        |  40 -
 examples/declarative/dynamic/qml/PaletteItem.qml   |  19 -
 .../declarative/dynamic/qml/PerspectiveItem.qml    |  25 -
 examples/declarative/dynamic/qml/Sun.qml           |  38 -
 examples/declarative/dynamic/qml/itemCreation.js   |  65 --
 examples/declarative/extending/adding/adding.pro   |  15 -
 examples/declarative/extending/adding/adding.qrc   |   5 -
 examples/declarative/extending/adding/example.qml  |   8 -
 examples/declarative/extending/adding/main.cpp     |  65 --
 examples/declarative/extending/adding/person.cpp   |  69 --
 examples/declarative/extending/adding/person.h     |  66 --
 .../declarative/extending/attached/attached.pro    |  17 -
 .../declarative/extending/attached/attached.qrc    |   5 -
 .../extending/attached/birthdayparty.cpp           |  92 ---
 .../declarative/extending/attached/birthdayparty.h |  87 ---
 .../declarative/extending/attached/example.qml     |  31 -
 examples/declarative/extending/attached/main.cpp   |  91 ---
 examples/declarative/extending/attached/person.cpp | 119 ---
 examples/declarative/extending/attached/person.h   | 106 ---
 examples/declarative/extending/binding/binding.pro |  19 -
 examples/declarative/extending/binding/binding.qrc |   5 -
 .../extending/binding/birthdayparty.cpp            | 114 ---
 .../declarative/extending/binding/birthdayparty.h  | 103 ---
 examples/declarative/extending/binding/example.qml |  37 -
 .../extending/binding/happybirthdaysong.cpp        |  86 --
 .../extending/binding/happybirthdaysong.h          |  75 --
 examples/declarative/extending/binding/main.cpp    |  93 ---
 examples/declarative/extending/binding/person.cpp  | 139 ----
 examples/declarative/extending/binding/person.h    | 114 ---
 .../extending/coercion/birthdayparty.cpp           |  72 --
 .../declarative/extending/coercion/birthdayparty.h |  70 --
 .../declarative/extending/coercion/coercion.pro    |  17 -
 .../declarative/extending/coercion/coercion.qrc    |   5 -
 .../declarative/extending/coercion/example.qml     |  15 -
 examples/declarative/extending/coercion/main.cpp   |  78 --
 examples/declarative/extending/coercion/person.cpp |  80 --
 examples/declarative/extending/coercion/person.h   |  83 --
 .../extending/default/birthdayparty.cpp            |  72 --
 .../declarative/extending/default/birthdayparty.h  |  71 --
 examples/declarative/extending/default/default.pro |  17 -
 examples/declarative/extending/default/default.qrc |   5 -
 examples/declarative/extending/default/example.qml |  14 -
 examples/declarative/extending/default/main.cpp    |  76 --
 examples/declarative/extending/default/person.cpp  |  79 --
 examples/declarative/extending/default/person.h    |  78 --
 .../declarative/extending/extended/example.qml     |   7 -
 .../declarative/extending/extended/extended.pro    |  15 -
 .../declarative/extending/extended/extended.qrc    |   5 -
 .../declarative/extending/extended/lineedit.cpp    | 105 ---
 examples/declarative/extending/extended/lineedit.h |  74 --
 examples/declarative/extending/extended/main.cpp   |  65 --
 examples/declarative/extending/extending.pro       |  13 -
 .../declarative/extending/extending.qmlproject     |  16 -
 .../extending/grouped/birthdayparty.cpp            |  72 --
 .../declarative/extending/grouped/birthdayparty.h  |  70 --
 examples/declarative/extending/grouped/example.qml |  33 -
 examples/declarative/extending/grouped/grouped.pro |  17 -
 examples/declarative/extending/grouped/grouped.qrc |   5 -
 examples/declarative/extending/grouped/main.cpp    |  86 --
 examples/declarative/extending/grouped/person.cpp  | 119 ---
 examples/declarative/extending/grouped/person.h    | 108 ---
 .../extending/properties/birthdayparty.cpp         |  74 --
 .../extending/properties/birthdayparty.h           |  76 --
 .../declarative/extending/properties/example.qml   |  15 -
 examples/declarative/extending/properties/main.cpp |  69 --
 .../declarative/extending/properties/person.cpp    |  67 --
 examples/declarative/extending/properties/person.h |  64 --
 .../extending/properties/properties.pro            |  18 -
 .../extending/properties/properties.qrc            |   5 -
 .../declarative/extending/signal/birthdayparty.cpp |  99 ---
 .../declarative/extending/signal/birthdayparty.h   |  93 ---
 examples/declarative/extending/signal/example.qml  |  32 -
 examples/declarative/extending/signal/main.cpp     |  92 ---
 examples/declarative/extending/signal/person.cpp   | 119 ---
 examples/declarative/extending/signal/person.h     | 106 ---
 examples/declarative/extending/signal/signal.pro   |  17 -
 examples/declarative/extending/signal/signal.qrc   |   5 -
 .../extending/valuesource/birthdayparty.cpp        | 109 ---
 .../extending/valuesource/birthdayparty.h          |  98 ---
 .../declarative/extending/valuesource/example.qml  |  36 -
 .../extending/valuesource/happybirthdaysong.cpp    |  81 --
 .../extending/valuesource/happybirthdaysong.h      |  80 --
 .../declarative/extending/valuesource/main.cpp     |  94 ---
 .../declarative/extending/valuesource/person.cpp   | 119 ---
 .../declarative/extending/valuesource/person.h     | 106 ---
 .../extending/valuesource/valuesource.pro          |  19 -
 .../extending/valuesource/valuesource.qrc          |   5 -
 examples/declarative/fillmode/content/QtLogo.qml   |  30 -
 examples/declarative/fillmode/content/qt-logo.png  | Bin 5149 -> 0 bytes
 examples/declarative/fillmode/fillmode.qml         |  22 -
 examples/declarative/fillmode/fillmode.qmlproject  |  16 -
 examples/declarative/flipable/content/5_heart.png  | Bin 3872 -> 0 bytes
 examples/declarative/flipable/content/9_club.png   | Bin 6135 -> 0 bytes
 examples/declarative/flipable/content/Card.qml     |  38 -
 examples/declarative/flipable/content/back.png     | Bin 1418 -> 0 bytes
 examples/declarative/flipable/flipable-example.qml |  15 -
 examples/declarative/flipable/flipable.qmlproject  |  16 -
 examples/declarative/focus/Core/ContextMenu.qml    |  18 -
 examples/declarative/focus/Core/GridMenu.qml       |  61 --
 .../declarative/focus/Core/ListViewDelegate.qml    |  40 -
 examples/declarative/focus/Core/ListViews.qml      |  62 --
 examples/declarative/focus/Core/images/arrow.png   | Bin 583 -> 0 bytes
 examples/declarative/focus/Core/images/qt-logo.png | Bin 5149 -> 0 bytes
 examples/declarative/focus/Core/qmldir             |   4 -
 examples/declarative/focus/focus.qml               |  69 --
 examples/declarative/focus/focus.qmlproject        |  16 -
 examples/declarative/fonts/availableFonts.qml      |  17 -
 examples/declarative/fonts/banner.qml              |  21 -
 examples/declarative/fonts/fonts.qml               |  64 --
 examples/declarative/fonts/fonts.qmlproject        |  16 -
 examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf | Bin 24544 -> 0 bytes
 examples/declarative/fonts/hello.qml               |  38 -
 .../declarative/gestures/experimental-gestures.qml |  36 -
 examples/declarative/gestures/gestures.qmlproject  |  16 -
 examples/declarative/gridview/gridview-example.qml |  49 --
 examples/declarative/gridview/gridview.qmlproject  |  16 -
 .../declarative/gridview/pics/AddressBook_48.png   | Bin 3350 -> 0 bytes
 .../declarative/gridview/pics/AudioPlayer_48.png   | Bin 3806 -> 0 bytes
 examples/declarative/gridview/pics/Camera_48.png   | Bin 3540 -> 0 bytes
 examples/declarative/gridview/pics/DateBook_48.png | Bin 2610 -> 0 bytes
 examples/declarative/gridview/pics/EMail_48.png    | Bin 3655 -> 0 bytes
 examples/declarative/gridview/pics/TodoList_48.png | Bin 3429 -> 0 bytes
 .../declarative/gridview/pics/VideoPlayer_48.png   | Bin 4151 -> 0 bytes
 examples/declarative/i18n/i18n.qmlproject          |  16 +
 .../imageelements/borderimage/borderimage.qml      |  57 ++
 .../borderimage/borderimage.qmlproject             |  16 +
 .../borderimage/content/MyBorderImage.qml          |  50 ++
 .../borderimage/content/ShadowRectangle.qml        |  14 +
 .../imageelements/borderimage/content/bw.png       | Bin 0 -> 1357 bytes
 .../borderimage/content/colors-round.sci           |   7 +
 .../borderimage/content/colors-stretch.sci         |   5 +
 .../imageelements/borderimage/content/colors.png   | Bin 0 -> 1655 bytes
 .../imageelements/borderimage/content/shadow.png   | Bin 0 -> 588 bytes
 .../imageelements/borderimage/shadows.qml          |  24 +
 .../declarative/imageelements/image/face_fit.qml   |  26 +
 .../imageelements/image/face_fit_animated.qml      |  28 +
 .../imageelements/image/image.qmlproject           |  16 +
 .../declarative/imageelements/image/pics/face.png  | Bin 0 -> 15408 bytes
 .../imageelements/image/scale_and_crop.qml         |  21 +
 .../imageelements/image/scale_and_crop_simple.qml  |  20 +
 .../imageelements/image/scale_and_sidecrop.qml     |  22 +
 .../imageelements/image/scale_to_fit.qml           |  22 +
 .../imageelements/image/scale_to_fit_simple.qml    |  20 +
 .../imageelements/imageelements.qmlproject         |  16 +
 .../imageprovider/ImageProviderCore/qmldir         |   2 -
 .../imageprovider/imageprovider-example.qml        |  25 -
 .../declarative/imageprovider/imageprovider.cpp    | 118 ---
 .../declarative/imageprovider/imageprovider.pro    |  25 -
 .../imageprovider/imageprovider.qmlproject         |  16 -
 examples/declarative/images/content/lemonade.jpg   | Bin 6645 -> 0 bytes
 examples/declarative/images/images.qml             |  72 --
 examples/declarative/images/images.qmlproject      |  16 -
 .../keyinteraction/focus/Core/ContextMenu.qml      |  18 +
 .../keyinteraction/focus/Core/GridMenu.qml         |  61 ++
 .../keyinteraction/focus/Core/ListViewDelegate.qml |  40 +
 .../keyinteraction/focus/Core/ListViews.qml        |  62 ++
 .../keyinteraction/focus/Core/images/arrow.png     | Bin 0 -> 583 bytes
 .../keyinteraction/focus/Core/images/qt-logo.png   | Bin 0 -> 5149 bytes
 .../declarative/keyinteraction/focus/Core/qmldir   |   4 +
 .../declarative/keyinteraction/focus/focus.qml     |  69 ++
 .../keyinteraction/focus/focus.qmlproject          |  16 +
 .../keyinteraction/keyinteraction.qmlproject       |  16 +
 .../layouts/graphicsLayouts/graphicslayouts.cpp    | 366 ---------
 .../layouts/graphicsLayouts/graphicslayouts.pro    |  13 -
 .../layouts/graphicsLayouts/graphicslayouts.qml    |  77 --
 .../layouts/graphicsLayouts/graphicslayouts.qrc    |   5 -
 .../layouts/graphicsLayouts/graphicslayouts_p.h    | 303 -------
 .../declarative/layouts/graphicsLayouts/main.cpp   |  60 --
 .../declarative/layouts/layoutItem/layoutItem.pro  |  13 -
 .../declarative/layouts/layoutItem/layoutItem.qml  |  15 -
 .../declarative/layouts/layoutItem/layoutItem.qrc  |   5 -
 examples/declarative/layouts/layoutItem/main.cpp   |  73 --
 .../declarative/layouts/positioners/Button.qml     |  38 -
 examples/declarative/layouts/positioners/add.png   | Bin 1577 -> 0 bytes
 examples/declarative/layouts/positioners/del.png   | Bin 1661 -> 0 bytes
 .../layouts/positioners/positioners.qml            | 213 -----
 .../layouts/positioners/positioners.qmlproject     |  18 -
 .../positioners/positioners.qmlproject.user        |  41 -
 .../declarative/listmodel-threaded/dataloader.js   |   9 -
 .../listmodel-threaded.qmlproject                  |  16 -
 .../declarative/listmodel-threaded/timedisplay.qml |  32 -
 .../listview/content/ClickAutoRepeating.qml        |  31 -
 .../declarative/listview/content/MediaButton.qml   |  35 -
 examples/declarative/listview/content/pics/add.png | Bin 1577 -> 0 bytes
 .../listview/content/pics/archive-insert.png       | Bin 896 -> 0 bytes
 .../listview/content/pics/archive-remove.png       | Bin 1074 -> 0 bytes
 .../listview/content/pics/button-pressed.png       | Bin 571 -> 0 bytes
 .../declarative/listview/content/pics/button.png   | Bin 564 -> 0 bytes
 examples/declarative/listview/content/pics/del.png | Bin 1661 -> 0 bytes
 .../listview/content/pics/fruit-salad.jpg          | Bin 17952 -> 0 bytes
 .../declarative/listview/content/pics/go-down.png  | Bin 892 -> 0 bytes
 .../declarative/listview/content/pics/go-up.png    | Bin 929 -> 0 bytes
 .../listview/content/pics/hamburger.jpg            | Bin 8572 -> 0 bytes
 .../declarative/listview/content/pics/lemonade.jpg | Bin 6645 -> 0 bytes
 .../declarative/listview/content/pics/list-add.png | Bin 907 -> 0 bytes
 .../listview/content/pics/list-remove.png          | Bin 498 -> 0 bytes
 .../declarative/listview/content/pics/moreDown.png | Bin 217 -> 0 bytes
 .../declarative/listview/content/pics/moreUp.png   | Bin 212 -> 0 bytes
 .../declarative/listview/content/pics/pancakes.jpg | Bin 9163 -> 0 bytes
 .../declarative/listview/content/pics/trash.png    | Bin 989 -> 0 bytes
 .../listview/content/pics/vegetable-soup.jpg       | Bin 8639 -> 0 bytes
 .../declarative/listview/dummydata/MyPetsModel.qml |  61 --
 .../declarative/listview/dummydata/Recipes.qml     |  90 ---
 examples/declarative/listview/dynamic.qml          | 208 -----
 examples/declarative/listview/highlight.qml        |  55 --
 examples/declarative/listview/itemlist.qml         |  67 --
 examples/declarative/listview/listview-example.qml |  93 ---
 examples/declarative/listview/listview.qmlproject  |  16 -
 examples/declarative/listview/recipes.qml          | 160 ----
 examples/declarative/listview/sections.qml         |  71 --
 .../modelviews/gridview/gridview-example.qml       |  49 ++
 .../modelviews/gridview/gridview.qmlproject        |  16 +
 .../modelviews/gridview/pics/AddressBook_48.png    | Bin 0 -> 3350 bytes
 .../modelviews/gridview/pics/AudioPlayer_48.png    | Bin 0 -> 3806 bytes
 .../modelviews/gridview/pics/Camera_48.png         | Bin 0 -> 3540 bytes
 .../modelviews/gridview/pics/DateBook_48.png       | Bin 0 -> 2610 bytes
 .../modelviews/gridview/pics/EMail_48.png          | Bin 0 -> 3655 bytes
 .../modelviews/gridview/pics/TodoList_48.png       | Bin 0 -> 3429 bytes
 .../modelviews/gridview/pics/VideoPlayer_48.png    | Bin 0 -> 4151 bytes
 .../listview/content/ClickAutoRepeating.qml        |  31 +
 .../modelviews/listview/content/MediaButton.qml    |  35 +
 .../modelviews/listview/content/pics/add.png       | Bin 0 -> 1577 bytes
 .../listview/content/pics/archive-insert.png       | Bin 0 -> 896 bytes
 .../listview/content/pics/archive-remove.png       | Bin 0 -> 1074 bytes
 .../listview/content/pics/button-pressed.png       | Bin 0 -> 571 bytes
 .../modelviews/listview/content/pics/button.png    | Bin 0 -> 564 bytes
 .../modelviews/listview/content/pics/del.png       | Bin 0 -> 1661 bytes
 .../listview/content/pics/fruit-salad.jpg          | Bin 0 -> 17952 bytes
 .../modelviews/listview/content/pics/go-down.png   | Bin 0 -> 892 bytes
 .../modelviews/listview/content/pics/go-up.png     | Bin 0 -> 929 bytes
 .../modelviews/listview/content/pics/hamburger.jpg | Bin 0 -> 8572 bytes
 .../modelviews/listview/content/pics/lemonade.jpg  | Bin 0 -> 6645 bytes
 .../modelviews/listview/content/pics/list-add.png  | Bin 0 -> 907 bytes
 .../listview/content/pics/list-remove.png          | Bin 0 -> 498 bytes
 .../modelviews/listview/content/pics/moreDown.png  | Bin 0 -> 217 bytes
 .../modelviews/listview/content/pics/moreUp.png    | Bin 0 -> 212 bytes
 .../modelviews/listview/content/pics/pancakes.jpg  | Bin 0 -> 9163 bytes
 .../modelviews/listview/content/pics/trash.png     | Bin 0 -> 989 bytes
 .../listview/content/pics/vegetable-soup.jpg       | Bin 0 -> 8639 bytes
 .../modelviews/listview/dummydata/MyPetsModel.qml  |  61 ++
 .../modelviews/listview/dummydata/Recipes.qml      |  90 +++
 .../declarative/modelviews/listview/dynamic.qml    | 208 +++++
 .../declarative/modelviews/listview/highlight.qml  |  55 ++
 .../declarative/modelviews/listview/itemlist.qml   |  67 ++
 .../modelviews/listview/listview-example.qml       |  93 +++
 .../modelviews/listview/listview.qmlproject        |  16 +
 .../declarative/modelviews/listview/recipes.qml    | 160 ++++
 .../declarative/modelviews/listview/sections.qml   |  71 ++
 examples/declarative/modelviews/modelviews.pro     |   7 +
 .../declarative/modelviews/modelviews.qmlproject   |  16 +
 .../modelviews/objectlistmodel/dataobject.cpp      |  79 ++
 .../modelviews/objectlistmodel/dataobject.h        |  73 ++
 .../modelviews/objectlistmodel/main.cpp            |  77 ++
 .../modelviews/objectlistmodel/objectlistmodel.pro |  18 +
 .../objectlistmodel/objectlistmodel.qmlproject     |  16 +
 .../modelviews/objectlistmodel/objectlistmodel.qrc |   5 +
 .../modelviews/objectlistmodel/view.qml            |  16 +
 .../declarative/modelviews/package/Delegate.qml    |  48 ++
 .../modelviews/package/package.qmlproject          |  16 +
 examples/declarative/modelviews/package/view.qml   |  35 +
 .../declarative/modelviews/parallax/parallax.qml   |  41 +
 .../modelviews/parallax/parallax.qmlproject        |  16 +
 .../modelviews/parallax/pics/background.jpg        | Bin 0 -> 209814 bytes
 .../modelviews/parallax/pics/face-smile.png        | Bin 0 -> 15408 bytes
 .../modelviews/parallax/pics/home-page.svg         | 445 +++++++++++
 .../modelviews/parallax/pics/shadow.png            | Bin 0 -> 425 bytes
 .../modelviews/parallax/pics/yast-joystick.png     | Bin 0 -> 2723 bytes
 .../modelviews/parallax/pics/yast-wol.png          | Bin 0 -> 3769 bytes
 .../modelviews/parallax/qml/ParallaxView.qml       |  83 ++
 .../declarative/modelviews/parallax/qml/Smiley.qml |  46 ++
 .../modelviews/stringlistmodel/main.cpp            |  76 ++
 .../modelviews/stringlistmodel/stringlistmodel.pro |   9 +
 .../modelviews/stringlistmodel/stringlistmodel.qrc |   5 +
 .../modelviews/stringlistmodel/view.qml            |  15 +
 .../declarative/modelviews/webview/alerts.html     |   5 +
 examples/declarative/modelviews/webview/alerts.qml |  58 ++
 .../declarative/modelviews/webview/autosize.qml    |  62 ++
 .../modelviews/webview/content/FieldText.qml       | 157 ++++
 .../modelviews/webview/content/Mapping/Map.qml     |  26 +
 .../modelviews/webview/content/Mapping/map.html    |  52 ++
 .../modelviews/webview/content/SpinSquare.qml      |  25 +
 .../modelviews/webview/content/pics/cancel.png     | Bin 0 -> 1038 bytes
 .../modelviews/webview/content/pics/ok.png         | Bin 0 -> 655 bytes
 .../declarative/modelviews/webview/googleMaps.qml  |  43 +
 .../declarative/modelviews/webview/inline-html.qml |  15 +
 .../declarative/modelviews/webview/newwindows.html |   3 +
 .../declarative/modelviews/webview/newwindows.qml  |  31 +
 .../declarative/modelviews/webview/transparent.qml |  15 +
 .../modelviews/webview/webview.qmlproject          |  16 +
 examples/declarative/mousearea/mouse.qml           |  47 --
 .../declarative/mousearea/mousearea.qmlproject     |  16 -
 .../declarative/objectlistmodel/dataobject.cpp     |  79 --
 examples/declarative/objectlistmodel/dataobject.h  |  73 --
 examples/declarative/objectlistmodel/main.cpp      |  77 --
 .../objectlistmodel/objectlistmodel.pro            |  18 -
 .../objectlistmodel/objectlistmodel.qmlproject     |  16 -
 .../objectlistmodel/objectlistmodel.qrc            |   5 -
 examples/declarative/objectlistmodel/view.qml      |  16 -
 examples/declarative/package/Delegate.qml          |  48 --
 examples/declarative/package/package.qmlproject    |  16 -
 examples/declarative/package/view.qml              |  35 -
 examples/declarative/parallax/parallax.qml         |  41 -
 examples/declarative/parallax/parallax.qmlproject  |  16 -
 examples/declarative/parallax/pics/background.jpg  | Bin 209814 -> 0 bytes
 examples/declarative/parallax/pics/face-smile.png  | Bin 15408 -> 0 bytes
 examples/declarative/parallax/pics/home-page.svg   | 445 -----------
 examples/declarative/parallax/pics/shadow.png      | Bin 425 -> 0 bytes
 .../declarative/parallax/pics/yast-joystick.png    | Bin 2723 -> 0 bytes
 examples/declarative/parallax/pics/yast-wol.png    | Bin 3769 -> 0 bytes
 examples/declarative/parallax/qml/ParallaxView.qml |  83 --
 examples/declarative/parallax/qml/Smiley.qml       |  46 --
 examples/declarative/plugins/README                |   9 -
 .../plugins/com/nokia/TimeExample/Clock.qml        |  50 --
 .../plugins/com/nokia/TimeExample/center.png       | Bin 765 -> 0 bytes
 .../plugins/com/nokia/TimeExample/clock.png        | Bin 20653 -> 0 bytes
 .../plugins/com/nokia/TimeExample/hour.png         | Bin 625 -> 0 bytes
 .../plugins/com/nokia/TimeExample/minute.png       | Bin 625 -> 0 bytes
 .../plugins/com/nokia/TimeExample/qmldir           |   2 -
 examples/declarative/plugins/plugin.cpp            | 152 ----
 examples/declarative/plugins/plugins.pro           |  31 -
 examples/declarative/plugins/plugins.qml           |  11 -
 examples/declarative/plugins/plugins.qmlproject    |  16 -
 examples/declarative/positioners/Button.qml        |  38 +
 examples/declarative/positioners/add.png           | Bin 0 -> 1577 bytes
 examples/declarative/positioners/del.png           | Bin 0 -> 1661 bytes
 examples/declarative/positioners/positioners.qml   | 213 +++++
 .../declarative/positioners/positioners.qmlproject |  18 +
 .../positioners/positioners.qmlproject.user        |  41 +
 .../progressbar/content/ProgressBar.qml            |  43 -
 .../declarative/progressbar/content/background.png | Bin 426 -> 0 bytes
 .../declarative/progressbar/progressbar.qmlproject |  16 -
 examples/declarative/progressbar/progressbars.qml  |  33 -
 examples/declarative/proxyviewer/main.cpp          | 109 ---
 examples/declarative/proxyviewer/proxyviewer.pro   |   9 -
 examples/declarative/proxyviewer/proxyviewer.qrc   |   5 -
 examples/declarative/proxyviewer/view.qml          |   7 -
 .../declarative/proxywidgets/ProxyWidgets/qmldir   |   1 -
 examples/declarative/proxywidgets/README           |   4 -
 examples/declarative/proxywidgets/proxywidgets.cpp |  97 ---
 examples/declarative/proxywidgets/proxywidgets.pro |  21 -
 examples/declarative/proxywidgets/proxywidgets.qml |  70 --
 .../proxywidgets/proxywidgets.qmlproject           |  16 -
 examples/declarative/scrollbar/ScrollBar.qml       |  33 -
 examples/declarative/scrollbar/display.qml         |  54 --
 .../declarative/scrollbar/pics/niagara_falls.jpg   | Bin 604121 -> 0 bytes
 .../declarative/scrollbar/scrollbar.qmlproject     |  16 -
 examples/declarative/searchbox/SearchBox.qml       |  65 --
 .../images/edit-clear-locationbar-rtl.png          | Bin 429 -> 0 bytes
 .../searchbox/images/lineedit-bg-focus.png         | Bin 526 -> 0 bytes
 .../declarative/searchbox/images/lineedit-bg.png   | Bin 426 -> 0 bytes
 examples/declarative/searchbox/main.qml            |  15 -
 .../declarative/searchbox/searchbox.qmlproject     |  16 -
 .../declarative/slideswitch/content/Switch.qml     |  76 --
 .../declarative/slideswitch/content/background.svg |  23 -
 examples/declarative/slideswitch/content/knob.svg  | 867 ---------------------
 examples/declarative/slideswitch/slideswitch.qml   |  11 -
 .../declarative/slideswitch/slideswitch.qmlproject |  16 -
 examples/declarative/spinner/content/Spinner.qml   |  25 -
 .../declarative/spinner/content/spinner-bg.png     | Bin 345 -> 0 bytes
 .../declarative/spinner/content/spinner-select.png | Bin 320 -> 0 bytes
 examples/declarative/spinner/main.qml              |  18 -
 examples/declarative/spinner/spinner.qmlproject    |  16 -
 examples/declarative/sql/hello.qml                 |  31 -
 examples/declarative/sql/sql.qmlproject            |  16 -
 examples/declarative/sqllocalstorage/hello.qml     |  31 +
 .../sqllocalstorage/sqllocalstorage.qmlproject     |  16 +
 examples/declarative/states/states.qml             |  61 --
 examples/declarative/states/states.qmlproject      |  16 -
 examples/declarative/states/transitions.qml        |  90 ---
 examples/declarative/states/user.png               | Bin 4886 -> 0 bytes
 examples/declarative/stringlistmodel/main.cpp      |  76 --
 .../stringlistmodel/stringlistmodel.pro            |   9 -
 .../stringlistmodel/stringlistmodel.qrc            |   5 -
 examples/declarative/stringlistmodel/view.qml      |  15 -
 examples/declarative/tabwidget/TabWidget.qml       |  57 --
 examples/declarative/tabwidget/tab.png             | Bin 507 -> 0 bytes
 examples/declarative/tabwidget/tabs.qml            |  59 --
 .../declarative/tabwidget/tabwidget.qmlproject     |  16 -
 examples/declarative/text/fonts/availableFonts.qml |  17 +
 examples/declarative/text/fonts/banner.qml         |  21 +
 examples/declarative/text/fonts/fonts.qml          |  64 ++
 examples/declarative/text/fonts/fonts.qmlproject   |  16 +
 .../declarative/text/fonts/fonts/tarzeau_ocr_a.ttf | Bin 0 -> 24544 bytes
 examples/declarative/text/fonts/hello.qml          |  38 +
 examples/declarative/text/text.qmlproject          |  16 +
 .../threading/threadedlistmodel/dataloader.js      |   9 +
 .../threadedlistmodel/threadedlistmodel.qmlproject |  16 +
 .../threading/threadedlistmodel/timedisplay.qml    |  32 +
 .../declarative/threading/threading.qmlproject     |  16 +
 .../threading/workerscript/workerscript.js         |  15 +
 .../threading/workerscript/workerscript.qml        |  43 +
 .../threading/workerscript/workerscript.qmlproject |  16 +
 .../declarative/tic-tac-toe/content/Button.qml     |  37 -
 .../declarative/tic-tac-toe/content/TicTac.qml     |  20 -
 .../declarative/tic-tac-toe/content/pics/board.png | Bin 12258 -> 0 bytes
 .../declarative/tic-tac-toe/content/pics/o.png     | Bin 1470 -> 0 bytes
 .../declarative/tic-tac-toe/content/pics/x.png     | Bin 1331 -> 0 bytes
 .../declarative/tic-tac-toe/content/tic-tac-toe.js | 145 ----
 examples/declarative/tic-tac-toe/tic-tac-toe.qml   |  77 --
 .../declarative/tic-tac-toe/tic-tac-toe.qmlproject |  16 -
 .../gestures/experimental-gestures.qml             |  36 +
 .../touchinteraction/gestures/gestures.qmlproject  |  16 +
 .../touchinteraction/mousearea/mouse.qml           |  47 ++
 .../mousearea/mousearea.qmlproject                 |  16 +
 .../touchinteraction/touchinteraction.qmlproject   |  16 +
 examples/declarative/toys/clocks/clocks.qml        |  14 +
 examples/declarative/toys/clocks/clocks.qmlproject |  16 +
 examples/declarative/toys/clocks/content/Clock.qml |  83 ++
 .../declarative/toys/clocks/content/background.png | Bin 0 -> 46895 bytes
 .../declarative/toys/clocks/content/center.png     | Bin 0 -> 765 bytes
 .../toys/clocks/content/clock-night.png            | Bin 0 -> 23359 bytes
 examples/declarative/toys/clocks/content/clock.png | Bin 0 -> 20653 bytes
 examples/declarative/toys/clocks/content/hour.png  | Bin 0 -> 625 bytes
 .../declarative/toys/clocks/content/minute.png     | Bin 0 -> 625 bytes
 .../declarative/toys/clocks/content/second.png     | Bin 0 -> 303 bytes
 examples/declarative/toys/dial/content/Dial.qml    |  37 +
 .../declarative/toys/dial/content/background.png   | Bin 0 -> 35876 bytes
 examples/declarative/toys/dial/content/needle.png  | Bin 0 -> 342 bytes
 .../toys/dial/content/needle_shadow.png            | Bin 0 -> 632 bytes
 examples/declarative/toys/dial/content/overlay.png | Bin 0 -> 3564 bytes
 examples/declarative/toys/dial/dial-example.qml    |  44 ++
 examples/declarative/toys/dial/dial.qmlproject     |  16 +
 examples/declarative/toys/dynamic/dynamic.qml      | 176 +++++
 .../declarative/toys/dynamic/dynamic.qmlproject    |  16 +
 examples/declarative/toys/dynamic/images/NOTE      |   1 +
 .../declarative/toys/dynamic/images/face-smile.png | Bin 0 -> 15408 bytes
 examples/declarative/toys/dynamic/images/moon.png  | Bin 0 -> 1757 bytes
 .../toys/dynamic/images/rabbit_brown.png           | Bin 0 -> 1245 bytes
 .../declarative/toys/dynamic/images/rabbit_bw.png  | Bin 0 -> 1759 bytes
 examples/declarative/toys/dynamic/images/star.png  | Bin 0 -> 349 bytes
 examples/declarative/toys/dynamic/images/sun.png   | Bin 0 -> 8153 bytes
 .../declarative/toys/dynamic/images/tree_s.png     | Bin 0 -> 3406 bytes
 examples/declarative/toys/dynamic/qml/Button.qml   |  40 +
 .../declarative/toys/dynamic/qml/PaletteItem.qml   |  19 +
 .../toys/dynamic/qml/PerspectiveItem.qml           |  25 +
 examples/declarative/toys/dynamic/qml/Sun.qml      |  38 +
 .../declarative/toys/dynamic/qml/itemCreation.js   |  65 ++
 .../toys/tic-tac-toe/content/Button.qml            |  37 +
 .../toys/tic-tac-toe/content/TicTac.qml            |  20 +
 .../toys/tic-tac-toe/content/pics/board.png        | Bin 0 -> 12258 bytes
 .../toys/tic-tac-toe/content/pics/o.png            | Bin 0 -> 1470 bytes
 .../toys/tic-tac-toe/content/pics/x.png            | Bin 0 -> 1331 bytes
 .../toys/tic-tac-toe/content/tic-tac-toe.js        | 145 ++++
 .../declarative/toys/tic-tac-toe/tic-tac-toe.qml   |  77 ++
 .../toys/tic-tac-toe/tic-tac-toe.qmlproject        |  16 +
 examples/declarative/toys/toys.qmlproject          |  16 +
 examples/declarative/toys/tvtennis/tvtennis.qml    |  71 ++
 .../declarative/toys/tvtennis/tvtennis.qmlproject  |  16 +
 examples/declarative/toys/velocity/Day.qml         | 101 +++
 examples/declarative/toys/velocity/cork.jpg        | Bin 0 -> 149337 bytes
 examples/declarative/toys/velocity/note-yellow.png | Bin 0 -> 54559 bytes
 examples/declarative/toys/velocity/tack.png        | Bin 0 -> 7282 bytes
 examples/declarative/toys/velocity/velocity.qml    |  75 ++
 .../declarative/toys/velocity/velocity.qmlproject  |  16 +
 .../declarative/tutorials/extending/extending.pro  |   9 +
 examples/declarative/tutorials/tutorials.pro       |   5 +
 examples/declarative/tvtennis/tvtennis.qml         |  71 --
 examples/declarative/tvtennis/tvtennis.qmlproject  |  16 -
 .../ui-components/flipable/content/5_heart.png     | Bin 0 -> 3872 bytes
 .../ui-components/flipable/content/9_club.png      | Bin 0 -> 6135 bytes
 .../ui-components/flipable/content/Card.qml        |  38 +
 .../ui-components/flipable/content/back.png        | Bin 0 -> 1418 bytes
 .../ui-components/flipable/flipable-example.qml    |  15 +
 .../ui-components/flipable/flipable.qmlproject     |  16 +
 .../progressbar/content/ProgressBar.qml            |  43 +
 .../progressbar/content/background.png             | Bin 0 -> 426 bytes
 .../progressbar/progressbar.qmlproject             |  16 +
 .../ui-components/progressbar/progressbars.qml     |  33 +
 .../ui-components/scrollbar/ScrollBar.qml          |  33 +
 .../ui-components/scrollbar/display.qml            |  54 ++
 .../ui-components/scrollbar/pics/niagara_falls.jpg | Bin 0 -> 604121 bytes
 .../ui-components/scrollbar/scrollbar.qmlproject   |  16 +
 .../ui-components/searchbox/SearchBox.qml          |  65 ++
 .../images/edit-clear-locationbar-rtl.png          | Bin 0 -> 429 bytes
 .../searchbox/images/lineedit-bg-focus.png         | Bin 0 -> 526 bytes
 .../ui-components/searchbox/images/lineedit-bg.png | Bin 0 -> 426 bytes
 .../declarative/ui-components/searchbox/main.qml   |  15 +
 .../ui-components/searchbox/searchbox.qmlproject   |  16 +
 .../ui-components/slideswitch/content/Switch.qml   |  76 ++
 .../slideswitch/content/background.svg             |  23 +
 .../ui-components/slideswitch/content/knob.svg     | 867 +++++++++++++++++++++
 .../ui-components/slideswitch/slideswitch.qml      |  11 +
 .../slideswitch/slideswitch.qmlproject             |  16 +
 .../ui-components/spinner/content/Spinner.qml      |  25 +
 .../ui-components/spinner/content/spinner-bg.png   | Bin 0 -> 345 bytes
 .../spinner/content/spinner-select.png             | Bin 0 -> 320 bytes
 .../declarative/ui-components/spinner/main.qml     |  18 +
 .../ui-components/spinner/spinner.qmlproject       |  16 +
 .../ui-components/tabwidget/TabWidget.qml          |  57 ++
 .../declarative/ui-components/tabwidget/tab.png    | Bin 0 -> 507 bytes
 .../declarative/ui-components/tabwidget/tabs.qml   |  59 ++
 .../ui-components/tabwidget/tabwidget.qmlproject   |  16 +
 .../ui-components/ui-components.qmlproject         |  16 +
 examples/declarative/velocity/Day.qml              | 101 ---
 examples/declarative/velocity/cork.jpg             | Bin 149337 -> 0 bytes
 examples/declarative/velocity/note-yellow.png      | Bin 54559 -> 0 bytes
 examples/declarative/velocity/tack.png             | Bin 7282 -> 0 bytes
 examples/declarative/velocity/velocity.qml         |  75 --
 examples/declarative/velocity/velocity.qmlproject  |  16 -
 examples/declarative/webview/alerts.html           |   5 -
 examples/declarative/webview/alerts.qml            |  58 --
 examples/declarative/webview/autosize.qml          |  62 --
 examples/declarative/webview/content/FieldText.qml | 157 ----
 .../declarative/webview/content/Mapping/Map.qml    |  26 -
 .../declarative/webview/content/Mapping/map.html   |  52 --
 .../declarative/webview/content/SpinSquare.qml     |  25 -
 .../declarative/webview/content/pics/cancel.png    | Bin 1038 -> 0 bytes
 examples/declarative/webview/content/pics/ok.png   | Bin 655 -> 0 bytes
 examples/declarative/webview/googleMaps.qml        |  43 -
 examples/declarative/webview/inline-html.qml       |  15 -
 examples/declarative/webview/newwindows.html       |   3 -
 examples/declarative/webview/newwindows.qml        |  31 -
 examples/declarative/webview/transparent.qml       |  15 -
 examples/declarative/webview/webview.qmlproject    |  16 -
 examples/declarative/workerscript/workerscript.js  |  15 -
 examples/declarative/workerscript/workerscript.qml |  43 -
 .../workerscript/workerscript.qmlproject           |  16 -
 examples/declarative/xml/xml.qmlproject            |  16 +
 .../declarative/xml/xmldata/daringfireball.qml     |  47 ++
 .../declarative/xml/xmldata/xmldata.qmlproject     |  16 +
 examples/declarative/xml/xmldata/yahoonews.qml     |  83 ++
 examples/declarative/xml/xmlhttprequest/test.qml   |  36 +
 examples/declarative/xml/xmlhttprequest/test.xml   |   5 +
 .../xml/xmlhttprequest/xmlhttprequest.qmlproject   |  16 +
 examples/declarative/xmldata/daringfireball.qml    |  47 --
 examples/declarative/xmldata/xmldata.qmlproject    |  16 -
 examples/declarative/xmldata/yahoonews.qml         |  83 --
 examples/declarative/xmlhttprequest/test.qml       |  36 -
 examples/declarative/xmlhttprequest/test.xml       |   5 -
 .../xmlhttprequest/xmlhttprequest.qmlproject       |  16 -
 .../graphicsitems/qdeclarativeborderimage.cpp      |   4 +-
 .../graphicsitems/qdeclarativeflickable.cpp        |   2 +-
 .../graphicsitems/qdeclarativelistview.cpp         |   2 +-
 src/declarative/qml/qdeclarativeengine.cpp         |   4 +-
 .../qml/qdeclarativeextensionplugin.cpp            |   2 +-
 src/declarative/util/qdeclarativelistmodel.cpp     |   4 +-
 src/declarative/util/qdeclarativepackage.cpp       |   4 +-
 src/declarative/util/qdeclarativexmllistmodel.cpp  |   2 +-
 751 files changed, 14589 insertions(+), 14519 deletions(-)
 delete mode 100644 doc/src/snippets/declarative/border-image.qml
 create mode 100644 doc/src/snippets/declarative/borderimage.qml
 create mode 100644 examples/declarative/animation/animation.qmlproject
 create mode 100644 examples/declarative/animation/basics/basics.qmlproject
 create mode 100644 examples/declarative/animation/basics/color-animation.qml
 create mode 100644 examples/declarative/animation/basics/images/face-smile.png
 create mode 100644 examples/declarative/animation/basics/images/moon.png
 create mode 100644 examples/declarative/animation/basics/images/shadow.png
 create mode 100644 examples/declarative/animation/basics/images/star.png
 create mode 100644 examples/declarative/animation/basics/images/sun.png
 create mode 100644 examples/declarative/animation/basics/property-animation.qml
 create mode 100644 examples/declarative/animation/behaviors/SideRect.qml
 create mode 100644 examples/declarative/animation/behaviors/behavior-example.qml
 create mode 100644 examples/declarative/animation/behaviors/behaviors.qmlproject
 create mode 100644 examples/declarative/animation/easing/easing.qml
 create mode 100644 examples/declarative/animation/easing/easing.qmlproject
 create mode 100644 examples/declarative/animation/states/states.qml
 create mode 100644 examples/declarative/animation/states/states.qmlproject
 create mode 100644 examples/declarative/animation/states/transitions.qml
 create mode 100644 examples/declarative/animation/states/user.png
 delete mode 100644 examples/declarative/animations/animations.qmlproject
 delete mode 100644 examples/declarative/animations/color-animation.qml
 delete mode 100644 examples/declarative/animations/easing.qml
 delete mode 100644 examples/declarative/animations/images/face-smile.png
 delete mode 100644 examples/declarative/animations/images/moon.png
 delete mode 100644 examples/declarative/animations/images/shadow.png
 delete mode 100644 examples/declarative/animations/images/star.png
 delete mode 100644 examples/declarative/animations/images/sun.png
 delete mode 100644 examples/declarative/animations/property-animation.qml
 delete mode 100644 examples/declarative/aspectratio/aspectratio.qmlproject
 delete mode 100644 examples/declarative/aspectratio/face_fit.qml
 delete mode 100644 examples/declarative/aspectratio/face_fit_animated.qml
 delete mode 100644 examples/declarative/aspectratio/pics/face.png
 delete mode 100644 examples/declarative/aspectratio/scale_and_crop.qml
 delete mode 100644 examples/declarative/aspectratio/scale_and_crop_simple.qml
 delete mode 100644 examples/declarative/aspectratio/scale_and_sidecrop.qml
 delete mode 100644 examples/declarative/aspectratio/scale_to_fit.qml
 delete mode 100644 examples/declarative/aspectratio/scale_to_fit_simple.qml
 delete mode 100644 examples/declarative/behaviors/SideRect.qml
 delete mode 100644 examples/declarative/behaviors/behavior-example.qml
 delete mode 100644 examples/declarative/behaviors/behaviors.qmlproject
 delete mode 100644 examples/declarative/border-image/border-image.qml
 delete mode 100644 examples/declarative/border-image/border-image.qmlproject
 delete mode 100644 examples/declarative/border-image/content/MyBorderImage.qml
 delete mode 100644 examples/declarative/border-image/content/ShadowRectangle.qml
 delete mode 100644 examples/declarative/border-image/content/bw.png
 delete mode 100644 examples/declarative/border-image/content/colors-round.sci
 delete mode 100644 examples/declarative/border-image/content/colors-stretch.sci
 delete mode 100644 examples/declarative/border-image/content/colors.png
 delete mode 100644 examples/declarative/border-image/content/shadow.png
 delete mode 100644 examples/declarative/border-image/shadows.qml
 delete mode 100644 examples/declarative/clocks/clocks.qml
 delete mode 100644 examples/declarative/clocks/clocks.qmlproject
 delete mode 100644 examples/declarative/clocks/content/Clock.qml
 delete mode 100644 examples/declarative/clocks/content/background.png
 delete mode 100755 examples/declarative/clocks/content/center.png
 delete mode 100755 examples/declarative/clocks/content/clock-night.png
 delete mode 100755 examples/declarative/clocks/content/clock.png
 delete mode 100755 examples/declarative/clocks/content/hour.png
 delete mode 100755 examples/declarative/clocks/content/minute.png
 delete mode 100755 examples/declarative/clocks/content/second.png
 delete mode 100644 examples/declarative/connections/connections-example.qml
 delete mode 100644 examples/declarative/connections/connections.qmlproject
 delete mode 100644 examples/declarative/connections/content/Button.qml
 delete mode 100644 examples/declarative/connections/content/bg1.jpg
 delete mode 100644 examples/declarative/connections/content/rotate-left.png
 delete mode 100644 examples/declarative/connections/content/rotate-right.png
 create mode 100644 examples/declarative/cppextensions/cppextensions.pro
 create mode 100644 examples/declarative/cppextensions/cppextensions.qmlproject
 create mode 100644 examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
 create mode 100644 examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
 create mode 100644 examples/declarative/cppextensions/imageprovider/imageprovider.cpp
 create mode 100644 examples/declarative/cppextensions/imageprovider/imageprovider.pro
 create mode 100644 examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
 create mode 100644 examples/declarative/cppextensions/plugins/README
 create mode 100644 examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
 create mode 100644 examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
 create mode 100644 examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
 create mode 100644 examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
 create mode 100644 examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
 create mode 100644 examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
 create mode 100644 examples/declarative/cppextensions/plugins/plugin.cpp
 create mode 100644 examples/declarative/cppextensions/plugins/plugins.pro
 create mode 100644 examples/declarative/cppextensions/plugins/plugins.qml
 create mode 100644 examples/declarative/cppextensions/plugins/plugins.qmlproject
 create mode 100644 examples/declarative/cppextensions/proxyviewer/main.cpp
 create mode 100644 examples/declarative/cppextensions/proxyviewer/proxyviewer.pro
 create mode 100644 examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc
 create mode 100644 examples/declarative/cppextensions/proxyviewer/view.qml
 create mode 100644 examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir
 create mode 100644 examples/declarative/cppextensions/proxywidgets/README
 create mode 100644 examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp
 create mode 100644 examples/declarative/cppextensions/proxywidgets/proxywidgets.pro
 create mode 100644 examples/declarative/cppextensions/proxywidgets/proxywidgets.qml
 create mode 100644 examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
 create mode 100644 examples/declarative/cppextensions/referenceexamples/adding/adding.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/adding/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/adding/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/adding/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/adding/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/attached.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/attached/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/binding.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/binding/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/coercion/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/default.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/default.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/default/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/extended/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/extended/extended.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/extended/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/grouped/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/properties.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/signal.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/person.h
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
 create mode 100644 examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
 delete mode 100644 examples/declarative/dial/content/Dial.qml
 delete mode 100644 examples/declarative/dial/content/background.png
 delete mode 100644 examples/declarative/dial/content/needle.png
 delete mode 100644 examples/declarative/dial/content/needle_shadow.png
 delete mode 100644 examples/declarative/dial/content/overlay.png
 delete mode 100644 examples/declarative/dial/dial-example.qml
 delete mode 100644 examples/declarative/dial/dial.qmlproject
 delete mode 100644 examples/declarative/dynamic/dynamic.qml
 delete mode 100644 examples/declarative/dynamic/dynamic.qmlproject
 delete mode 100644 examples/declarative/dynamic/images/NOTE
 delete mode 100644 examples/declarative/dynamic/images/face-smile.png
 delete mode 100644 examples/declarative/dynamic/images/moon.png
 delete mode 100644 examples/declarative/dynamic/images/rabbit_brown.png
 delete mode 100644 examples/declarative/dynamic/images/rabbit_bw.png
 delete mode 100644 examples/declarative/dynamic/images/star.png
 delete mode 100644 examples/declarative/dynamic/images/sun.png
 delete mode 100644 examples/declarative/dynamic/images/tree_s.png
 delete mode 100644 examples/declarative/dynamic/qml/Button.qml
 delete mode 100644 examples/declarative/dynamic/qml/PaletteItem.qml
 delete mode 100644 examples/declarative/dynamic/qml/PerspectiveItem.qml
 delete mode 100644 examples/declarative/dynamic/qml/Sun.qml
 delete mode 100644 examples/declarative/dynamic/qml/itemCreation.js
 delete mode 100644 examples/declarative/extending/adding/adding.pro
 delete mode 100644 examples/declarative/extending/adding/adding.qrc
 delete mode 100644 examples/declarative/extending/adding/example.qml
 delete mode 100644 examples/declarative/extending/adding/main.cpp
 delete mode 100644 examples/declarative/extending/adding/person.cpp
 delete mode 100644 examples/declarative/extending/adding/person.h
 delete mode 100644 examples/declarative/extending/attached/attached.pro
 delete mode 100644 examples/declarative/extending/attached/attached.qrc
 delete mode 100644 examples/declarative/extending/attached/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/attached/birthdayparty.h
 delete mode 100644 examples/declarative/extending/attached/example.qml
 delete mode 100644 examples/declarative/extending/attached/main.cpp
 delete mode 100644 examples/declarative/extending/attached/person.cpp
 delete mode 100644 examples/declarative/extending/attached/person.h
 delete mode 100644 examples/declarative/extending/binding/binding.pro
 delete mode 100644 examples/declarative/extending/binding/binding.qrc
 delete mode 100644 examples/declarative/extending/binding/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/binding/birthdayparty.h
 delete mode 100644 examples/declarative/extending/binding/example.qml
 delete mode 100644 examples/declarative/extending/binding/happybirthdaysong.cpp
 delete mode 100644 examples/declarative/extending/binding/happybirthdaysong.h
 delete mode 100644 examples/declarative/extending/binding/main.cpp
 delete mode 100644 examples/declarative/extending/binding/person.cpp
 delete mode 100644 examples/declarative/extending/binding/person.h
 delete mode 100644 examples/declarative/extending/coercion/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/coercion/birthdayparty.h
 delete mode 100644 examples/declarative/extending/coercion/coercion.pro
 delete mode 100644 examples/declarative/extending/coercion/coercion.qrc
 delete mode 100644 examples/declarative/extending/coercion/example.qml
 delete mode 100644 examples/declarative/extending/coercion/main.cpp
 delete mode 100644 examples/declarative/extending/coercion/person.cpp
 delete mode 100644 examples/declarative/extending/coercion/person.h
 delete mode 100644 examples/declarative/extending/default/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/default/birthdayparty.h
 delete mode 100644 examples/declarative/extending/default/default.pro
 delete mode 100644 examples/declarative/extending/default/default.qrc
 delete mode 100644 examples/declarative/extending/default/example.qml
 delete mode 100644 examples/declarative/extending/default/main.cpp
 delete mode 100644 examples/declarative/extending/default/person.cpp
 delete mode 100644 examples/declarative/extending/default/person.h
 delete mode 100644 examples/declarative/extending/extended/example.qml
 delete mode 100644 examples/declarative/extending/extended/extended.pro
 delete mode 100644 examples/declarative/extending/extended/extended.qrc
 delete mode 100644 examples/declarative/extending/extended/lineedit.cpp
 delete mode 100644 examples/declarative/extending/extended/lineedit.h
 delete mode 100644 examples/declarative/extending/extended/main.cpp
 delete mode 100644 examples/declarative/extending/extending.pro
 delete mode 100644 examples/declarative/extending/extending.qmlproject
 delete mode 100644 examples/declarative/extending/grouped/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/grouped/birthdayparty.h
 delete mode 100644 examples/declarative/extending/grouped/example.qml
 delete mode 100644 examples/declarative/extending/grouped/grouped.pro
 delete mode 100644 examples/declarative/extending/grouped/grouped.qrc
 delete mode 100644 examples/declarative/extending/grouped/main.cpp
 delete mode 100644 examples/declarative/extending/grouped/person.cpp
 delete mode 100644 examples/declarative/extending/grouped/person.h
 delete mode 100644 examples/declarative/extending/properties/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/properties/birthdayparty.h
 delete mode 100644 examples/declarative/extending/properties/example.qml
 delete mode 100644 examples/declarative/extending/properties/main.cpp
 delete mode 100644 examples/declarative/extending/properties/person.cpp
 delete mode 100644 examples/declarative/extending/properties/person.h
 delete mode 100644 examples/declarative/extending/properties/properties.pro
 delete mode 100644 examples/declarative/extending/properties/properties.qrc
 delete mode 100644 examples/declarative/extending/signal/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/signal/birthdayparty.h
 delete mode 100644 examples/declarative/extending/signal/example.qml
 delete mode 100644 examples/declarative/extending/signal/main.cpp
 delete mode 100644 examples/declarative/extending/signal/person.cpp
 delete mode 100644 examples/declarative/extending/signal/person.h
 delete mode 100644 examples/declarative/extending/signal/signal.pro
 delete mode 100644 examples/declarative/extending/signal/signal.qrc
 delete mode 100644 examples/declarative/extending/valuesource/birthdayparty.cpp
 delete mode 100644 examples/declarative/extending/valuesource/birthdayparty.h
 delete mode 100644 examples/declarative/extending/valuesource/example.qml
 delete mode 100644 examples/declarative/extending/valuesource/happybirthdaysong.cpp
 delete mode 100644 examples/declarative/extending/valuesource/happybirthdaysong.h
 delete mode 100644 examples/declarative/extending/valuesource/main.cpp
 delete mode 100644 examples/declarative/extending/valuesource/person.cpp
 delete mode 100644 examples/declarative/extending/valuesource/person.h
 delete mode 100644 examples/declarative/extending/valuesource/valuesource.pro
 delete mode 100644 examples/declarative/extending/valuesource/valuesource.qrc
 delete mode 100644 examples/declarative/fillmode/content/QtLogo.qml
 delete mode 100644 examples/declarative/fillmode/content/qt-logo.png
 delete mode 100644 examples/declarative/fillmode/fillmode.qml
 delete mode 100644 examples/declarative/fillmode/fillmode.qmlproject
 delete mode 100644 examples/declarative/flipable/content/5_heart.png
 delete mode 100644 examples/declarative/flipable/content/9_club.png
 delete mode 100644 examples/declarative/flipable/content/Card.qml
 delete mode 100644 examples/declarative/flipable/content/back.png
 delete mode 100644 examples/declarative/flipable/flipable-example.qml
 delete mode 100644 examples/declarative/flipable/flipable.qmlproject
 delete mode 100644 examples/declarative/focus/Core/ContextMenu.qml
 delete mode 100644 examples/declarative/focus/Core/GridMenu.qml
 delete mode 100644 examples/declarative/focus/Core/ListViewDelegate.qml
 delete mode 100644 examples/declarative/focus/Core/ListViews.qml
 delete mode 100644 examples/declarative/focus/Core/images/arrow.png
 delete mode 100644 examples/declarative/focus/Core/images/qt-logo.png
 delete mode 100644 examples/declarative/focus/Core/qmldir
 delete mode 100644 examples/declarative/focus/focus.qml
 delete mode 100644 examples/declarative/focus/focus.qmlproject
 delete mode 100644 examples/declarative/fonts/availableFonts.qml
 delete mode 100644 examples/declarative/fonts/banner.qml
 delete mode 100644 examples/declarative/fonts/fonts.qml
 delete mode 100644 examples/declarative/fonts/fonts.qmlproject
 delete mode 100644 examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf
 delete mode 100644 examples/declarative/fonts/hello.qml
 delete mode 100644 examples/declarative/gestures/experimental-gestures.qml
 delete mode 100644 examples/declarative/gestures/gestures.qmlproject
 delete mode 100644 examples/declarative/gridview/gridview-example.qml
 delete mode 100644 examples/declarative/gridview/gridview.qmlproject
 delete mode 100644 examples/declarative/gridview/pics/AddressBook_48.png
 delete mode 100644 examples/declarative/gridview/pics/AudioPlayer_48.png
 delete mode 100644 examples/declarative/gridview/pics/Camera_48.png
 delete mode 100644 examples/declarative/gridview/pics/DateBook_48.png
 delete mode 100644 examples/declarative/gridview/pics/EMail_48.png
 delete mode 100644 examples/declarative/gridview/pics/TodoList_48.png
 delete mode 100644 examples/declarative/gridview/pics/VideoPlayer_48.png
 create mode 100644 examples/declarative/i18n/i18n.qmlproject
 create mode 100644 examples/declarative/imageelements/borderimage/borderimage.qml
 create mode 100644 examples/declarative/imageelements/borderimage/borderimage.qmlproject
 create mode 100644 examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
 create mode 100644 examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
 create mode 100644 examples/declarative/imageelements/borderimage/content/bw.png
 create mode 100644 examples/declarative/imageelements/borderimage/content/colors-round.sci
 create mode 100644 examples/declarative/imageelements/borderimage/content/colors-stretch.sci
 create mode 100644 examples/declarative/imageelements/borderimage/content/colors.png
 create mode 100644 examples/declarative/imageelements/borderimage/content/shadow.png
 create mode 100644 examples/declarative/imageelements/borderimage/shadows.qml
 create mode 100644 examples/declarative/imageelements/image/face_fit.qml
 create mode 100644 examples/declarative/imageelements/image/face_fit_animated.qml
 create mode 100644 examples/declarative/imageelements/image/image.qmlproject
 create mode 100644 examples/declarative/imageelements/image/pics/face.png
 create mode 100644 examples/declarative/imageelements/image/scale_and_crop.qml
 create mode 100644 examples/declarative/imageelements/image/scale_and_crop_simple.qml
 create mode 100644 examples/declarative/imageelements/image/scale_and_sidecrop.qml
 create mode 100644 examples/declarative/imageelements/image/scale_to_fit.qml
 create mode 100644 examples/declarative/imageelements/image/scale_to_fit_simple.qml
 create mode 100644 examples/declarative/imageelements/imageelements.qmlproject
 delete mode 100644 examples/declarative/imageprovider/ImageProviderCore/qmldir
 delete mode 100644 examples/declarative/imageprovider/imageprovider-example.qml
 delete mode 100644 examples/declarative/imageprovider/imageprovider.cpp
 delete mode 100644 examples/declarative/imageprovider/imageprovider.pro
 delete mode 100644 examples/declarative/imageprovider/imageprovider.qmlproject
 delete mode 100644 examples/declarative/images/content/lemonade.jpg
 delete mode 100644 examples/declarative/images/images.qml
 delete mode 100644 examples/declarative/images/images.qmlproject
 create mode 100644 examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
 create mode 100644 examples/declarative/keyinteraction/focus/Core/GridMenu.qml
 create mode 100644 examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
 create mode 100644 examples/declarative/keyinteraction/focus/Core/ListViews.qml
 create mode 100644 examples/declarative/keyinteraction/focus/Core/images/arrow.png
 create mode 100644 examples/declarative/keyinteraction/focus/Core/images/qt-logo.png
 create mode 100644 examples/declarative/keyinteraction/focus/Core/qmldir
 create mode 100644 examples/declarative/keyinteraction/focus/focus.qml
 create mode 100644 examples/declarative/keyinteraction/focus/focus.qmlproject
 create mode 100644 examples/declarative/keyinteraction/keyinteraction.qmlproject
 delete mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
 delete mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
 delete mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
 delete mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
 delete mode 100644 examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
 delete mode 100644 examples/declarative/layouts/graphicsLayouts/main.cpp
 delete mode 100644 examples/declarative/layouts/layoutItem/layoutItem.pro
 delete mode 100644 examples/declarative/layouts/layoutItem/layoutItem.qml
 delete mode 100644 examples/declarative/layouts/layoutItem/layoutItem.qrc
 delete mode 100644 examples/declarative/layouts/layoutItem/main.cpp
 delete mode 100644 examples/declarative/layouts/positioners/Button.qml
 delete mode 100644 examples/declarative/layouts/positioners/add.png
 delete mode 100644 examples/declarative/layouts/positioners/del.png
 delete mode 100644 examples/declarative/layouts/positioners/positioners.qml
 delete mode 100644 examples/declarative/layouts/positioners/positioners.qmlproject
 delete mode 100644 examples/declarative/layouts/positioners/positioners.qmlproject.user
 delete mode 100644 examples/declarative/listmodel-threaded/dataloader.js
 delete mode 100644 examples/declarative/listmodel-threaded/listmodel-threaded.qmlproject
 delete mode 100644 examples/declarative/listmodel-threaded/timedisplay.qml
 delete mode 100644 examples/declarative/listview/content/ClickAutoRepeating.qml
 delete mode 100644 examples/declarative/listview/content/MediaButton.qml
 delete mode 100644 examples/declarative/listview/content/pics/add.png
 delete mode 100644 examples/declarative/listview/content/pics/archive-insert.png
 delete mode 100644 examples/declarative/listview/content/pics/archive-remove.png
 delete mode 100644 examples/declarative/listview/content/pics/button-pressed.png
 delete mode 100644 examples/declarative/listview/content/pics/button.png
 delete mode 100644 examples/declarative/listview/content/pics/del.png
 delete mode 100644 examples/declarative/listview/content/pics/fruit-salad.jpg
 delete mode 100644 examples/declarative/listview/content/pics/go-down.png
 delete mode 100644 examples/declarative/listview/content/pics/go-up.png
 delete mode 100644 examples/declarative/listview/content/pics/hamburger.jpg
 delete mode 100644 examples/declarative/listview/content/pics/lemonade.jpg
 delete mode 100644 examples/declarative/listview/content/pics/list-add.png
 delete mode 100644 examples/declarative/listview/content/pics/list-remove.png
 delete mode 100644 examples/declarative/listview/content/pics/moreDown.png
 delete mode 100644 examples/declarative/listview/content/pics/moreUp.png
 delete mode 100644 examples/declarative/listview/content/pics/pancakes.jpg
 delete mode 100644 examples/declarative/listview/content/pics/trash.png
 delete mode 100644 examples/declarative/listview/content/pics/vegetable-soup.jpg
 delete mode 100644 examples/declarative/listview/dummydata/MyPetsModel.qml
 delete mode 100644 examples/declarative/listview/dummydata/Recipes.qml
 delete mode 100644 examples/declarative/listview/dynamic.qml
 delete mode 100644 examples/declarative/listview/highlight.qml
 delete mode 100644 examples/declarative/listview/itemlist.qml
 delete mode 100644 examples/declarative/listview/listview-example.qml
 delete mode 100644 examples/declarative/listview/listview.qmlproject
 delete mode 100644 examples/declarative/listview/recipes.qml
 delete mode 100644 examples/declarative/listview/sections.qml
 create mode 100644 examples/declarative/modelviews/gridview/gridview-example.qml
 create mode 100644 examples/declarative/modelviews/gridview/gridview.qmlproject
 create mode 100644 examples/declarative/modelviews/gridview/pics/AddressBook_48.png
 create mode 100644 examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png
 create mode 100644 examples/declarative/modelviews/gridview/pics/Camera_48.png
 create mode 100644 examples/declarative/modelviews/gridview/pics/DateBook_48.png
 create mode 100644 examples/declarative/modelviews/gridview/pics/EMail_48.png
 create mode 100644 examples/declarative/modelviews/gridview/pics/TodoList_48.png
 create mode 100644 examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png
 create mode 100644 examples/declarative/modelviews/listview/content/ClickAutoRepeating.qml
 create mode 100644 examples/declarative/modelviews/listview/content/MediaButton.qml
 create mode 100644 examples/declarative/modelviews/listview/content/pics/add.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/archive-insert.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/archive-remove.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/button-pressed.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/button.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/del.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg
 create mode 100644 examples/declarative/modelviews/listview/content/pics/go-down.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/go-up.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/hamburger.jpg
 create mode 100644 examples/declarative/modelviews/listview/content/pics/lemonade.jpg
 create mode 100644 examples/declarative/modelviews/listview/content/pics/list-add.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/list-remove.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/moreDown.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/moreUp.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/pancakes.jpg
 create mode 100644 examples/declarative/modelviews/listview/content/pics/trash.png
 create mode 100644 examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg
 create mode 100644 examples/declarative/modelviews/listview/dummydata/MyPetsModel.qml
 create mode 100644 examples/declarative/modelviews/listview/dummydata/Recipes.qml
 create mode 100644 examples/declarative/modelviews/listview/dynamic.qml
 create mode 100644 examples/declarative/modelviews/listview/highlight.qml
 create mode 100644 examples/declarative/modelviews/listview/itemlist.qml
 create mode 100644 examples/declarative/modelviews/listview/listview-example.qml
 create mode 100644 examples/declarative/modelviews/listview/listview.qmlproject
 create mode 100644 examples/declarative/modelviews/listview/recipes.qml
 create mode 100644 examples/declarative/modelviews/listview/sections.qml
 create mode 100644 examples/declarative/modelviews/modelviews.pro
 create mode 100644 examples/declarative/modelviews/modelviews.qmlproject
 create mode 100644 examples/declarative/modelviews/objectlistmodel/dataobject.cpp
 create mode 100644 examples/declarative/modelviews/objectlistmodel/dataobject.h
 create mode 100644 examples/declarative/modelviews/objectlistmodel/main.cpp
 create mode 100644 examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
 create mode 100644 examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject
 create mode 100644 examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
 create mode 100644 examples/declarative/modelviews/objectlistmodel/view.qml
 create mode 100644 examples/declarative/modelviews/package/Delegate.qml
 create mode 100644 examples/declarative/modelviews/package/package.qmlproject
 create mode 100644 examples/declarative/modelviews/package/view.qml
 create mode 100644 examples/declarative/modelviews/parallax/parallax.qml
 create mode 100644 examples/declarative/modelviews/parallax/parallax.qmlproject
 create mode 100644 examples/declarative/modelviews/parallax/pics/background.jpg
 create mode 100644 examples/declarative/modelviews/parallax/pics/face-smile.png
 create mode 100644 examples/declarative/modelviews/parallax/pics/home-page.svg
 create mode 100644 examples/declarative/modelviews/parallax/pics/shadow.png
 create mode 100644 examples/declarative/modelviews/parallax/pics/yast-joystick.png
 create mode 100644 examples/declarative/modelviews/parallax/pics/yast-wol.png
 create mode 100644 examples/declarative/modelviews/parallax/qml/ParallaxView.qml
 create mode 100644 examples/declarative/modelviews/parallax/qml/Smiley.qml
 create mode 100644 examples/declarative/modelviews/stringlistmodel/main.cpp
 create mode 100644 examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
 create mode 100644 examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
 create mode 100644 examples/declarative/modelviews/stringlistmodel/view.qml
 create mode 100644 examples/declarative/modelviews/webview/alerts.html
 create mode 100644 examples/declarative/modelviews/webview/alerts.qml
 create mode 100644 examples/declarative/modelviews/webview/autosize.qml
 create mode 100644 examples/declarative/modelviews/webview/content/FieldText.qml
 create mode 100644 examples/declarative/modelviews/webview/content/Mapping/Map.qml
 create mode 100755 examples/declarative/modelviews/webview/content/Mapping/map.html
 create mode 100644 examples/declarative/modelviews/webview/content/SpinSquare.qml
 create mode 100644 examples/declarative/modelviews/webview/content/pics/cancel.png
 create mode 100644 examples/declarative/modelviews/webview/content/pics/ok.png
 create mode 100644 examples/declarative/modelviews/webview/googleMaps.qml
 create mode 100644 examples/declarative/modelviews/webview/inline-html.qml
 create mode 100644 examples/declarative/modelviews/webview/newwindows.html
 create mode 100644 examples/declarative/modelviews/webview/newwindows.qml
 create mode 100644 examples/declarative/modelviews/webview/transparent.qml
 create mode 100644 examples/declarative/modelviews/webview/webview.qmlproject
 delete mode 100644 examples/declarative/mousearea/mouse.qml
 delete mode 100644 examples/declarative/mousearea/mousearea.qmlproject
 delete mode 100644 examples/declarative/objectlistmodel/dataobject.cpp
 delete mode 100644 examples/declarative/objectlistmodel/dataobject.h
 delete mode 100644 examples/declarative/objectlistmodel/main.cpp
 delete mode 100644 examples/declarative/objectlistmodel/objectlistmodel.pro
 delete mode 100644 examples/declarative/objectlistmodel/objectlistmodel.qmlproject
 delete mode 100644 examples/declarative/objectlistmodel/objectlistmodel.qrc
 delete mode 100644 examples/declarative/objectlistmodel/view.qml
 delete mode 100644 examples/declarative/package/Delegate.qml
 delete mode 100644 examples/declarative/package/package.qmlproject
 delete mode 100644 examples/declarative/package/view.qml
 delete mode 100644 examples/declarative/parallax/parallax.qml
 delete mode 100644 examples/declarative/parallax/parallax.qmlproject
 delete mode 100644 examples/declarative/parallax/pics/background.jpg
 delete mode 100644 examples/declarative/parallax/pics/face-smile.png
 delete mode 100644 examples/declarative/parallax/pics/home-page.svg
 delete mode 100644 examples/declarative/parallax/pics/shadow.png
 delete mode 100644 examples/declarative/parallax/pics/yast-joystick.png
 delete mode 100644 examples/declarative/parallax/pics/yast-wol.png
 delete mode 100644 examples/declarative/parallax/qml/ParallaxView.qml
 delete mode 100644 examples/declarative/parallax/qml/Smiley.qml
 delete mode 100644 examples/declarative/plugins/README
 delete mode 100644 examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
 delete mode 100644 examples/declarative/plugins/com/nokia/TimeExample/center.png
 delete mode 100644 examples/declarative/plugins/com/nokia/TimeExample/clock.png
 delete mode 100644 examples/declarative/plugins/com/nokia/TimeExample/hour.png
 delete mode 100644 examples/declarative/plugins/com/nokia/TimeExample/minute.png
 delete mode 100644 examples/declarative/plugins/com/nokia/TimeExample/qmldir
 delete mode 100644 examples/declarative/plugins/plugin.cpp
 delete mode 100644 examples/declarative/plugins/plugins.pro
 delete mode 100644 examples/declarative/plugins/plugins.qml
 delete mode 100644 examples/declarative/plugins/plugins.qmlproject
 create mode 100644 examples/declarative/positioners/Button.qml
 create mode 100644 examples/declarative/positioners/add.png
 create mode 100644 examples/declarative/positioners/del.png
 create mode 100644 examples/declarative/positioners/positioners.qml
 create mode 100644 examples/declarative/positioners/positioners.qmlproject
 create mode 100644 examples/declarative/positioners/positioners.qmlproject.user
 delete mode 100644 examples/declarative/progressbar/content/ProgressBar.qml
 delete mode 100644 examples/declarative/progressbar/content/background.png
 delete mode 100644 examples/declarative/progressbar/progressbar.qmlproject
 delete mode 100644 examples/declarative/progressbar/progressbars.qml
 delete mode 100644 examples/declarative/proxyviewer/main.cpp
 delete mode 100644 examples/declarative/proxyviewer/proxyviewer.pro
 delete mode 100644 examples/declarative/proxyviewer/proxyviewer.qrc
 delete mode 100644 examples/declarative/proxyviewer/view.qml
 delete mode 100644 examples/declarative/proxywidgets/ProxyWidgets/qmldir
 delete mode 100644 examples/declarative/proxywidgets/README
 delete mode 100644 examples/declarative/proxywidgets/proxywidgets.cpp
 delete mode 100644 examples/declarative/proxywidgets/proxywidgets.pro
 delete mode 100644 examples/declarative/proxywidgets/proxywidgets.qml
 delete mode 100644 examples/declarative/proxywidgets/proxywidgets.qmlproject
 delete mode 100644 examples/declarative/scrollbar/ScrollBar.qml
 delete mode 100644 examples/declarative/scrollbar/display.qml
 delete mode 100644 examples/declarative/scrollbar/pics/niagara_falls.jpg
 delete mode 100644 examples/declarative/scrollbar/scrollbar.qmlproject
 delete mode 100644 examples/declarative/searchbox/SearchBox.qml
 delete mode 100644 examples/declarative/searchbox/images/edit-clear-locationbar-rtl.png
 delete mode 100644 examples/declarative/searchbox/images/lineedit-bg-focus.png
 delete mode 100644 examples/declarative/searchbox/images/lineedit-bg.png
 delete mode 100644 examples/declarative/searchbox/main.qml
 delete mode 100644 examples/declarative/searchbox/searchbox.qmlproject
 delete mode 100644 examples/declarative/slideswitch/content/Switch.qml
 delete mode 100644 examples/declarative/slideswitch/content/background.svg
 delete mode 100644 examples/declarative/slideswitch/content/knob.svg
 delete mode 100644 examples/declarative/slideswitch/slideswitch.qml
 delete mode 100644 examples/declarative/slideswitch/slideswitch.qmlproject
 delete mode 100644 examples/declarative/spinner/content/Spinner.qml
 delete mode 100644 examples/declarative/spinner/content/spinner-bg.png
 delete mode 100644 examples/declarative/spinner/content/spinner-select.png
 delete mode 100644 examples/declarative/spinner/main.qml
 delete mode 100644 examples/declarative/spinner/spinner.qmlproject
 delete mode 100644 examples/declarative/sql/hello.qml
 delete mode 100644 examples/declarative/sql/sql.qmlproject
 create mode 100644 examples/declarative/sqllocalstorage/hello.qml
 create mode 100644 examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
 delete mode 100644 examples/declarative/states/states.qml
 delete mode 100644 examples/declarative/states/states.qmlproject
 delete mode 100644 examples/declarative/states/transitions.qml
 delete mode 100644 examples/declarative/states/user.png
 delete mode 100644 examples/declarative/stringlistmodel/main.cpp
 delete mode 100644 examples/declarative/stringlistmodel/stringlistmodel.pro
 delete mode 100644 examples/declarative/stringlistmodel/stringlistmodel.qrc
 delete mode 100644 examples/declarative/stringlistmodel/view.qml
 delete mode 100644 examples/declarative/tabwidget/TabWidget.qml
 delete mode 100644 examples/declarative/tabwidget/tab.png
 delete mode 100644 examples/declarative/tabwidget/tabs.qml
 delete mode 100644 examples/declarative/tabwidget/tabwidget.qmlproject
 create mode 100644 examples/declarative/text/fonts/availableFonts.qml
 create mode 100644 examples/declarative/text/fonts/banner.qml
 create mode 100644 examples/declarative/text/fonts/fonts.qml
 create mode 100644 examples/declarative/text/fonts/fonts.qmlproject
 create mode 100644 examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf
 create mode 100644 examples/declarative/text/fonts/hello.qml
 create mode 100644 examples/declarative/text/text.qmlproject
 create mode 100644 examples/declarative/threading/threadedlistmodel/dataloader.js
 create mode 100644 examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
 create mode 100644 examples/declarative/threading/threadedlistmodel/timedisplay.qml
 create mode 100644 examples/declarative/threading/threading.qmlproject
 create mode 100644 examples/declarative/threading/workerscript/workerscript.js
 create mode 100644 examples/declarative/threading/workerscript/workerscript.qml
 create mode 100644 examples/declarative/threading/workerscript/workerscript.qmlproject
 delete mode 100644 examples/declarative/tic-tac-toe/content/Button.qml
 delete mode 100644 examples/declarative/tic-tac-toe/content/TicTac.qml
 delete mode 100644 examples/declarative/tic-tac-toe/content/pics/board.png
 delete mode 100644 examples/declarative/tic-tac-toe/content/pics/o.png
 delete mode 100644 examples/declarative/tic-tac-toe/content/pics/x.png
 delete mode 100644 examples/declarative/tic-tac-toe/content/tic-tac-toe.js
 delete mode 100644 examples/declarative/tic-tac-toe/tic-tac-toe.qml
 delete mode 100644 examples/declarative/tic-tac-toe/tic-tac-toe.qmlproject
 create mode 100644 examples/declarative/touchinteraction/gestures/experimental-gestures.qml
 create mode 100644 examples/declarative/touchinteraction/gestures/gestures.qmlproject
 create mode 100644 examples/declarative/touchinteraction/mousearea/mouse.qml
 create mode 100644 examples/declarative/touchinteraction/mousearea/mousearea.qmlproject
 create mode 100644 examples/declarative/touchinteraction/touchinteraction.qmlproject
 create mode 100644 examples/declarative/toys/clocks/clocks.qml
 create mode 100644 examples/declarative/toys/clocks/clocks.qmlproject
 create mode 100644 examples/declarative/toys/clocks/content/Clock.qml
 create mode 100644 examples/declarative/toys/clocks/content/background.png
 create mode 100755 examples/declarative/toys/clocks/content/center.png
 create mode 100755 examples/declarative/toys/clocks/content/clock-night.png
 create mode 100755 examples/declarative/toys/clocks/content/clock.png
 create mode 100755 examples/declarative/toys/clocks/content/hour.png
 create mode 100755 examples/declarative/toys/clocks/content/minute.png
 create mode 100755 examples/declarative/toys/clocks/content/second.png
 create mode 100644 examples/declarative/toys/dial/content/Dial.qml
 create mode 100644 examples/declarative/toys/dial/content/background.png
 create mode 100644 examples/declarative/toys/dial/content/needle.png
 create mode 100644 examples/declarative/toys/dial/content/needle_shadow.png
 create mode 100644 examples/declarative/toys/dial/content/overlay.png
 create mode 100644 examples/declarative/toys/dial/dial-example.qml
 create mode 100644 examples/declarative/toys/dial/dial.qmlproject
 create mode 100644 examples/declarative/toys/dynamic/dynamic.qml
 create mode 100644 examples/declarative/toys/dynamic/dynamic.qmlproject
 create mode 100644 examples/declarative/toys/dynamic/images/NOTE
 create mode 100644 examples/declarative/toys/dynamic/images/face-smile.png
 create mode 100644 examples/declarative/toys/dynamic/images/moon.png
 create mode 100644 examples/declarative/toys/dynamic/images/rabbit_brown.png
 create mode 100644 examples/declarative/toys/dynamic/images/rabbit_bw.png
 create mode 100644 examples/declarative/toys/dynamic/images/star.png
 create mode 100644 examples/declarative/toys/dynamic/images/sun.png
 create mode 100644 examples/declarative/toys/dynamic/images/tree_s.png
 create mode 100644 examples/declarative/toys/dynamic/qml/Button.qml
 create mode 100644 examples/declarative/toys/dynamic/qml/PaletteItem.qml
 create mode 100644 examples/declarative/toys/dynamic/qml/PerspectiveItem.qml
 create mode 100644 examples/declarative/toys/dynamic/qml/Sun.qml
 create mode 100644 examples/declarative/toys/dynamic/qml/itemCreation.js
 create mode 100644 examples/declarative/toys/tic-tac-toe/content/Button.qml
 create mode 100644 examples/declarative/toys/tic-tac-toe/content/TicTac.qml
 create mode 100644 examples/declarative/toys/tic-tac-toe/content/pics/board.png
 create mode 100644 examples/declarative/toys/tic-tac-toe/content/pics/o.png
 create mode 100644 examples/declarative/toys/tic-tac-toe/content/pics/x.png
 create mode 100644 examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
 create mode 100644 examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
 create mode 100644 examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject
 create mode 100644 examples/declarative/toys/toys.qmlproject
 create mode 100644 examples/declarative/toys/tvtennis/tvtennis.qml
 create mode 100644 examples/declarative/toys/tvtennis/tvtennis.qmlproject
 create mode 100644 examples/declarative/toys/velocity/Day.qml
 create mode 100644 examples/declarative/toys/velocity/cork.jpg
 create mode 100644 examples/declarative/toys/velocity/note-yellow.png
 create mode 100644 examples/declarative/toys/velocity/tack.png
 create mode 100644 examples/declarative/toys/velocity/velocity.qml
 create mode 100644 examples/declarative/toys/velocity/velocity.qmlproject
 create mode 100644 examples/declarative/tutorials/extending/extending.pro
 create mode 100644 examples/declarative/tutorials/tutorials.pro
 delete mode 100644 examples/declarative/tvtennis/tvtennis.qml
 delete mode 100644 examples/declarative/tvtennis/tvtennis.qmlproject
 create mode 100644 examples/declarative/ui-components/flipable/content/5_heart.png
 create mode 100644 examples/declarative/ui-components/flipable/content/9_club.png
 create mode 100644 examples/declarative/ui-components/flipable/content/Card.qml
 create mode 100644 examples/declarative/ui-components/flipable/content/back.png
 create mode 100644 examples/declarative/ui-components/flipable/flipable-example.qml
 create mode 100644 examples/declarative/ui-components/flipable/flipable.qmlproject
 create mode 100644 examples/declarative/ui-components/progressbar/content/ProgressBar.qml
 create mode 100644 examples/declarative/ui-components/progressbar/content/background.png
 create mode 100644 examples/declarative/ui-components/progressbar/progressbar.qmlproject
 create mode 100644 examples/declarative/ui-components/progressbar/progressbars.qml
 create mode 100644 examples/declarative/ui-components/scrollbar/ScrollBar.qml
 create mode 100644 examples/declarative/ui-components/scrollbar/display.qml
 create mode 100644 examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg
 create mode 100644 examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
 create mode 100644 examples/declarative/ui-components/searchbox/SearchBox.qml
 create mode 100644 examples/declarative/ui-components/searchbox/images/edit-clear-locationbar-rtl.png
 create mode 100644 examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png
 create mode 100644 examples/declarative/ui-components/searchbox/images/lineedit-bg.png
 create mode 100644 examples/declarative/ui-components/searchbox/main.qml
 create mode 100644 examples/declarative/ui-components/searchbox/searchbox.qmlproject
 create mode 100644 examples/declarative/ui-components/slideswitch/content/Switch.qml
 create mode 100644 examples/declarative/ui-components/slideswitch/content/background.svg
 create mode 100644 examples/declarative/ui-components/slideswitch/content/knob.svg
 create mode 100644 examples/declarative/ui-components/slideswitch/slideswitch.qml
 create mode 100644 examples/declarative/ui-components/slideswitch/slideswitch.qmlproject
 create mode 100644 examples/declarative/ui-components/spinner/content/Spinner.qml
 create mode 100644 examples/declarative/ui-components/spinner/content/spinner-bg.png
 create mode 100644 examples/declarative/ui-components/spinner/content/spinner-select.png
 create mode 100644 examples/declarative/ui-components/spinner/main.qml
 create mode 100644 examples/declarative/ui-components/spinner/spinner.qmlproject
 create mode 100644 examples/declarative/ui-components/tabwidget/TabWidget.qml
 create mode 100644 examples/declarative/ui-components/tabwidget/tab.png
 create mode 100644 examples/declarative/ui-components/tabwidget/tabs.qml
 create mode 100644 examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
 create mode 100644 examples/declarative/ui-components/ui-components.qmlproject
 delete mode 100644 examples/declarative/velocity/Day.qml
 delete mode 100644 examples/declarative/velocity/cork.jpg
 delete mode 100644 examples/declarative/velocity/note-yellow.png
 delete mode 100644 examples/declarative/velocity/tack.png
 delete mode 100644 examples/declarative/velocity/velocity.qml
 delete mode 100644 examples/declarative/velocity/velocity.qmlproject
 delete mode 100644 examples/declarative/webview/alerts.html
 delete mode 100644 examples/declarative/webview/alerts.qml
 delete mode 100644 examples/declarative/webview/autosize.qml
 delete mode 100644 examples/declarative/webview/content/FieldText.qml
 delete mode 100644 examples/declarative/webview/content/Mapping/Map.qml
 delete mode 100755 examples/declarative/webview/content/Mapping/map.html
 delete mode 100644 examples/declarative/webview/content/SpinSquare.qml
 delete mode 100644 examples/declarative/webview/content/pics/cancel.png
 delete mode 100644 examples/declarative/webview/content/pics/ok.png
 delete mode 100644 examples/declarative/webview/googleMaps.qml
 delete mode 100644 examples/declarative/webview/inline-html.qml
 delete mode 100644 examples/declarative/webview/newwindows.html
 delete mode 100644 examples/declarative/webview/newwindows.qml
 delete mode 100644 examples/declarative/webview/transparent.qml
 delete mode 100644 examples/declarative/webview/webview.qmlproject
 delete mode 100644 examples/declarative/workerscript/workerscript.js
 delete mode 100644 examples/declarative/workerscript/workerscript.qml
 delete mode 100644 examples/declarative/workerscript/workerscript.qmlproject
 create mode 100644 examples/declarative/xml/xml.qmlproject
 create mode 100644 examples/declarative/xml/xmldata/daringfireball.qml
 create mode 100644 examples/declarative/xml/xmldata/xmldata.qmlproject
 create mode 100644 examples/declarative/xml/xmldata/yahoonews.qml
 create mode 100644 examples/declarative/xml/xmlhttprequest/test.qml
 create mode 100644 examples/declarative/xml/xmlhttprequest/test.xml
 create mode 100644 examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject
 delete mode 100644 examples/declarative/xmldata/daringfireball.qml
 delete mode 100644 examples/declarative/xmldata/xmldata.qmlproject
 delete mode 100644 examples/declarative/xmldata/yahoonews.qml
 delete mode 100644 examples/declarative/xmlhttprequest/test.qml
 delete mode 100644 examples/declarative/xmlhttprequest/test.xml
 delete mode 100644 examples/declarative/xmlhttprequest/xmlhttprequest.qmlproject

diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index c14208e..27b7f38 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -45,7 +45,7 @@
 
 This example shows how to create a reusable switch component in QML.
 
-The code for this example can be found in the \c $QTDIR/examples/declarative/slideswitch directory.
+The code for this example can be found in the \c $QTDIR/examples/declarative/ui-components/slideswitch directory.
 
 \section1 Overview
 
@@ -61,12 +61,12 @@ The elements that composed the switch are:
 \endlist
 
 \section1 Switch.qml
-\snippet examples/declarative/slideswitch/content/Switch.qml 0
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 0
 
 \section1 Walkthrough
 
 \section2 Interface
-\snippet examples/declarative/slideswitch/content/Switch.qml 1
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 1
 
 This property is the interface of the switch. By default, the switch is off and this property is \c false.
 It can be used to activate/disactivate the switch or to query its current state.
@@ -81,14 +81,14 @@ Text { text: "The switch is on"; visible: mySwitch.on == true }
 the text will only be visible when the switch is on.
 
 \section2 Images and user interaction
-\snippet examples/declarative/slideswitch/content/Switch.qml 4
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 4
 
 First, we create the background image of the switch.
 In order for the switch to toggle when the user clicks on the background, we add a \l{MouseArea} as a child item of the image.
 A \c MouseArea has a \c onClicked property that is triggered when the item is clicked. For the moment we will just call a
 \c toggle() function. We will see what this function does in a moment.
 
-\snippet examples/declarative/slideswitch/content/Switch.qml 5
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 5
 
 Then, we place the image of the knob on top of the background.
 The interaction here is a little more complex. We want the knob to move with the finger when it is clicked. That is what the \c drag
@@ -96,7 +96,7 @@ property of the \c MouseArea is for. We also want to toggle the switch if the kn
 in the \c dorelease() function that is called in the \c onReleased property.
 
 \section2 States
-\snippet examples/declarative/slideswitch/content/Switch.qml 6
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 6
 
 We define the two states of the switch:
 \list
@@ -110,13 +110,13 @@ For more information on states see \l{qmlstates}{QML States}.
 
 We add two JavaScript functions to our switch:
 
-\snippet examples/declarative/slideswitch/content/Switch.qml 2
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 2
 
 This first function is called when the background image or the knob are clicked. We simply want the switch to toggle between the two
 states (\e on and \e off).
 
 
-\snippet examples/declarative/slideswitch/content/Switch.qml 3
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 3
 
 This second function is called when the knob is released and we want to make sure that the knob does not end up between states
 (neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
@@ -124,7 +124,7 @@ This second function is called when the knob is released and we want to make sur
 For more information on scripts see \l{Integrating JavaScript}.
 
 \section2 Transition
-\snippet examples/declarative/slideswitch/content/Switch.qml 7
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 7
 
 At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78.
 In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms.
@@ -133,5 +133,5 @@ For more information on transitions see \l{state-transitions}{QML Transitions}.
 
 \section1 Usage
 The switch can be used in a QML file, like this:
-\snippet examples/declarative/slideswitch/slideswitch.qml 0
+\snippet examples/declarative/ui-components/slideswitch/slideswitch.qml 0
 */
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 481617e..cdc308a 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -71,50 +71,92 @@ For example, from your build directory, run:
 
 \section1 Examples
 
+\section2 Animation
 \list
-\o \l{declarative/animations}{Animations}
-\o \l{declarative/aspectratio}{Aspect Ratio}
-\o \l{declarative/behaviors}{Behaviors}
-\o \l{declarative/border-image}{Border Image}
-\o \l{declarative/clocks}{Clocks}
-\o \l{declarative/connections}{Connections}
-\o \l{declarative/dial}{Dial}
-\o \l{declarative/dynamic}{Dynamic}
-\o \l{declarative/extending}{Extending}
-\o \l{declarative/fillmode}{Fillmode}
-\o \l{declarative/flipable}{Flipable}
-\o \l{declarative/focus}{Focus}
-\o \l{declarative/fonts}{Fonts}
-\o \l{declarative/gridview}{GridView}
-\o \l{declarative/imageprovider}{Image Provider}
-\o \l{declarative/images}{Images}
-\o \l{declarative/layouts}{Layouts}
-\o \l{declarative/listmodel-threaded}{ListModel Threaded}
-\o \l{declarative/listview}{ListView}
-\o \l{declarative/mousearea}{Mouse Area}
-\o \l{declarative/objectlistmodel}{Object ListModel}
-\o \l{declarative/package}{Package}
-\o \l{declarative/parallax}{Parallax}
-\o \l{declarative/plugins}{Plugins}
-\o \l{declarative/progressbar}{Progress Bars}
-\o \l{declarative/proxywidgets}{Proxy Widgets}
-\o \l{declarative/scrollbar}{Scrollbar}
-\o \l{declarative/searchbox}{Search Box}
-\o \l{declarative/slideswitch}{Slide Switch}
-\o \l{declarative/sql}{SQL}
-\o \l{declarative/states}{States}
-\o \l{declarative/stringlistmodel}{String ListModel}
-\o \l{declarative/tabwidget}{Tab Widget}
-\o \l{declarative/tic-tac-toe}{Tic-Tac-Toe}
-\o \l{declarative/tvtennis}{TV Tennis}
-\o \l{declarative/velocity}{Velocity}
-\o \l{declarative/webview}{WebView}
-\o \l{declarative/workerscript}{WorkerScript}
-\o \l{declarative/xmldata}{XML Data}
-\o \l{declarative/xmlhttprequest}{XMLHttpRequest}
+\o \l{declarative/animation/basics}{Basics}
+\o \l{declarative/animation/behaviors}{Behaviors}
+\o \l{declarative/animation/easing}{Easing}
+\o \l{declarative/animation/states}{States}
+\endlist
+
+\section2 Image Elements
+\list
+\o \l{declarative/imageelements/borderimage}{BorderImage}
+\o \l{declarative/imageelements/image}{Image}
+\endlist
+
+\section2 \l{declarative/positioners}{Positioners}
+
+\section2 Key Interaction
+\list
+\o \l{declarative/keyinteraction/focus}{Focus}
+\endlist
 
+\section2 Touch Interaction
+\list
+\o \l{declarative/touchinteraction/gestures}{Gestures}
+\o \l{declarative/touchinteraction/mousearea}{MouseArea}
+\endlist
+
+\section2 UI Components
+\list
+\o \l{declarative/ui-components/flipable}{Flipable}
+\o \l{declarative/ui-components/progressbar}{Progress bar}
+\o \l{declarative/ui-components/scrollbar}{Scroll bar}
+\o \l{declarative/ui-components/searchbox}{Search box}
+\o \l{declarative/ui-components/slideswitch}{Slide switch}
+\o \l{declarative/ui-components/spinner}{Spinner}
+\o \l{declarative/ui-components/tabwidget}{Tab widget}
 \endlist
 
+\section2 Models and Views
+\list
+\o \l{declarative/modelviews/gridview}{GridView}
+\o \l{declarative/modelviews/listview}{ListView}
+\o \l{declarative/modelviews/objectlistmodel}{Object list model}
+\o \l{declarative/modelviews/package}{Package}
+\o \l{declarative/modelviews/parallax}{Parallax}
+\o \l{declarative/modelviews/stringlistmodel}{String list model}
+\o \l{declarative/modelviews/webview}{WebView}
+\endlist
+
+\section2 XML
+\list
+\o \l{declarative/xml/xmldata}{XML data}
+\o \l{declarative/xml/xmlhttprequest}{XmlHttpRequest}
+\endlist
+
+\section2 \l{declarative/i18n}{Internationalization (i18n)}
+
+\section2 Threading
+\list
+\o \l{declarative/threading/threadedlistmodel}{Threaded ListModel}
+\o \l{declarative/threading/workerscript}{WorkerScript}
+\endlist
+
+\section2 \l{declarative/sqllocalstorage}{SQL Local Storage}
+
+\section2 C++ Extensions
+\list
+\o \l{declarative/cppextensions/referenceexamples}{Reference examples} (discussed in \l {Extending QML in C++})
+\o \l{declarative/cppextensions/plugins}{Plugins}
+\o \l{declarative/cppextensions/proxywidgets}{QtWidgets}
+\o \l{declarative/cppextensions/qgraphicslayouts}{QGraphicsLayouts}
+\o \l{declarative/cppextensions/imageprovider}{Image provider}
+\o \l{declarative/cppextensions/proxyviewer}{Network access manager factory}
+\endlist
+
+\section2 Toys
+\list
+\o \l{declarative/toys/clocks}{Clocks}
+\o \l{declarative/toys/dial}{Dial}
+\o \l{declarative/toys/dynamic}{Dynamic}
+\o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
+\o \l{declarative/toys/tvtennis}{TV Tennis}
+\o \l{declarative/toys/velocity}{Velocity}
+\endlist
+
+
 \section1 Demos
 
 \list
@@ -127,3 +169,4 @@ For example, from your build directory, run:
 \endlist
 
 */
+
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/declarative/extending-examples.qdoc
index 611dac1..577ab78 100644
--- a/doc/src/declarative/extending-examples.qdoc
+++ b/doc/src/declarative/extending-examples.qdoc
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 /*!
-\example declarative/extending/adding
+\example declarative/cppextensions/referenceexamples/adding
 \title Extending QML - Adding Types Example
 
 The Adding Types Example shows how to add a new element type, \c Person, to QML.
 The \c Person type can be used from QML like this:
 
-\snippet examples/declarative/extending/adding/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/example.qml 0
 
 \section1 Declare the Person class
 
@@ -55,11 +55,11 @@ with the two properties we want accessible on the QML type - name and shoeSize.
 Although in this example we use the same name for the C++ class as the QML 
 element, the C++ class can be named differently, or appear in a namespace.
 
-\snippet examples/declarative/extending/adding/person.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/person.h 0
 
 \section1 Define the Person class
 
-\snippet examples/declarative/extending/adding/person.cpp 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/person.cpp 0
 
 The Person class implementation is quite basic.  The property accessors simply
 return members of the object instance.
@@ -75,7 +75,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example declarative/extending/properties
+\example declarative/cppextensions/referenceexamples/properties
 \title Extending QML - Object and List Property Types Example
 
 This example builds on:
@@ -88,16 +88,16 @@ properties in QML.  This example adds a BirthdayParty element that specifies
 a birthday party, consisting of a celebrant and a list of guests.  People are
 specified using the People QML type built in the previous example.
 
-\snippet examples/declarative/extending/properties/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/example.qml 0
 
 \section1 Declare the BirthdayParty
 
 The BirthdayParty class is declared like this:
 
-\snippet examples/declarative/extending/properties/birthdayparty.h 0
-\snippet examples/declarative/extending/properties/birthdayparty.h 1
-\snippet examples/declarative/extending/properties/birthdayparty.h 2
-\snippet examples/declarative/extending/properties/birthdayparty.h 3
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 2
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 3
 
 The class contains a member to store the celebrant object, and also a 
 QList member.  
@@ -114,7 +114,7 @@ scenarios.
 
 The implementation of BirthdayParty property accessors is straight forward.
 
-\snippet examples/declarative/extending/properties/birthdayparty.cpp 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp 0
 
 \section1 Running the example
 
@@ -123,7 +123,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example declarative/extending/coercion
+\example declarative/cppextensions/referenceexamples/coercion
 \title Extending QML - Inheritance and Coercion Example
 
 This example builds on:
@@ -136,11 +136,11 @@ The Inheritance and Coercion Example shows how to use base classes to assign
 elements of more than one type to a property.  It specializes the Person element
 developed in the previous examples into two elements - a \c Boy and a \c Girl.
 
-\snippet examples/declarative/extending/coercion/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/example.qml 0
 
 \section1 Declare Boy and Girl
 
-\snippet examples/declarative/extending/coercion/person.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/person.h 0
 
 The Person class remains unaltered in this example and the Boy and Girl C++ 
 classes are trivial extensions of it.  As an example, the inheritance used here
@@ -155,7 +155,7 @@ previous example.  However, as we have repurposed the People class as a common
 base for Boy and Girl, we want to prevent it from being instantiated from QML
 directly - an explicit Boy or Girl should be instantiated instead.
 
-\snippet examples/declarative/extending/coercion/main.cpp 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/main.cpp 0
 
 While we want to disallow instantiating Person from within QML, it still needs
 to be registered with the QML engine, so that it can be used as a property type
@@ -165,7 +165,7 @@ and other types can be coerced to it.
 
 The implementation of Boy and Girl are trivial.
 
-\snippet examples/declarative/extending/coercion/person.cpp 1
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/person.cpp 1
 
 All that is necessary is to implement the constructor, and to register the types
 and their QML name with the QML engine.
@@ -175,7 +175,7 @@ and their QML name with the QML engine.
 The BirthdayParty element has not changed since the previous example.  The 
 celebrant and guests property still use the People type.  
 
-\snippet examples/declarative/extending/coercion/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h 0
 
 However, as all three types, Person, Boy and Girl, have been registered with the
 QML system, on assignment QML automatically (and type-safely) converts the Boy
@@ -186,7 +186,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example declarative/extending/default
+\example declarative/cppextensions/referenceexamples/default
 \title Extending QML - Default Property Example
 
 This example builds on:
@@ -200,14 +200,14 @@ The Default Property Example is a minor modification of the
 \l {Extending QML - Inheritance and Coercion Example} that simplifies the 
 specification of a BirthdayParty through the use of a default property.
 
-\snippet examples/declarative/extending/default/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/default/example.qml 0
 
 \section1 Declaring the BirthdayParty class
 
 The only difference between this example and the last, is the addition of the
 \c DefaultProperty class info annotation.  
 
-\snippet examples/declarative/extending/default/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h 0
 
 The default property specifies the property to assign to whenever an explicit 
 property is not specified, in the case of the BirthdayParty element the guest
@@ -222,7 +222,7 @@ loads and runs the QML snippet shown at the beginning of this page.
 */
 
 /*!
-\example declarative/extending/grouped
+\example declarative/cppextensions/referenceexamples/grouped
 \title Extending QML - Grouped Properties Example
 
 This example builds on:
@@ -236,7 +236,7 @@ This example builds on:
 */
 
 /*!
-\example declarative/extending/grouped
+\example declarative/cppextensions/referenceexamples/grouped
 \title Extending QML - Attached Properties Example
 
 This example builds on:
@@ -251,7 +251,7 @@ This example builds on:
 */
 
 /*!
-\example declarative/extending/signal
+\example declarative/cppextensions/referenceexamples/signal
 \title Extending QML - Signal Support Example
 
 This example builds on:
@@ -267,7 +267,7 @@ This example builds on:
 */
 
 /*!
-\example declarative/extending/valuesource
+\example declarative/cppextensions/referenceexamples/valuesource
 \title Extending QML - Property Value Source Example
 
 This example builds on:
@@ -284,7 +284,7 @@ This example builds on:
 */
 
 /*!
-\example declarative/extending/binding
+\example declarative/cppextensions/referenceexamples/binding
 \title Extending QML - Binding Example
 
 This example builds on:
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 1c159e4..5b695f7 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -56,7 +56,7 @@ QML for their own independent use.
 \section1 Adding Types
 \target adding-types
 
-\snippet examples/declarative/extending/adding/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/example.qml 0
 
 The QML snippet shown above instantiates one \c Person instance and sets
 the \c name and \c shoeSize properties on it.  Everything in QML ultimately comes down
@@ -121,7 +121,7 @@ the \c Person type.
 
 \section1 Object and List Property Types
 
-\snippet examples/declarative/extending/properties/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/example.qml 0
 
 The QML snippet shown above assigns a \c Person object to the \c BirthdayParty's
 \c host property, and assigns three \c Person objects to the guests property.
@@ -136,7 +136,7 @@ Properties that are pointers to objects or Qt interfaces are declared with the
 Q_PROPERTY() macro, just like other properties.  The \c host property
 declaration looks like this:
 
-\snippet examples/declarative/extending/properties/birthdayparty.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 1
 
 As long as the property type, in this case \c Person, is registered with QML the
 property can be assigned.
@@ -165,14 +165,14 @@ As with object properties, the type \a T must be registered with QML.
 
 The \c guest property declaration looks like this:
 
-\snippet examples/declarative/extending/properties/birthdayparty.h 2
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 2
 
 \l {Extending QML - Object and List Property Types Example} shows the complete
 code used to create the \c BirthdayParty type.
 
 \section1 Inheritance and Coercion
 
-\snippet examples/declarative/extending/coercion/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/example.qml 0
 
 The QML snippet shown above assigns a \c Boy object to the \c BirthdayParty's
 \c host property, and assigns three other objects to the \c guests property.
@@ -214,7 +214,7 @@ code used to create the \c Boy and \c Girl types.
 
 \section1 Default Property
 
-\snippet examples/declarative/extending/default/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/default/example.qml 0
 
 The QML snippet shown above assigns a collection of objects to the
 \c BirthdayParty's default property.
@@ -246,7 +246,7 @@ specify a default property.
 
 \section1 Grouped Properties
 
-\snippet examples/declarative/extending/grouped/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/grouped/example.qml 1
 
 The QML snippet shown above assigns a number of properties to the \c Boy object,
 including four properties using the grouped property syntax.
@@ -259,7 +259,7 @@ different types through implementation reuse.
 A grouped property block is implemented as a read-only object property.  The
 \c shoe property shown is declared like this:
 
-\snippet examples/declarative/extending/grouped/person.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/grouped/person.h 1
 
 The \c ShoeDescription type declares the properties available to the grouped
 property block - in this case the \c size, \c color, \c brand and \c price properties.
@@ -271,7 +271,7 @@ implement the \c shoe property grouping.
 
 \section1 Attached Properties
 
-\snippet examples/declarative/extending/attached/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/attached/example.qml 1
 
 The QML snippet shown above assigns a date to the \c rsvp property using the attached
 property syntax.
@@ -393,8 +393,8 @@ this situation, but it must not crash.
 
 \section1 Signal Support
 
-\snippet examples/declarative/extending/signal/example.qml 0
-\snippet examples/declarative/extending/signal/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/signal/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/signal/example.qml 1
 
 The QML snippet shown above associates the evaluation of a JavaScript expression
 with the emission of a Qt signal.
@@ -406,7 +406,7 @@ signal name: "on" is prepended, and the first letter of the signal name upper
 cased.  For example, the signal used in the example above has the following
 C++ signature:
 
-\snippet examples/declarative/extending/signal/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h 0
 
 In classes with multiple signals with the same name, only the final signal
 is accessible as a signal property.  Note that signals with the same name
@@ -424,8 +424,8 @@ implement the onPartyStarted signal property.
 
 \section1 Property Value Sources
 
-\snippet examples/declarative/extending/valuesource/example.qml 0
-\snippet examples/declarative/extending/valuesource/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 1
 
 The QML snippet shown above applies a property value source to the \c announcment property.
 A property value source generates a value for a property that changes over time.
@@ -440,7 +440,7 @@ The example shown here is rather contrived: the \c announcment property of the
 the \c HappyBirthdaySong value source generates the lyrics of the song
 "Happy Birthday".
 
-\snippet examples/declarative/extending/valuesource/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h 0
 
 Normally, assigning an object to a string property would not be allowed.  In
 the case of a property value source, rather than assigning the object instance
@@ -453,9 +453,9 @@ QDeclarativePropertyValueSource::setTarget(), that the QML engine invokes when
 associating the property value source with a property.  The relevant part of
 the \c HappyBirthdaySong type declaration looks like this:
 
-\snippet examples/declarative/extending/valuesource/happybirthdaysong.h 0
-\snippet examples/declarative/extending/valuesource/happybirthdaysong.h 1
-\snippet examples/declarative/extending/valuesource/happybirthdaysong.h 2
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h 2
 
 In all other respects, property value sources are regular QML types.  They must
 be registered with the QML engine using the same macros as other types, and can
@@ -471,8 +471,8 @@ implement the \c HappyBirthdaySong property value source.
 
 \section1 Property Binding
 
-\snippet examples/declarative/extending/binding/example.qml 0
-\snippet examples/declarative/extending/binding/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/binding/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/binding/example.qml 1
 
 The QML snippet shown above uses a property binding to ensure the
 \c HappyBirthdaySong's \c name property remains up to date with the \c host.
@@ -492,7 +492,7 @@ the property's value.  QML relies on the presence of a
 
 Here is the \c host property declaration:
 
-\snippet examples/declarative/extending/binding/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h 0
 
 The NOTIFY attribute is followed by a signal name.  It is the responsibility of
 the class implementer to ensure that whenever the property's value changes, the
@@ -531,7 +531,7 @@ subsequently change.  The most common case of this is when a type uses
 only freed when the object is deleted.  In these cases, the CONSTANT attribute
 may be added to the property declaration instead of a NOTIFY signal.
 
-\snippet examples/declarative/extending/binding/person.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/binding/person.h 0
 
 Extreme care must be taken here or applications using your type may misbehave.
 The CONSTANT attribute should only be used for properties whose value is set,
@@ -543,7 +543,7 @@ include NOTIFY signals for use in binding.
 
 \section1 Extension Objects
 
-\snippet examples/declarative/extending/extended/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/extended/example.qml 0
 
 The QML snippet shown above adds a new property to an existing C++ type without
 modifying its source code.
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index bc9830a..2a83e30 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -382,7 +382,7 @@ of QDeclarativeEngine::offlineStoragePath(), currently as SQLite databases.
 
 The API can be used from JavaScript functions in your QML:
 
-\quotefile declarative/sql/hello.qml
+\quotefile declarative/sqllocalstorage/hello.qml
 
 The API conforms to the Synchronous API of the HTML5 Web Database API,
 \link http://www.w3.org/TR/2009/WD-webdatabase-20091029/ W3C Working Draft 29 October 2009\endlink.
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 972976f..83380a1 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -110,7 +110,7 @@ of QML UIs:
 \section2 Loading QGraphicsWidget objects in QML
 
 An alternative approach is to expose your existing QGraphicsWidget objects to 
-QML and construct your scene in QML instead. See the \l {declarative/layouts/graphicsLayouts}{graphics layouts example}
+QML and construct your scene in QML instead. See the \l {declarative/cppextensions/qgraphicslayouts}{graphics layouts example}
 which shows how to expose Qt's graphics layout classes to QML in order
 to use QGraphicsWidget with classes like QGraphicsLinearLayout and QGraphicsGridLayout.
 
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 93e4a46..22113ee 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -40,79 +40,89 @@
 ****************************************************************************/
 
 /*!
-    \title Animations
-    \example declarative/animations
+    \title Animation basics
+    \example declarative/animation/basics
 
     This example shows how to use animations in QML.
 */
 
 /*!
-    \title AspectRatio
-    \example declarative/aspectratio
+    \title Behaviors
+    \example declarative/animation/behaviors
+*/
 
-    This example shows how to implement different aspect ratios in QML.
+/*!
+    \title Easing types
+    \example declarative/animation/easing
+
+    This example shows the different easing modes available for animations.
 */
 
 /*!
-    \example declarative/behaviors
-    \title Behaviors
+    \title States
+    \example declarative/animation/states
 */
 
 /*!
     \title Border Image
-    \example declarative/border-image
+    \example declarative/imageelements/borderimage
 
     This example shows how to use a BorderImage in QML.
 */
 
 /*!
-    \title Clocks
-    \example declarative/clocks
+    \title Image
+    \example declarative/imageelements/image
 
-    This example shows how to create a Clock component and reuse it in a grid.
+    This example shows uses of the \l Image element in QML.
 */
 
 /*!
-    \title Connections
-    \example declarative/connections
-
-    This example shows how to use a Connection element in QML.
+    \title Reference examples
+    \example declarative/cppextensions/referenceexamples
 */
 
 /*!
-    \title Dial
-    \example declarative/dial
+    \title Plugins
+    \example declarative/cppextensions/plugins
+*/
 
-    This example shows how to implement a dial in QML.
+/*!
+    \title QtWidgets
+    \example declarative/cppextensions/proxywidgets
 */
 
 /*!
-    \title Dynamic
-    \example declarative/dynamic
+    \title QGraphicsLayouts
+    \example declarative/cppextensions/qgraphicslayouts
+*/
 
-    This example shows how to create dynamic objects QML.
+/*!
+    \title Image Provider
+    \example declarative/cppextensions/imageprovider
 */
 
 /*!
-    \example declarative/extending
-    \title Extending
+    \title Network access manager
+    \example declarative/cppextensions/proxyviewer
 */
 
 /*!
-    \example declarative/fillmode
-    \title Fillmode
+    \title Internationlization
+    \example declarative/i18n
 */
 
 /*!
-    \title Flipable
-    \example declarative/flipable
+    \title Positioners
+    \example declarative/positioners
 
-    This example shows how to use a Flipable element in QML.
+    This example shows how to use positioner elements such as Row, Column,
+    Grid and Flow.
 */
 
 /*!
     \title Focus
-    \example declarative/focus
+    \example declarative/keyinteraction/focus
 
     This example shows how to handle keys and focus in QML.
 
@@ -120,141 +130,149 @@
 */
 
 /*!
-    \example declarative/fonts
-    \title Fonts
+    \title GridView
+    \example declarative/modelviews/gridview
 */
 
 /*!
-    \example declarative/gridview
-    \title GridView
+    \title ListView
+    \example declarative/modelviews/listview
 */
 
 /*!
-    \example declarative/imageprovider
-    \title Image Provider
+    \title Object ListModel
+    \example declarative/modelviews/objectlistmodel
 */
 
 /*!
-    \example declarative/images
-    \title Images
+    \title Package
+    \example declarative/modelviews/package
 */
 
 /*!
-    \example declarative/layouts
-    \title Layouts
+    \title Parallax
+    \example declarative/modelviews/parallax
 */
 
 /*!
-    \example declarative/listmodel-threaded
-    \title ListModel Threaded
+    \title String ListModel
+    \example declarative/modelviews/stringlistmodel
 */
 
 /*!
-    \example declarative/listview
-    \title ListView
+    \title WebView
+    \example declarative/modelviews/webview
 */
 
 /*!
-    \example declarative/mousearea
-    \title Mouse Area
+    \title SQL Local Storage
+    \example declarative/sqllocalstorage
 */
 
 /*!
-    \example declarative/objectlistmodel
-    \title Object ListModel
+    \title Fonts
+    \example declarative/text/fonts
 */
 
 /*!
-    \example declarative/package
-    \title Package
+    \title Threaded ListModel 
+    \example declarative/threading/threadedlistmodel
 */
 
 /*!
-    \example declarative/parallax
-    \title Parallax
+    \title WorkerScript
+    \example declarative/threading/workerscript
 */
 
 /*!
-    \example declarative/plugins
-    \title Plugins
+    \title Clocks
+    \example declarative/toys/clocks
+
+    This example shows how to create a Clock component and reuse it in a grid.
 */
 
 /*!
-    \example declarative/progressbar
-    \title Progress Bars
+    \title Dial
+    \example declarative/toys/dial
+
+    This example shows how to implement a dial in QML.
 */
 
 /*!
-    \example declarative/proxywidgets
-    \title Proxy Widgets
+    \title Dynamic
+    \example declarative/toys/dynamic
+
+    This example shows how to create dynamic objects QML.
 */
 
 /*!
-    \example declarative/scrollbar
-    \title Scrollbar
+    \title Tic-Tac-Toe
+    \example declarative/toys/tic-tac-toe
 */
 
 /*!
-    \example declarative/searchbox
-    \title Search Box
+    \title TV Tennis
+    \example declarative/toys/tvtennis
 */
 
 /*!
-    \example declarative/slideswitch
-    \title Slide Switch
+    \title Velocity
+    \example declarative/toys/velocity
 */
 
 /*!
-    \example declarative/sql
-    \title SQL
+    \title Gestures
+    \example declarative/touchinteraction/gestures
 */
 
 /*!
-    \example declarative/states
-    \title States
+    \title Mouse Area
+    \example declarative/touchinteraction/mousearea
 */
 
 /*!
-    \example declarative/stringlistmodel
-    \title String ListModel
+    \title Flipable
+    \example declarative/ui-components/flipable
+
+    This example shows how to use a Flipable element in QML.
 */
 
 /*!
-    \example declarative/tabwidget
-    \title Tab Widget
+    \title Progress Bars
+    \example declarative/ui-components/progressbar
 */
 
 /*!
-    \example declarative/tic-tac-toe
-    \title Tic-Tac-Toe
+    \title Scrollbar
+    \example declarative/ui-components/scrollbar
 */
 
 /*!
-    \example declarative/tvtennis
-    \title TV Tennis
+    \title Search Box
+    \example declarative/ui-components/searchbox
 */
 
 /*!
-    \example declarative/velocity
-    \title Velocity
+    \title Slide Switch
+    \example declarative/ui-components/slideswitch
 */
 
 /*!
-    \example declarative/webview
-    \title WebView
+    \title Spinner
+    \example declarative/ui-components/spinner
 */
 
 /*!
-    \example declarative/workerscript
-    \title WorkerScript
+    \title Tab Widget
+    \example declarative/ui-components/tabwidget
 */
 
 /*!
-    \example declarative/xmldata
     \title XML Data
+    \example declarative/xml/xmldata
 */
 
 /*!
-    \example declarative/xmlhttprequest
     \title XMLHttpRequest
+    \example declarative/xml/xmlhttprequest
 */
diff --git a/doc/src/snippets/declarative/border-image.qml b/doc/src/snippets/declarative/border-image.qml
deleted file mode 100644
index 9c4247e..0000000
--- a/doc/src/snippets/declarative/border-image.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-    color: "white"
-    width: 520; height: 280
-
-    Row {
-        anchors.centerIn: parent
-        spacing: 50
-//! [0]
-BorderImage {
-    width: 180; height: 180
-    border { left: 30; top: 30; right: 30; bottom: 30 }
-    horizontalTileMode: BorderImage.Stretch
-    verticalTileMode: BorderImage.Stretch
-    source: "content/colors.png"
-}
-
-BorderImage {
-    width: 180; height: 180
-    border { left: 30; top: 30; right: 30; bottom: 30 }
-    horizontalTileMode: BorderImage.Round
-    verticalTileMode: BorderImage.Round
-    source: "content/colors.png"
-}
-//! [0]
-    }
-}
diff --git a/doc/src/snippets/declarative/borderimage.qml b/doc/src/snippets/declarative/borderimage.qml
new file mode 100644
index 0000000..9c4247e
--- /dev/null
+++ b/doc/src/snippets/declarative/borderimage.qml
@@ -0,0 +1,29 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    color: "white"
+    width: 520; height: 280
+
+    Row {
+        anchors.centerIn: parent
+        spacing: 50
+//! [0]
+BorderImage {
+    width: 180; height: 180
+    border { left: 30; top: 30; right: 30; bottom: 30 }
+    horizontalTileMode: BorderImage.Stretch
+    verticalTileMode: BorderImage.Stretch
+    source: "content/colors.png"
+}
+
+BorderImage {
+    width: 180; height: 180
+    border { left: 30; top: 30; right: 30; bottom: 30 }
+    horizontalTileMode: BorderImage.Round
+    verticalTileMode: BorderImage.Round
+    source: "content/colors.png"
+}
+//! [0]
+    }
+}
diff --git a/examples/declarative/animation/animation.qmlproject b/examples/declarative/animation/animation.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/animation/animation.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/animation/basics/basics.qmlproject b/examples/declarative/animation/basics/basics.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/animation/basics/basics.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/animation/basics/color-animation.qml b/examples/declarative/animation/basics/color-animation.qml
new file mode 100644
index 0000000..61737e9
--- /dev/null
+++ b/examples/declarative/animation/basics/color-animation.qml
@@ -0,0 +1,70 @@
+import Qt 4.7
+import Qt.labs.particles 1.0
+
+Item {
+    id: window
+    width: 640; height: 480
+
+    // Let's draw the sky...
+    Rectangle {
+        anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }
+        gradient: Gradient {
+            GradientStop {
+                position: 0.0
+                SequentialAnimation on color {
+                    loops: Animation.Infinite
+                    ColorAnimation { from: "DeepSkyBlue"; to: "#0E1533"; duration: 5000 }
+                    ColorAnimation { from: "#0E1533"; to: "DeepSkyBlue"; duration: 5000 }
+                }
+            }
+            GradientStop {
+                position: 1.0
+                SequentialAnimation on color {
+                    loops: Animation.Infinite
+                    ColorAnimation { from: "SkyBlue"; to: "#437284"; duration: 5000 }
+                    ColorAnimation { from: "#437284"; to: "SkyBlue"; duration: 5000 }
+                }
+            }
+        }
+    }
+
+    // the sun, moon, and stars
+    Item {
+        width: parent.width; height: 2 * parent.height
+        NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite }
+        Image {
+            source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter
+            rotation: -3 * parent.rotation
+        }
+        Image {
+            source: "images/moon.png"; y: parent.height - 74; anchors.horizontalCenter: parent.horizontalCenter
+            rotation: -parent.rotation
+        }
+        Particles {
+            x: 0; y: parent.height/2; width: parent.width; height: parent.height/2
+            source: "images/star.png"; angleDeviation: 360; velocity: 0
+            velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800
+            SequentialAnimation on opacity {
+                loops: Animation.Infinite
+                NumberAnimation { from: 0; to: 1; duration: 5000 }
+                NumberAnimation { from: 1; to: 0; duration: 5000 }
+            }
+        }
+    }
+
+    // ...and the ground.
+    Rectangle {
+        anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }
+        gradient: Gradient {
+            GradientStop {
+                position: 0.0
+                SequentialAnimation on color {
+                    loops: Animation.Infinite
+                    ColorAnimation { from: "ForestGreen"; to: "#001600"; duration: 5000 }
+                    ColorAnimation { from: "#001600"; to: "ForestGreen"; duration: 5000 }
+                }
+            }
+            GradientStop { position: 1.0; color: "DarkGreen" }
+        }
+    }
+}
diff --git a/examples/declarative/animation/basics/images/face-smile.png b/examples/declarative/animation/basics/images/face-smile.png
new file mode 100644
index 0000000..3d66d72
Binary files /dev/null and b/examples/declarative/animation/basics/images/face-smile.png differ
diff --git a/examples/declarative/animation/basics/images/moon.png b/examples/declarative/animation/basics/images/moon.png
new file mode 100644
index 0000000..9407b2b
Binary files /dev/null and b/examples/declarative/animation/basics/images/moon.png differ
diff --git a/examples/declarative/animation/basics/images/shadow.png b/examples/declarative/animation/basics/images/shadow.png
new file mode 100644
index 0000000..8270565
Binary files /dev/null and b/examples/declarative/animation/basics/images/shadow.png differ
diff --git a/examples/declarative/animation/basics/images/star.png b/examples/declarative/animation/basics/images/star.png
new file mode 100644
index 0000000..27ef924
Binary files /dev/null and b/examples/declarative/animation/basics/images/star.png differ
diff --git a/examples/declarative/animation/basics/images/sun.png b/examples/declarative/animation/basics/images/sun.png
new file mode 100644
index 0000000..7713ca5
Binary files /dev/null and b/examples/declarative/animation/basics/images/sun.png differ
diff --git a/examples/declarative/animation/basics/property-animation.qml b/examples/declarative/animation/basics/property-animation.qml
new file mode 100644
index 0000000..87ac8ec
--- /dev/null
+++ b/examples/declarative/animation/basics/property-animation.qml
@@ -0,0 +1,63 @@
+import Qt 4.7
+
+Item {
+    id: window
+    width: 320; height: 480
+
+    // Let's draw the sky...
+    Rectangle {
+        anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "DeepSkyBlue" }
+            GradientStop { position: 1.0; color: "LightSkyBlue" }
+        }
+    }
+
+    // ...and the ground.
+    Rectangle {
+        anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "ForestGreen" }
+            GradientStop { position: 1.0; color: "DarkGreen" }
+        }
+    }
+
+    // The shadow for the smiley face
+    Image {
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "images/shadow.png"; y: smiley.minHeight + 58
+
+        // The scale property depends on the y position of the smiley face.
+        scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
+    }
+
+    Image {
+        id: smiley
+        property int maxHeight: window.height / 3
+        property int minHeight: 2 * window.height / 3
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "images/face-smile.png"; y: minHeight
+
+        // Animate the y property. Setting loops to Animation.Infinite makes the
+        // animation repeat indefinitely, otherwise it would only run once.
+        SequentialAnimation on y {
+            loops: Animation.Infinite
+
+            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
+            NumberAnimation {
+                from: smiley.minHeight; to: smiley.maxHeight
+                easing.type: Easing.OutExpo; duration: 300
+            }
+
+            // Then move back to minHeight in 1 second, using the OutBounce easing function
+            NumberAnimation {
+                from: smiley.maxHeight; to: smiley.minHeight
+                easing.type: Easing.OutBounce; duration: 1000
+            }
+
+            // Then pause for 500ms
+            PauseAnimation { duration: 500 }
+        }
+    }
+}
diff --git a/examples/declarative/animation/behaviors/SideRect.qml b/examples/declarative/animation/behaviors/SideRect.qml
new file mode 100644
index 0000000..d32bd7b
--- /dev/null
+++ b/examples/declarative/animation/behaviors/SideRect.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+
+Rectangle {
+    id: myRect
+
+    property string text
+
+    width: 75; height: 50
+    radius: 6
+    color: "#646464"
+    border.width: 4; border.color: "white"
+
+    MouseArea {
+        anchors.fill: parent
+        hoverEnabled: true
+        onEntered: {
+            focusRect.x = myRect.x; 
+            focusRect.y = myRect.y; 
+            focusRect.text = myRect.text;
+        }
+    }
+}
diff --git a/examples/declarative/animation/behaviors/behavior-example.qml b/examples/declarative/animation/behaviors/behavior-example.qml
new file mode 100644
index 0000000..1f17b81
--- /dev/null
+++ b/examples/declarative/animation/behaviors/behavior-example.qml
@@ -0,0 +1,79 @@
+import Qt 4.7
+
+Rectangle {
+    width: 600; height: 400
+    color: "#343434"
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: 200; height: 200
+        radius: 30
+        color: "transparent"
+        border.width: 4; border.color: "white"
+
+
+        SideRect {
+            id: leftRect
+            anchors { verticalCenter: parent.verticalCenter; horizontalCenter: parent.left }
+            text: "Left"
+        }
+
+        SideRect {
+            id: rightRect
+            anchors { verticalCenter: parent.verticalCenter; horizontalCenter: parent.right }
+            text: "Right"
+        }
+
+        SideRect {
+            id: topRect
+            anchors { verticalCenter: parent.top; horizontalCenter: parent.horizontalCenter }
+            text: "Top"
+        }
+
+        SideRect {
+            id: bottomRect
+            anchors { verticalCenter: parent.bottom; horizontalCenter: parent.horizontalCenter }
+            text: "Bottom"
+        }
+
+
+        Rectangle {
+            id: focusRect
+
+            property string text
+
+            x: 62.5; y: 75; width: 75; height: 50
+            radius: 6
+            border.width: 4; border.color: "white"
+            color: "firebrick"
+
+            // Setting an 'elastic' behavior on the focusRect's x property.
+            Behavior on x {
+                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
+            }
+
+            // Setting an 'elastic' behavior on the focusRect's y property.
+            Behavior on y {
+                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
+            }
+
+            Text {
+                id: focusText
+                text: focusRect.text
+                anchors.centerIn: parent
+                color: "white"
+                font.pixelSize: 16; font.bold: true
+
+                // Setting a behavior on the focusText's x property:
+                // Set the opacity to 0, set the new text value, then set the opacity back to 1.
+                Behavior on text {
+                    SequentialAnimation {
+                        NumberAnimation { target: focusText; property: "opacity"; to: 0; duration: 150 }
+                        PropertyAction { }
+                        NumberAnimation { target: focusText; property: "opacity"; to: 1; duration: 150 }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/animation/behaviors/behaviors.qmlproject b/examples/declarative/animation/behaviors/behaviors.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/animation/behaviors/behaviors.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/animation/easing/easing.qml b/examples/declarative/animation/easing/easing.qml
new file mode 100644
index 0000000..939d43b
--- /dev/null
+++ b/examples/declarative/animation/easing/easing.qml
@@ -0,0 +1,105 @@
+import Qt 4.7
+
+Rectangle {
+    id: window
+    width: 600; height: 460; color: "#232323"
+
+    ListModel {
+        id: easingTypes
+        ListElement { name: "Easing.Linear"; type: Easing.Linear; ballColor: "DarkRed" }
+        ListElement { name: "Easing.InQuad"; type: Easing.InQuad; ballColor: "IndianRed" }
+        ListElement { name: "Easing.OutQuad"; type: Easing.OutQuad; ballColor: "Salmon" }
+        ListElement { name: "Easing.InOutQuad"; type: Easing.InOutQuad; ballColor: "Tomato" }
+        ListElement { name: "Easing.OutInQuad"; type: Easing.OutInQuad; ballColor: "DarkOrange" }
+        ListElement { name: "Easing.InCubic"; type: Easing.InCubic; ballColor: "Gold" }
+        ListElement { name: "Easing.OutCubic"; type: Easing.OutCubic; ballColor: "Yellow" }
+        ListElement { name: "Easing.InOutCubic"; type: Easing.InOutCubic; ballColor: "PeachPuff" }
+        ListElement { name: "Easing.OutInCubic"; type: Easing.OutInCubic; ballColor: "Thistle" }
+        ListElement { name: "Easing.InQuart"; type: Easing.InQuart; ballColor: "Orchid" }
+        ListElement { name: "Easing.OutQuart"; type: Easing.OutQuart; ballColor: "Purple" }
+        ListElement { name: "Easing.InOutQuart"; type: Easing.InOutQuart; ballColor: "SlateBlue" }
+        ListElement { name: "Easing.OutInQuart"; type: Easing.OutInQuart; ballColor: "Chartreuse" }
+        ListElement { name: "Easing.InQuint"; type: Easing.InQuint; ballColor: "LimeGreen" }
+        ListElement { name: "Easing.OutQuint"; type: Easing.OutQuint; ballColor: "SeaGreen" }
+        ListElement { name: "Easing.InOutQuint"; type: Easing.InOutQuint; ballColor: "DarkGreen" }
+        ListElement { name: "Easing.OutInQuint"; type: Easing.OutInQuint; ballColor: "Olive" }
+        ListElement { name: "Easing.InSine"; type: Easing.InSine; ballColor: "DarkSeaGreen" }
+        ListElement { name: "Easing.OutSine"; type: Easing.OutSine; ballColor: "Teal" }
+        ListElement { name: "Easing.InOutSine"; type: Easing.InOutSine; ballColor: "Turquoise" }
+        ListElement { name: "Easing.OutInSine"; type: Easing.OutInSine; ballColor: "SteelBlue" }
+        ListElement { name: "Easing.InExpo"; type: Easing.InExpo; ballColor: "SkyBlue" }
+        ListElement { name: "Easing.OutExpo"; type: Easing.OutExpo; ballColor: "RoyalBlue" }
+        ListElement { name: "Easing.InOutExpo"; type: Easing.InOutExpo; ballColor: "MediumBlue" }
+        ListElement { name: "Easing.OutInExpo"; type: Easing.OutInExpo; ballColor: "MidnightBlue" }
+        ListElement { name: "Easing.InCirc"; type: Easing.InCirc; ballColor: "CornSilk" }
+        ListElement { name: "Easing.OutCirc"; type: Easing.OutCirc; ballColor: "Bisque" }
+        ListElement { name: "Easing.InOutCirc"; type: Easing.InOutCirc; ballColor: "RosyBrown" }
+        ListElement { name: "Easing.OutInCirc"; type: Easing.OutInCirc; ballColor: "SandyBrown" }
+        ListElement { name: "Easing.InElastic"; type: Easing.InElastic; ballColor: "DarkGoldenRod" }
+        ListElement { name: "Easing.InElastic"; type: Easing.OutElastic; ballColor: "Chocolate" }
+        ListElement { name: "Easing.InOutElastic"; type: Easing.InOutElastic; ballColor: "SaddleBrown" }
+        ListElement { name: "Easing.OutInElastic"; type: Easing.OutInElastic; ballColor: "Brown" }
+        ListElement { name: "Easing.InBack"; type: Easing.InBack; ballColor: "Maroon" }
+        ListElement { name: "Easing.OutBack"; type: Easing.OutBack; ballColor: "LavenderBlush" }
+        ListElement { name: "Easing.InOutBack"; type: Easing.InOutBack; ballColor: "MistyRose" }
+        ListElement { name: "Easing.OutInBack"; type: Easing.OutInBack; ballColor: "Gainsboro" }
+        ListElement { name: "Easing.OutBounce"; type: Easing.OutBounce; ballColor: "Silver" }
+        ListElement { name: "Easing.InBounce"; type: Easing.InBounce; ballColor: "DimGray" }
+        ListElement { name: "Easing.InOutBounce"; type: Easing.InOutBounce; ballColor: "SlateGray" }
+        ListElement { name: "Easing.OutInBounce"; type: Easing.OutInBounce; ballColor: "DarkSlateGray" }
+    }
+
+    Component {
+        id: delegate
+
+        Item {
+            height: 42; width: window.width
+
+            Text { text: name; anchors.centerIn: parent; color: "White" }
+
+            Rectangle {
+                id: slot1; color: "#121212"; x: 30; height: 32; width: 32
+                border.color: "#343434"; border.width: 1; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Rectangle {
+                id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32
+                border.color: "#343434"; border.width: 1; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
+            }
+
+            Rectangle {
+                id: rect; x: 30; color: "#454545"
+                border.color: "White"; border.width: 2
+                height: 32; width: 32; radius: 8
+                anchors.verticalCenter: parent.verticalCenter
+
+                MouseArea {
+                    onClicked: if (rect.state == '') rect.state = "right"; else rect.state = ''
+                    anchors.fill: parent
+                }
+
+                states : State {
+                    name: "right"
+                    PropertyChanges { target: rect; x: window.width - 62; color: ballColor }
+                }
+
+                transitions: Transition {
+                    NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
+                    ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
+                }
+            }
+        }
+    }
+
+    Flickable {
+        anchors.fill: parent; contentHeight: layout.height
+
+        Column {
+            id: layout
+            anchors.left: parent.left; anchors.right: parent.right
+            Repeater { model: easingTypes; delegate: delegate }
+        }
+    }
+}
diff --git a/examples/declarative/animation/easing/easing.qmlproject b/examples/declarative/animation/easing/easing.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/animation/easing/easing.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/animation/states/states.qml b/examples/declarative/animation/states/states.qml
new file mode 100644
index 0000000..4429e78
--- /dev/null
+++ b/examples/declarative/animation/states/states.qml
@@ -0,0 +1,61 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    width: 640; height: 480
+    color: "#343434"
+
+    Image { 
+        id: userIcon
+        x: topLeftRect.x; y: topLeftRect.y
+        source: "user.png"
+    }
+
+    Rectangle {
+        id: topLeftRect
+
+        anchors { left: parent.left; top: parent.top; leftMargin: 10; topMargin: 20 }
+        width: 64; height: 64
+        color: "Transparent"; border.color: "Gray"; radius: 6
+
+        // Clicking in here sets the state to the default state, returning the image to
+        // its initial position
+        MouseArea { anchors.fill: parent; onClicked: page.state = '' }
+    }
+
+    Rectangle {
+        id: middleRightRect
+
+        anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 20 }
+        width: 64; height: 64
+        color: "Transparent"; border.color: "Gray"; radius: 6
+
+        // Clicking in here sets the state to 'middleRight'
+        MouseArea { anchors.fill: parent; onClicked: page.state = 'middleRight' }
+    }
+
+    Rectangle {
+        id: bottomLeftRect
+
+        anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 20 }
+        width: 64; height: 64
+        color: "Transparent"; border.color: "Gray"; radius: 6
+
+        // Clicking in here sets the state to 'bottomLeft'
+        MouseArea { anchors.fill: parent; onClicked: page.state = 'bottomLeft' }
+    }
+
+    states: [
+        // In state 'middleRight', move the image to middleRightRect
+        State {
+            name: "middleRight"
+            PropertyChanges { target: userIcon; x: middleRightRect.x; y: middleRightRect.y }
+        },
+
+        // In state 'bottomLeft', move the image to bottomLeftRect
+        State {
+            name: "bottomLeft"
+            PropertyChanges { target: userIcon; x: bottomLeftRect.x; y: bottomLeftRect.y  }
+        }
+    ]
+}
diff --git a/examples/declarative/animation/states/states.qmlproject b/examples/declarative/animation/states/states.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/animation/states/states.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/animation/states/transitions.qml b/examples/declarative/animation/states/transitions.qml
new file mode 100644
index 0000000..ccc7060
--- /dev/null
+++ b/examples/declarative/animation/states/transitions.qml
@@ -0,0 +1,90 @@
+import Qt 4.7
+
+/*
+    This is exactly the same as states.qml, except that we have appended
+    a set of transitions to apply animations when the item changes 
+    between each state.
+*/
+
+Rectangle {
+    id: page
+    width: 640; height: 480
+    color: "#343434"
+
+    Image { 
+        id: userIcon
+        x: topLeftRect.x; y: topLeftRect.y
+        source: "user.png"
+    }
+
+    Rectangle {
+        id: topLeftRect
+
+        anchors { left: parent.left; top: parent.top; leftMargin: 10; topMargin: 20 }
+        width: 64; height: 64
+        color: "Transparent"; border.color: "Gray"; radius: 6
+
+        // Clicking in here sets the state to the default state, returning the image to
+        // its initial position
+        MouseArea { anchors.fill: parent; onClicked: page.state = '' }
+    }
+
+    Rectangle {
+        id: middleRightRect
+
+        anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 20 }
+        width: 64; height: 64
+        color: "Transparent"; border.color: "Gray"; radius: 6
+
+        // Clicking in here sets the state to 'middleRight'
+        MouseArea { anchors.fill: parent; onClicked: page.state = 'middleRight' }
+    }
+
+    Rectangle {
+        id: bottomLeftRect
+
+        anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 20 }
+        width: 64; height: 64
+        color: "Transparent"; border.color: "Gray"; radius: 6
+
+        // Clicking in here sets the state to 'bottomLeft'
+        MouseArea { anchors.fill: parent; onClicked: page.state = 'bottomLeft' }
+    }
+
+    states: [
+        // In state 'middleRight', move the image to middleRightRect
+        State {
+            name: "middleRight"
+            PropertyChanges { target: userIcon; x: middleRightRect.x; y: middleRightRect.y }
+        },
+
+        // In state 'bottomLeft', move the image to bottomLeftRect
+        State {
+            name: "bottomLeft"
+            PropertyChanges { target: userIcon; x: bottomLeftRect.x; y: bottomLeftRect.y  }
+        }
+    ]
+
+    // Transitions define how the properties change when the item moves between each state
+    transitions: [
+
+        // When transitioning to 'middleRight' move x,y over a duration of 1 second,
+        // with OutBounce easing function.
+        Transition {
+            from: "*"; to: "middleRight"
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce; duration: 1000 }
+        },
+
+        // When transitioning to 'bottomLeft' move x,y over a duration of 2 seconds,
+        // with InOutQuad easing function.
+        Transition {
+            from: "*"; to: "bottomLeft"
+            NumberAnimation { properties: "x,y"; easing.type: Easing.InOutQuad; duration: 2000 }
+        },
+
+        // For any other state changes move x,y linearly over duration of 200ms.
+        Transition {
+            NumberAnimation { properties: "x,y"; duration: 200 }
+        }
+    ]
+}
diff --git a/examples/declarative/animation/states/user.png b/examples/declarative/animation/states/user.png
new file mode 100644
index 0000000..dd7d7a2
Binary files /dev/null and b/examples/declarative/animation/states/user.png differ
diff --git a/examples/declarative/animations/animations.qmlproject b/examples/declarative/animations/animations.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/animations/animations.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animations/color-animation.qml
deleted file mode 100644
index 61737e9..0000000
--- a/examples/declarative/animations/color-animation.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import Qt 4.7
-import Qt.labs.particles 1.0
-
-Item {
-    id: window
-    width: 640; height: 480
-
-    // Let's draw the sky...
-    Rectangle {
-        anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }
-        gradient: Gradient {
-            GradientStop {
-                position: 0.0
-                SequentialAnimation on color {
-                    loops: Animation.Infinite
-                    ColorAnimation { from: "DeepSkyBlue"; to: "#0E1533"; duration: 5000 }
-                    ColorAnimation { from: "#0E1533"; to: "DeepSkyBlue"; duration: 5000 }
-                }
-            }
-            GradientStop {
-                position: 1.0
-                SequentialAnimation on color {
-                    loops: Animation.Infinite
-                    ColorAnimation { from: "SkyBlue"; to: "#437284"; duration: 5000 }
-                    ColorAnimation { from: "#437284"; to: "SkyBlue"; duration: 5000 }
-                }
-            }
-        }
-    }
-
-    // the sun, moon, and stars
-    Item {
-        width: parent.width; height: 2 * parent.height
-        NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite }
-        Image {
-            source: "images/sun.png"; y: 10; anchors.horizontalCenter: parent.horizontalCenter
-            rotation: -3 * parent.rotation
-        }
-        Image {
-            source: "images/moon.png"; y: parent.height - 74; anchors.horizontalCenter: parent.horizontalCenter
-            rotation: -parent.rotation
-        }
-        Particles {
-            x: 0; y: parent.height/2; width: parent.width; height: parent.height/2
-            source: "images/star.png"; angleDeviation: 360; velocity: 0
-            velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800
-            SequentialAnimation on opacity {
-                loops: Animation.Infinite
-                NumberAnimation { from: 0; to: 1; duration: 5000 }
-                NumberAnimation { from: 1; to: 0; duration: 5000 }
-            }
-        }
-    }
-
-    // ...and the ground.
-    Rectangle {
-        anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }
-        gradient: Gradient {
-            GradientStop {
-                position: 0.0
-                SequentialAnimation on color {
-                    loops: Animation.Infinite
-                    ColorAnimation { from: "ForestGreen"; to: "#001600"; duration: 5000 }
-                    ColorAnimation { from: "#001600"; to: "ForestGreen"; duration: 5000 }
-                }
-            }
-            GradientStop { position: 1.0; color: "DarkGreen" }
-        }
-    }
-}
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
deleted file mode 100644
index 939d43b..0000000
--- a/examples/declarative/animations/easing.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: window
-    width: 600; height: 460; color: "#232323"
-
-    ListModel {
-        id: easingTypes
-        ListElement { name: "Easing.Linear"; type: Easing.Linear; ballColor: "DarkRed" }
-        ListElement { name: "Easing.InQuad"; type: Easing.InQuad; ballColor: "IndianRed" }
-        ListElement { name: "Easing.OutQuad"; type: Easing.OutQuad; ballColor: "Salmon" }
-        ListElement { name: "Easing.InOutQuad"; type: Easing.InOutQuad; ballColor: "Tomato" }
-        ListElement { name: "Easing.OutInQuad"; type: Easing.OutInQuad; ballColor: "DarkOrange" }
-        ListElement { name: "Easing.InCubic"; type: Easing.InCubic; ballColor: "Gold" }
-        ListElement { name: "Easing.OutCubic"; type: Easing.OutCubic; ballColor: "Yellow" }
-        ListElement { name: "Easing.InOutCubic"; type: Easing.InOutCubic; ballColor: "PeachPuff" }
-        ListElement { name: "Easing.OutInCubic"; type: Easing.OutInCubic; ballColor: "Thistle" }
-        ListElement { name: "Easing.InQuart"; type: Easing.InQuart; ballColor: "Orchid" }
-        ListElement { name: "Easing.OutQuart"; type: Easing.OutQuart; ballColor: "Purple" }
-        ListElement { name: "Easing.InOutQuart"; type: Easing.InOutQuart; ballColor: "SlateBlue" }
-        ListElement { name: "Easing.OutInQuart"; type: Easing.OutInQuart; ballColor: "Chartreuse" }
-        ListElement { name: "Easing.InQuint"; type: Easing.InQuint; ballColor: "LimeGreen" }
-        ListElement { name: "Easing.OutQuint"; type: Easing.OutQuint; ballColor: "SeaGreen" }
-        ListElement { name: "Easing.InOutQuint"; type: Easing.InOutQuint; ballColor: "DarkGreen" }
-        ListElement { name: "Easing.OutInQuint"; type: Easing.OutInQuint; ballColor: "Olive" }
-        ListElement { name: "Easing.InSine"; type: Easing.InSine; ballColor: "DarkSeaGreen" }
-        ListElement { name: "Easing.OutSine"; type: Easing.OutSine; ballColor: "Teal" }
-        ListElement { name: "Easing.InOutSine"; type: Easing.InOutSine; ballColor: "Turquoise" }
-        ListElement { name: "Easing.OutInSine"; type: Easing.OutInSine; ballColor: "SteelBlue" }
-        ListElement { name: "Easing.InExpo"; type: Easing.InExpo; ballColor: "SkyBlue" }
-        ListElement { name: "Easing.OutExpo"; type: Easing.OutExpo; ballColor: "RoyalBlue" }
-        ListElement { name: "Easing.InOutExpo"; type: Easing.InOutExpo; ballColor: "MediumBlue" }
-        ListElement { name: "Easing.OutInExpo"; type: Easing.OutInExpo; ballColor: "MidnightBlue" }
-        ListElement { name: "Easing.InCirc"; type: Easing.InCirc; ballColor: "CornSilk" }
-        ListElement { name: "Easing.OutCirc"; type: Easing.OutCirc; ballColor: "Bisque" }
-        ListElement { name: "Easing.InOutCirc"; type: Easing.InOutCirc; ballColor: "RosyBrown" }
-        ListElement { name: "Easing.OutInCirc"; type: Easing.OutInCirc; ballColor: "SandyBrown" }
-        ListElement { name: "Easing.InElastic"; type: Easing.InElastic; ballColor: "DarkGoldenRod" }
-        ListElement { name: "Easing.InElastic"; type: Easing.OutElastic; ballColor: "Chocolate" }
-        ListElement { name: "Easing.InOutElastic"; type: Easing.InOutElastic; ballColor: "SaddleBrown" }
-        ListElement { name: "Easing.OutInElastic"; type: Easing.OutInElastic; ballColor: "Brown" }
-        ListElement { name: "Easing.InBack"; type: Easing.InBack; ballColor: "Maroon" }
-        ListElement { name: "Easing.OutBack"; type: Easing.OutBack; ballColor: "LavenderBlush" }
-        ListElement { name: "Easing.InOutBack"; type: Easing.InOutBack; ballColor: "MistyRose" }
-        ListElement { name: "Easing.OutInBack"; type: Easing.OutInBack; ballColor: "Gainsboro" }
-        ListElement { name: "Easing.OutBounce"; type: Easing.OutBounce; ballColor: "Silver" }
-        ListElement { name: "Easing.InBounce"; type: Easing.InBounce; ballColor: "DimGray" }
-        ListElement { name: "Easing.InOutBounce"; type: Easing.InOutBounce; ballColor: "SlateGray" }
-        ListElement { name: "Easing.OutInBounce"; type: Easing.OutInBounce; ballColor: "DarkSlateGray" }
-    }
-
-    Component {
-        id: delegate
-
-        Item {
-            height: 42; width: window.width
-
-            Text { text: name; anchors.centerIn: parent; color: "White" }
-
-            Rectangle {
-                id: slot1; color: "#121212"; x: 30; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            Rectangle {
-                id: slot2; color: "#121212"; x: window.width - 62; height: 32; width: 32
-                border.color: "#343434"; border.width: 1; radius: 8
-                anchors.verticalCenter: parent.verticalCenter
-            }
-
-            Rectangle {
-                id: rect; x: 30; color: "#454545"
-                border.color: "White"; border.width: 2
-                height: 32; width: 32; radius: 8
-                anchors.verticalCenter: parent.verticalCenter
-
-                MouseArea {
-                    onClicked: if (rect.state == '') rect.state = "right"; else rect.state = ''
-                    anchors.fill: parent
-                }
-
-                states : State {
-                    name: "right"
-                    PropertyChanges { target: rect; x: window.width - 62; color: ballColor }
-                }
-
-                transitions: Transition {
-                    NumberAnimation { properties: "x"; easing.type: type; duration: 1000 }
-                    ColorAnimation { properties: "color"; easing.type: type; duration: 1000 }
-                }
-            }
-        }
-    }
-
-    Flickable {
-        anchors.fill: parent; contentHeight: layout.height
-
-        Column {
-            id: layout
-            anchors.left: parent.left; anchors.right: parent.right
-            Repeater { model: easingTypes; delegate: delegate }
-        }
-    }
-}
diff --git a/examples/declarative/animations/images/face-smile.png b/examples/declarative/animations/images/face-smile.png
deleted file mode 100644
index 3d66d72..0000000
Binary files a/examples/declarative/animations/images/face-smile.png and /dev/null differ
diff --git a/examples/declarative/animations/images/moon.png b/examples/declarative/animations/images/moon.png
deleted file mode 100644
index 9407b2b..0000000
Binary files a/examples/declarative/animations/images/moon.png and /dev/null differ
diff --git a/examples/declarative/animations/images/shadow.png b/examples/declarative/animations/images/shadow.png
deleted file mode 100644
index 8270565..0000000
Binary files a/examples/declarative/animations/images/shadow.png and /dev/null differ
diff --git a/examples/declarative/animations/images/star.png b/examples/declarative/animations/images/star.png
deleted file mode 100644
index 27ef924..0000000
Binary files a/examples/declarative/animations/images/star.png and /dev/null differ
diff --git a/examples/declarative/animations/images/sun.png b/examples/declarative/animations/images/sun.png
deleted file mode 100644
index 7713ca5..0000000
Binary files a/examples/declarative/animations/images/sun.png and /dev/null differ
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml
deleted file mode 100644
index 87ac8ec..0000000
--- a/examples/declarative/animations/property-animation.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: window
-    width: 320; height: 480
-
-    // Let's draw the sky...
-    Rectangle {
-        anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter }
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "DeepSkyBlue" }
-            GradientStop { position: 1.0; color: "LightSkyBlue" }
-        }
-    }
-
-    // ...and the ground.
-    Rectangle {
-        anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom }
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "ForestGreen" }
-            GradientStop { position: 1.0; color: "DarkGreen" }
-        }
-    }
-
-    // The shadow for the smiley face
-    Image {
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "images/shadow.png"; y: smiley.minHeight + 58
-
-        // The scale property depends on the y position of the smiley face.
-        scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
-    }
-
-    Image {
-        id: smiley
-        property int maxHeight: window.height / 3
-        property int minHeight: 2 * window.height / 3
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "images/face-smile.png"; y: minHeight
-
-        // Animate the y property. Setting loops to Animation.Infinite makes the
-        // animation repeat indefinitely, otherwise it would only run once.
-        SequentialAnimation on y {
-            loops: Animation.Infinite
-
-            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
-            NumberAnimation {
-                from: smiley.minHeight; to: smiley.maxHeight
-                easing.type: Easing.OutExpo; duration: 300
-            }
-
-            // Then move back to minHeight in 1 second, using the OutBounce easing function
-            NumberAnimation {
-                from: smiley.maxHeight; to: smiley.minHeight
-                easing.type: Easing.OutBounce; duration: 1000
-            }
-
-            // Then pause for 500ms
-            PauseAnimation { duration: 500 }
-        }
-    }
-}
diff --git a/examples/declarative/aspectratio/aspectratio.qmlproject b/examples/declarative/aspectratio/aspectratio.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/aspectratio/aspectratio.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/aspectratio/face_fit.qml b/examples/declarative/aspectratio/face_fit.qml
deleted file mode 100644
index 52cd4c2..0000000
--- a/examples/declarative/aspectratio/face_fit.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.7
-
-// Here, we implement a hybrid of the "scale to fit" and "scale and crop"
-// behaviours which will crop up to 25% from *one* dimension if necessary
-// to fully scale the other. This is a realistic algorithm, for example
-// when the edges of the image contain less vital information than the
-// center - such as a face.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        anchors.centerIn: parent
-        source: "pics/face.png"
-        x: (parent.width-width*scale)/2
-        y: (parent.height-height*scale)/2
-        scale: Math.max(Math.min(parent.width/width*1.333,parent.height/height),
-                        Math.min(parent.width/width,parent.height/height*1.333))
-    }
-}
diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml
deleted file mode 100644
index 63fc9c6..0000000
--- a/examples/declarative/aspectratio/face_fit_animated.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import Qt 4.7
-
-// Here, we extend the "face_fit" example with animation to show how truly
-// diverse and usage-specific behaviours are made possible by NOT putting a
-// hard-coded aspect ratio feature into the Image primitive.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        anchors.centerIn: parent
-        source: "pics/face.png"
-        x: (parent.width-width*scale)/2
-        y: (parent.height-height*scale)/2
-        SpringFollow on scale {
-            to: Math.max(Math.min(face.parent.width/face.width*1.333,face.parent.height/face.height),
-                         Math.min(face.parent.width/face.width,face.parent.height/face.height*1.333))
-            spring: 1
-            damping: 0.05
-        }
-    }
-}
diff --git a/examples/declarative/aspectratio/pics/face.png b/examples/declarative/aspectratio/pics/face.png
deleted file mode 100644
index 3d66d72..0000000
Binary files a/examples/declarative/aspectratio/pics/face.png and /dev/null differ
diff --git a/examples/declarative/aspectratio/scale_and_crop.qml b/examples/declarative/aspectratio/scale_and_crop.qml
deleted file mode 100644
index a438104..0000000
--- a/examples/declarative/aspectratio/scale_and_crop.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.7
-
-// Here, we implement "Scale and Crop" behaviour.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        anchors.centerIn: parent
-        source: "pics/face.png"
-        x: (parent.width-width*scale)/2
-        y: (parent.height-height*scale)/2
-        scale: Math.max(parent.width/width,parent.height/height)
-    }
-}
diff --git a/examples/declarative/aspectratio/scale_and_crop_simple.qml b/examples/declarative/aspectratio/scale_and_crop_simple.qml
deleted file mode 100644
index 1160ec5..0000000
--- a/examples/declarative/aspectratio/scale_and_crop_simple.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.7
-
-// Here, we implement "Scale to Fit" behaviour, using the
-// fillMode property.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        source: "pics/face.png"
-        fillMode: Image.PreserveAspectCrop
-        anchors.fill: parent
-    }
-}
diff --git a/examples/declarative/aspectratio/scale_and_sidecrop.qml b/examples/declarative/aspectratio/scale_and_sidecrop.qml
deleted file mode 100644
index 5593ab8..0000000
--- a/examples/declarative/aspectratio/scale_and_sidecrop.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.7
-
-// Here, we implement a variant of "Scale and Crop" behaviour, where we
-// crop the sides if necessary to fully fit vertically, but not the reverse.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        anchors.centerIn: parent
-        source: "pics/face.png"
-        x: (parent.width-width*scale)/2
-        y: (parent.height-height*scale)/2
-        scale: parent.height/height
-    }
-}
diff --git a/examples/declarative/aspectratio/scale_to_fit.qml b/examples/declarative/aspectratio/scale_to_fit.qml
deleted file mode 100644
index 724a36e..0000000
--- a/examples/declarative/aspectratio/scale_to_fit.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.7
-
-// Here, we implement "Scale to Fit" behaviour "manually", rather
-// than using the preserveAspect property.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        anchors.centerIn: parent
-        source: "pics/face.png"
-        x: (parent.width-width*scale)/2
-        y: (parent.height-height*scale)/2
-        scale: Math.min(parent.width/width,parent.height/height)
-    }
-}
diff --git a/examples/declarative/aspectratio/scale_to_fit_simple.qml b/examples/declarative/aspectratio/scale_to_fit_simple.qml
deleted file mode 100644
index 0e960b4..0000000
--- a/examples/declarative/aspectratio/scale_to_fit_simple.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.7
-
-// Here, we implement "Scale to Fit" behaviour, using the
-// fillMode property.
-//
-Rectangle {
-    // default size: whole image, unscaled
-    width: face.width
-    height: face.height
-    color: "gray"
-    clip: true
-
-    Image {
-        id: face
-        smooth: true
-        source: "pics/face.png"
-        fillMode: Image.PreserveAspectFit
-        anchors.fill: parent
-    }
-}
diff --git a/examples/declarative/behaviors/SideRect.qml b/examples/declarative/behaviors/SideRect.qml
deleted file mode 100644
index d32bd7b..0000000
--- a/examples/declarative/behaviors/SideRect.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: myRect
-
-    property string text
-
-    width: 75; height: 50
-    radius: 6
-    color: "#646464"
-    border.width: 4; border.color: "white"
-
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        onEntered: {
-            focusRect.x = myRect.x; 
-            focusRect.y = myRect.y; 
-            focusRect.text = myRect.text;
-        }
-    }
-}
diff --git a/examples/declarative/behaviors/behavior-example.qml b/examples/declarative/behaviors/behavior-example.qml
deleted file mode 100644
index 1f17b81..0000000
--- a/examples/declarative/behaviors/behavior-example.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 600; height: 400
-    color: "#343434"
-
-    Rectangle {
-        anchors.centerIn: parent
-        width: 200; height: 200
-        radius: 30
-        color: "transparent"
-        border.width: 4; border.color: "white"
-
-
-        SideRect {
-            id: leftRect
-            anchors { verticalCenter: parent.verticalCenter; horizontalCenter: parent.left }
-            text: "Left"
-        }
-
-        SideRect {
-            id: rightRect
-            anchors { verticalCenter: parent.verticalCenter; horizontalCenter: parent.right }
-            text: "Right"
-        }
-
-        SideRect {
-            id: topRect
-            anchors { verticalCenter: parent.top; horizontalCenter: parent.horizontalCenter }
-            text: "Top"
-        }
-
-        SideRect {
-            id: bottomRect
-            anchors { verticalCenter: parent.bottom; horizontalCenter: parent.horizontalCenter }
-            text: "Bottom"
-        }
-
-
-        Rectangle {
-            id: focusRect
-
-            property string text
-
-            x: 62.5; y: 75; width: 75; height: 50
-            radius: 6
-            border.width: 4; border.color: "white"
-            color: "firebrick"
-
-            // Setting an 'elastic' behavior on the focusRect's x property.
-            Behavior on x {
-                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
-            }
-
-            // Setting an 'elastic' behavior on the focusRect's y property.
-            Behavior on y {
-                NumberAnimation { easing.type: Easing.OutElastic; easing.amplitude: 3.0; easing.period: 2.0; duration: 300 }
-            }
-
-            Text {
-                id: focusText
-                text: focusRect.text
-                anchors.centerIn: parent
-                color: "white"
-                font.pixelSize: 16; font.bold: true
-
-                // Setting a behavior on the focusText's x property:
-                // Set the opacity to 0, set the new text value, then set the opacity back to 1.
-                Behavior on text {
-                    SequentialAnimation {
-                        NumberAnimation { target: focusText; property: "opacity"; to: 0; duration: 150 }
-                        PropertyAction { }
-                        NumberAnimation { target: focusText; property: "opacity"; to: 1; duration: 150 }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/behaviors/behaviors.qmlproject b/examples/declarative/behaviors/behaviors.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/behaviors/behaviors.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/border-image/border-image.qml b/examples/declarative/border-image/border-image.qml
deleted file mode 100644
index c334cea..0000000
--- a/examples/declarative/border-image/border-image.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    id: page
-    width: 1030; height: 540
-
-    Grid {
-        anchors.centerIn: parent; spacing: 20
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
-            source: "content/colors.png"; margin: 30
-            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
-        }
-
-        MyBorderImage {
-            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
-            source: "content/bw.png"; margin: 10
-            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
-        }
-    }
-}
diff --git a/examples/declarative/border-image/border-image.qmlproject b/examples/declarative/border-image/border-image.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/border-image/border-image.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/border-image/content/MyBorderImage.qml b/examples/declarative/border-image/content/MyBorderImage.qml
deleted file mode 100644
index b47df7b..0000000
--- a/examples/declarative/border-image/content/MyBorderImage.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: container
-
-    property alias horizontalMode: image.horizontalTileMode
-    property alias verticalMode: image.verticalTileMode
-    property alias source: image.source
-
-    property int minWidth
-    property int minHeight
-    property int maxWidth
-    property int maxHeight
-    property int margin
-
-    width: 240; height: 240
-
-    BorderImage {
-        id: image; anchors.centerIn: parent
-
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation {
-                from: container.minWidth; to: container.maxWidth
-                duration: 2000; easing.type: Easing.InOutQuad
-            }
-            NumberAnimation {
-                from: container.maxWidth; to: container.minWidth
-                duration: 2000; easing.type: Easing.InOutQuad
-            }
-        }
-
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation {
-                from: container.minHeight; to: container.maxHeight
-                duration: 2000; easing.type: Easing.InOutQuad
-            }
-            NumberAnimation {
-                from: container.maxHeight; to: container.minHeight
-                duration: 2000; easing.type: Easing.InOutQuad
-            }
-        }
-
-        border.top: container.margin
-        border.left: container.margin
-        border.bottom: container.margin
-        border.right: container.margin
-    }
-}
diff --git a/examples/declarative/border-image/content/ShadowRectangle.qml b/examples/declarative/border-image/content/ShadowRectangle.qml
deleted file mode 100644
index 629478b..0000000
--- a/examples/declarative/border-image/content/ShadowRectangle.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.7
-
-Item {
-    property alias color : rectangle.color
-
-    BorderImage {
-        anchors.fill: rectangle
-        anchors { leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8 }
-        border { left: 10; top: 10; right: 10; bottom: 10 }
-        source: "shadow.png"; smooth: true
-    }
-
-    Rectangle { id: rectangle; anchors.fill: parent }
-}
diff --git a/examples/declarative/border-image/content/bw.png b/examples/declarative/border-image/content/bw.png
deleted file mode 100644
index 486eaae..0000000
Binary files a/examples/declarative/border-image/content/bw.png and /dev/null differ
diff --git a/examples/declarative/border-image/content/colors-round.sci b/examples/declarative/border-image/content/colors-round.sci
deleted file mode 100644
index 506f6f5..0000000
--- a/examples/declarative/border-image/content/colors-round.sci
+++ /dev/null
@@ -1,7 +0,0 @@
-border.left:30
-border.top:30
-border.right:30
-border.bottom:30
-horizontalTileRule:Round
-verticalTileRule:Round
-source:colors.png
diff --git a/examples/declarative/border-image/content/colors-stretch.sci b/examples/declarative/border-image/content/colors-stretch.sci
deleted file mode 100644
index e4989a7..0000000
--- a/examples/declarative/border-image/content/colors-stretch.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left:30
-border.top:30
-border.right:30
-border.bottom:30
-source:colors.png
diff --git a/examples/declarative/border-image/content/colors.png b/examples/declarative/border-image/content/colors.png
deleted file mode 100644
index dfb62f3..0000000
Binary files a/examples/declarative/border-image/content/colors.png and /dev/null differ
diff --git a/examples/declarative/border-image/content/shadow.png b/examples/declarative/border-image/content/shadow.png
deleted file mode 100644
index 431af85..0000000
Binary files a/examples/declarative/border-image/content/shadow.png and /dev/null differ
diff --git a/examples/declarative/border-image/shadows.qml b/examples/declarative/border-image/shadows.qml
deleted file mode 100644
index a08d133..0000000
--- a/examples/declarative/border-image/shadows.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    id: window
-
-    width: 480; height: 320
-    color: "gray"
-
-    ShadowRectangle {
-        anchors.centerIn: parent; width: 250; height: 250
-        color: "lightsteelblue"
-    }
-
-    ShadowRectangle {
-        anchors.centerIn: parent; width: 200; height: 200
-        color: "steelblue"
-    }
-
-    ShadowRectangle {
-        anchors.centerIn: parent; width: 150; height: 150
-        color: "thistle"
-    }
-}
diff --git a/examples/declarative/clocks/clocks.qml b/examples/declarative/clocks/clocks.qml
deleted file mode 100644
index 22cf820..0000000
--- a/examples/declarative/clocks/clocks.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    width: 640; height: 240
-    color: "#646464"
-
-    Row {
-        anchors.centerIn: parent
-        Clock { city: "New York"; shift: -4 }
-        Clock { city: "Mumbai"; shift: 5.5 }
-        Clock { city: "Tokyo"; shift: 9 }
-    }
-}
diff --git a/examples/declarative/clocks/clocks.qmlproject b/examples/declarative/clocks/clocks.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/clocks/clocks.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/clocks/content/Clock.qml b/examples/declarative/clocks/content/Clock.qml
deleted file mode 100644
index 3426e6a..0000000
--- a/examples/declarative/clocks/content/Clock.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: clock
-    width: 200; height: 230
-
-    property alias city: cityLabel.text
-    property variant hours
-    property variant minutes
-    property variant seconds
-    property variant shift : 0
-    property bool night: false
-
-    function timeChanged() {
-        var date = new Date;
-        hours = shift ? date.getUTCHours() + Math.floor(clock.shift) : date.getHours()
-        night = ( hours < 7 || hours > 19 )
-        minutes = shift ? date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes()
-        seconds = date.getUTCSeconds();
-    }
-
-    Timer {
-        interval: 100; running: true; repeat: true; triggeredOnStart: true
-        onTriggered: clock.timeChanged()
-    }
-
-    Image { id: background; source: "clock.png"; visible: clock.night == false }
-    Image { source: "clock-night.png"; visible: clock.night == true }
-
-    Image {
-        x: 92.5; y: 27
-        source: "hour.png"
-        smooth: true
-        transform: Rotation {
-            id: hourRotation
-            origin.x: 7.5; origin.y: 73; angle: 0
-            SpringFollow on angle {
-                spring: 2; damping: 0.2; modulus: 360
-                to: (clock.hours * 30) + (clock.minutes * 0.5)
-            }
-        }
-    }
-
-    Image {
-        x: 93.5; y: 17
-        source: "minute.png"
-        smooth: true
-        transform: Rotation {
-            id: minuteRotation
-            origin.x: 6.5; origin.y: 83; angle: 0
-            SpringFollow on angle {
-                spring: 2; damping: 0.2; modulus: 360
-                to: clock.minutes * 6
-            }
-        }
-    }
-
-    Image {
-        x: 97.5; y: 20
-        source: "second.png"
-        smooth: true
-        transform: Rotation {
-            id: secondRotation
-            origin.x: 2.5; origin.y: 80; angle: 0
-            SpringFollow on angle {
-                spring: 5; damping: 0.25; modulus: 360
-                to: clock.seconds * 6
-            }
-        }
-    }
-
-    Image {
-        anchors.centerIn: background; source: "center.png"
-    }
-
-    Text {
-        id: cityLabel
-        y: 200; anchors.horizontalCenter: parent.horizontalCenter
-        color: "white"
-        font.bold: true; font.pixelSize: 14
-        style: Text.Raised; styleColor: "black"
-    }
-}
diff --git a/examples/declarative/clocks/content/background.png b/examples/declarative/clocks/content/background.png
deleted file mode 100644
index a885950..0000000
Binary files a/examples/declarative/clocks/content/background.png and /dev/null differ
diff --git a/examples/declarative/clocks/content/center.png b/examples/declarative/clocks/content/center.png
deleted file mode 100755
index 7fbd802..0000000
Binary files a/examples/declarative/clocks/content/center.png and /dev/null differ
diff --git a/examples/declarative/clocks/content/clock-night.png b/examples/declarative/clocks/content/clock-night.png
deleted file mode 100755
index cc7151a..0000000
Binary files a/examples/declarative/clocks/content/clock-night.png and /dev/null differ
diff --git a/examples/declarative/clocks/content/clock.png b/examples/declarative/clocks/content/clock.png
deleted file mode 100755
index 462edac..0000000
Binary files a/examples/declarative/clocks/content/clock.png and /dev/null differ
diff --git a/examples/declarative/clocks/content/hour.png b/examples/declarative/clocks/content/hour.png
deleted file mode 100755
index f8061a1..0000000
Binary files a/examples/declarative/clocks/content/hour.png and /dev/null differ
diff --git a/examples/declarative/clocks/content/minute.png b/examples/declarative/clocks/content/minute.png
deleted file mode 100755
index 1297ec7..0000000
Binary files a/examples/declarative/clocks/content/minute.png and /dev/null differ
diff --git a/examples/declarative/clocks/content/second.png b/examples/declarative/clocks/content/second.png
deleted file mode 100755
index 4aa9fb5..0000000
Binary files a/examples/declarative/clocks/content/second.png and /dev/null differ
diff --git a/examples/declarative/connections/connections-example.qml b/examples/declarative/connections/connections-example.qml
deleted file mode 100644
index e65a280..0000000
--- a/examples/declarative/connections/connections-example.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    id: window
-
-    property int angle: 0
-
-    width: 640; height: 480
-    color: "#646464"
-
-    Image {
-        id: image
-        source: "content/bg1.jpg"
-        anchors.centerIn: parent
-        rotation: window.angle
-
-        Behavior on rotation {
-            NumberAnimation { easing.type: Easing.OutCubic; duration: 300 }
-        }
-    }
-
-    Button {
-        id: leftButton
-        image: "content/rotate-left.png"
-        anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 10 }
-    }
-
-    Button {
-        id: rightButton
-        image: "content/rotate-right.png"
-        anchors { right: parent.right; bottom: parent.bottom; rightMargin: 10; bottomMargin: 10 }
-    }
-
-    Connections { target: leftButton; onClicked: window.angle -= 90 }
-    Connections { target: rightButton; onClicked: window.angle += 90 }
-}
diff --git a/examples/declarative/connections/connections.qmlproject b/examples/declarative/connections/connections.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/connections/connections.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/connections/content/Button.qml b/examples/declarative/connections/content/Button.qml
deleted file mode 100644
index f95afbb..0000000
--- a/examples/declarative/connections/content/Button.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: button
-    width: 48; height: 48
-
-    property alias image: icon.source
-    signal clicked
-
-    Image { id: icon }
-    MouseArea { anchors.fill: icon; onClicked: button.clicked() }
-}
diff --git a/examples/declarative/connections/content/bg1.jpg b/examples/declarative/connections/content/bg1.jpg
deleted file mode 100644
index dfc7cee..0000000
Binary files a/examples/declarative/connections/content/bg1.jpg and /dev/null differ
diff --git a/examples/declarative/connections/content/rotate-left.png b/examples/declarative/connections/content/rotate-left.png
deleted file mode 100644
index c30387e..0000000
Binary files a/examples/declarative/connections/content/rotate-left.png and /dev/null differ
diff --git a/examples/declarative/connections/content/rotate-right.png b/examples/declarative/connections/content/rotate-right.png
deleted file mode 100644
index 1b05674..0000000
Binary files a/examples/declarative/connections/content/rotate-right.png and /dev/null differ
diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/declarative/cppextensions/cppextensions.pro
new file mode 100644
index 0000000..caa6092
--- /dev/null
+++ b/examples/declarative/cppextensions/cppextensions.pro
@@ -0,0 +1,10 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    imageprovider \
+    plugins \
+    proxyviewer \
+    proxywidgets \
+    qgraphicslayouts \
+    referenceexamples
+
diff --git a/examples/declarative/cppextensions/cppextensions.qmlproject b/examples/declarative/cppextensions/cppextensions.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/cppextensions.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
new file mode 100644
index 0000000..1028590
--- /dev/null
+++ b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
@@ -0,0 +1,2 @@
+plugin imageprovider
+
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
new file mode 100644
index 0000000..d774112
--- /dev/null
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+import "ImageProviderCore"
+//![0]
+ListView {
+    width: 100; height: 100
+    anchors.fill: parent
+
+    model: myModel
+
+    delegate: Component {
+        Item {
+            width: 100
+            height: 50
+            Text {
+                text: "Loading..."
+                anchors.centerIn: parent
+            }
+            Image {
+                source: modelData
+                sourceSize: "50x25"
+            }
+        }
+    }
+}
+//![0]
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
new file mode 100644
index 0000000..4c4aa94
--- /dev/null
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** 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 demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not 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 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/*
+   This example illustrates using a QDeclarativeImageProvider to serve
+   images asynchronously.
+*/
+
+//![0]
+class ColorImageProvider : public QDeclarativeImageProvider
+{
+public:
+    // This is run in a low priority thread.
+    QImage request(const QString &id, QSize *size, const QSize &req_size)
+    {
+        if (size) *size = QSize(100,50);
+        QImage image(
+                req_size.width() > 0 ? req_size.width() : 100,
+                req_size.height() > 0 ? req_size.height() : 50,
+                QImage::Format_RGB32);
+        image.fill(QColor(id).rgba());
+        QPainter p(&image);
+        QFont f = p.font();
+        f.setPixelSize(30);
+        p.setFont(f);
+        p.setPen(Qt::black);
+        if (req_size.isValid())
+            p.scale(req_size.width()/100.0, req_size.height()/50.0);
+        p.drawText(QRectF(0,0,100,50),Qt::AlignCenter,id);
+        return image;
+    }
+};
+
+
+class ImageProviderExtensionPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    void registerTypes(const char *uri) {
+        Q_UNUSED(uri);
+
+    }
+
+    void initializeEngine(QDeclarativeEngine *engine, const char *uri) {
+        Q_UNUSED(uri);
+
+        engine->addImageProvider("colors", new ColorImageProvider);
+
+        QStringList dataList;
+        dataList.append("image://colors/red");
+        dataList.append("image://colors/green");
+        dataList.append("image://colors/blue");
+        dataList.append("image://colors/brown");
+        dataList.append("image://colors/orange");
+        dataList.append("image://colors/purple");
+        dataList.append("image://colors/yellow");
+
+        QDeclarativeContext *ctxt = engine->rootContext();
+        ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+    }
+
+};
+
+#include "imageprovider.moc"
+
+Q_EXPORT_PLUGIN(ImageProviderExtensionPlugin);
+//![0]
+
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
new file mode 100644
index 0000000..945a301
--- /dev/null
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -0,0 +1,25 @@
+TEMPLATE = lib
+TARGET  = imageprovider
+QT += declarative
+CONFIG += qt plugin
+
+TARGET = $$qtLibraryTarget($$TARGET)
+DESTDIR = ImageProviderCore
+
+# Input
+SOURCES += imageprovider.cpp
+
+sources.files = $$SOURCES imageprovider.qml imageprovider.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider
+
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
+
+ImageProviderCore_sources.files = \
+    ImageProviderCore/qmldir 
+ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
+
+symbian:{
+    TARGET.EPOCALLOWDLLDATA=1
+}
+
+INSTALLS = sources ImageProviderCore_sources target
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject b/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/plugins/README b/examples/declarative/cppextensions/plugins/README
new file mode 100644
index 0000000..fe519f8
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/README
@@ -0,0 +1,9 @@
+This example shows a module "com.nokia.TimeExample" that is implemented
+by a C++ plugin (providing the "Time" type), and by QML files (providing the
+"Clock" type).
+
+To run:
+
+  make install
+  qml -I . plugins.qml
+
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
new file mode 100644
index 0000000..0048372
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
@@ -0,0 +1,50 @@
+import Qt 4.7
+
+Rectangle {
+    id: clock
+    width: 200; height: 200; color: "gray"
+
+    property alias city: cityLabel.text
+    property variant hours
+    property variant minutes
+    property variant shift : 0
+
+    Image { id: background; source: "clock.png" }
+
+    Image {
+        x: 92.5; y: 27
+        source: "hour.png"
+        smooth: true
+        transform: Rotation {
+            id: hourRotation
+            origin.x: 7.5; origin.y: 73; angle: 0
+            SpringFollow on angle {
+                spring: 2; damping: 0.2; modulus: 360
+                to: (clock.hours * 30) + (clock.minutes * 0.5)
+            }
+        }
+    }
+
+    Image {
+        x: 93.5; y: 17
+        source: "minute.png"
+        smooth: true
+        transform: Rotation {
+            id: minuteRotation
+            origin.x: 6.5; origin.y: 83; angle: 0
+            SpringFollow on angle {
+                spring: 2; damping: 0.2; modulus: 360
+                to: clock.minutes * 6
+            }
+        }
+    }
+
+    Image {
+        anchors.centerIn: background; source: "center.png"
+    }
+
+    Text {
+        id: cityLabel; font.bold: true; font.pixelSize: 14; y:200; color: "white"
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+}
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
new file mode 100644
index 0000000..7fbd802
Binary files /dev/null and b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png differ
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
new file mode 100644
index 0000000..462edac
Binary files /dev/null and b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png differ
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
new file mode 100644
index 0000000..f8061a1
Binary files /dev/null and b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png differ
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
new file mode 100644
index 0000000..1297ec7
Binary files /dev/null and b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png differ
diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
new file mode 100644
index 0000000..e9ef115
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
@@ -0,0 +1,2 @@
+Clock 1.0 Clock.qml
+plugin qtimeexampleqmlplugin
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
new file mode 100644
index 0000000..fb51b0c
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+// Implements a "TimeModel" class with hour and minute properties
+// that change on-the-minute yet efficiently sleep the rest
+// of the time.
+
+class MinuteTimer : public QObject
+{
+    Q_OBJECT
+public:
+    MinuteTimer(QObject *parent) : QObject(parent)
+    {
+    }
+
+    void start()
+    {
+        if (!timer.isActive()) {
+            time = QTime::currentTime();
+            timer.start(60000-time.second()*1000, this);
+        }
+    }
+
+    void stop()
+    {
+        timer.stop();
+    }
+
+    int hour() const { return time.hour(); }
+    int minute() const { return time.minute(); }
+
+signals:
+    void timeChanged();
+
+protected:
+    void timerEvent(QTimerEvent *)
+    {
+        QTime now = QTime::currentTime();
+        if (now.second() == 59 && now.minute() == time.minute() && now.hour() == time.hour()) {
+            // just missed time tick over, force it, wait extra 0.5 seconds
+            time.addSecs(60);
+            timer.start(60500, this);
+        } else {
+            time = now;
+            timer.start(60000-time.second()*1000, this);
+        }
+        emit timeChanged();
+    }
+
+private:
+    QTime time;
+    QBasicTimer timer;
+};
+
+class TimeModel : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int hour READ hour NOTIFY timeChanged)
+    Q_PROPERTY(int minute READ minute NOTIFY timeChanged)
+
+public:
+    TimeModel(QObject *parent=0) : QObject(parent)
+    {
+        if (++instances == 1) {
+            if (!timer)
+                timer = new MinuteTimer(qApp);
+            connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
+            timer->start();
+        }
+    }
+
+    ~TimeModel()
+    {
+        if (--instances == 0) {
+            timer->stop();
+        }
+    }
+
+    int minute() const { return timer->minute(); }
+    int hour() const { return timer->hour(); }
+
+signals:
+    void timeChanged();
+
+private:
+    QTime t;
+    static MinuteTimer *timer;
+    static int instances;
+};
+
+int TimeModel::instances=0;
+MinuteTimer *TimeModel::timer=0;
+
+class QExampleQmlPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample"));
+        qmlRegisterType(uri, 1, 0, "Time");
+    }
+};
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(qtimeexampleqmlplugin, QExampleQmlPlugin);
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
new file mode 100644
index 0000000..b501ae3
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -0,0 +1,31 @@
+TEMPLATE = lib
+DESTDIR = com/nokia/TimeExample
+TARGET  = qtimeexampleqmlplugin
+CONFIG += qt plugin
+QT += declarative
+
+SOURCES += plugin.cpp
+
+qdeclarativesources.files += \
+    com/nokia/TimeExample/qmldir \
+    com/nokia/TimeExample/center.png \
+    com/nokia/TimeExample/clock.png \
+    com/nokia/TimeExample/Clock.qml \
+    com/nokia/TimeExample/hour.png \
+    com/nokia/TimeExample/minute.png
+
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
+
+sources.files += plugins.pro plugin.cpp plugins.qml README
+sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
+
+target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
+
+symbian:{
+    TARGET.EPOCALLOWDLLDATA=1
+}
+
+
+INSTALLS += qdeclarativesources sources target
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/declarative/cppextensions/plugins/plugins.qml b/examples/declarative/cppextensions/plugins/plugins.qml
new file mode 100644
index 0000000..449cd9a
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/plugins.qml
@@ -0,0 +1,11 @@
+import com.nokia.TimeExample 1.0 // import types from the plugin
+
+Clock { // this class is defined in QML (com/nokia/TimeExample/Clock.qml)
+
+    Time { // this class is defined in C++ (plugin.cpp)
+        id: time
+    }
+
+    hours: time.hour
+    minutes: time.minute
+}
diff --git a/examples/declarative/cppextensions/plugins/plugins.qmlproject b/examples/declarative/cppextensions/plugins/plugins.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/plugins/plugins.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/proxyviewer/main.cpp b/examples/declarative/cppextensions/proxyviewer/main.cpp
new file mode 100644
index 0000000..b82d2c9
--- /dev/null
+++ b/examples/declarative/cppextensions/proxyviewer/main.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** 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 demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not 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 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+
+/*
+   This example illustrates using a QNetworkAccessManagerFactory to
+   create a QNetworkAccessManager with a proxy.
+
+   Usage:
+     proxyviewer [-host  -port ] [file]
+*/
+
+static QString proxyHost;
+static int proxyPort = 0;
+
+class MyNetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+{
+public:
+    virtual QNetworkAccessManager *create(QObject *parent);
+};
+
+QNetworkAccessManager *MyNetworkAccessManagerFactory::create(QObject *parent)
+{
+    QNetworkAccessManager *nam = new QNetworkAccessManager(parent);
+    if (!proxyHost.isEmpty()) {
+        qDebug() << "Created QNetworkAccessManager using proxy" << (proxyHost + ":" + QString::number(proxyPort));
+        QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy, proxyHost, proxyPort);
+        nam->setProxy(proxy);
+    }
+
+    return nam;
+}
+
+int main(int argc, char ** argv)
+{
+    QUrl source("qrc:view.qml");
+
+    QApplication app(argc, argv);
+
+    for (int i = 1; i < argc; ++i) {
+        QString arg(argv[i]);
+        if (arg == "-host" && i < argc-1) {
+            proxyHost = argv[++i];
+        } else if (arg == "-port" && i < argc-1) {
+            arg = argv[++i];
+            proxyPort = arg.toInt();
+        } else if (arg[0] != '-') {
+            source = QUrl::fromLocalFile(arg);
+        } else {
+            qWarning() << "Usage: proxyviewer [-host  -port ] [file]";
+            exit(1);
+        }
+    }
+
+    QDeclarativeView view;
+    view.engine()->setNetworkAccessManagerFactory(new MyNetworkAccessManagerFactory);
+
+    view.setSource(source);
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/examples/declarative/cppextensions/proxyviewer/proxyviewer.pro b/examples/declarative/cppextensions/proxyviewer/proxyviewer.pro
new file mode 100644
index 0000000..b6bfa7f
--- /dev/null
+++ b/examples/declarative/cppextensions/proxyviewer/proxyviewer.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+TARGET = proxyviewer
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative network
+
+# Input
+SOURCES += main.cpp 
+RESOURCES += proxyviewer.qrc
diff --git a/examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc b/examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc
new file mode 100644
index 0000000..17e9301
--- /dev/null
+++ b/examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc
@@ -0,0 +1,5 @@
+
+
+    view.qml
+
+
diff --git a/examples/declarative/cppextensions/proxyviewer/view.qml b/examples/declarative/cppextensions/proxyviewer/view.qml
new file mode 100644
index 0000000..7f1bdef
--- /dev/null
+++ b/examples/declarative/cppextensions/proxyviewer/view.qml
@@ -0,0 +1,7 @@
+import Qt 4.7
+
+Image {
+    width: 100
+    height: 100
+    source: "http://qt.nokia.com/logo.png"
+}
diff --git a/examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir b/examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir
new file mode 100644
index 0000000..e55267c
--- /dev/null
+++ b/examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir
@@ -0,0 +1 @@
+plugin proxywidgetsplugin
diff --git a/examples/declarative/cppextensions/proxywidgets/README b/examples/declarative/cppextensions/proxywidgets/README
new file mode 100644
index 0000000..f50fa22
--- /dev/null
+++ b/examples/declarative/cppextensions/proxywidgets/README
@@ -0,0 +1,4 @@
+To run:
+
+  make install
+  qml proxywidgets.qml
diff --git a/examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp b/examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp
new file mode 100644
index 0000000..067eb2c
--- /dev/null
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include 
+
+class MyPushButton : public QGraphicsProxyWidget
+{
+    Q_OBJECT
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
+
+public:
+    MyPushButton(QGraphicsItem* parent = 0)
+        : QGraphicsProxyWidget(parent)
+    {
+        widget = new QPushButton("MyPushButton");
+        widget->setAttribute(Qt::WA_NoSystemBackground);
+        setWidget(widget);
+
+        QObject::connect(widget, SIGNAL(clicked(bool)), this, SIGNAL(clicked(bool)));
+    }
+
+    QString text() const
+    {
+        return widget->text();
+    }
+
+    void setText(const QString& text)
+    {
+        if (text != widget->text()) {
+            widget->setText(text);
+            emit textChanged();
+        }
+    }
+
+Q_SIGNALS:
+    void clicked(bool);
+    void textChanged();
+
+private:
+    QPushButton *widget;
+};
+
+class ProxyWidgetsPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    void registerTypes(const char *uri)
+    {
+        qmlRegisterType(uri, 1, 0, "MyPushButton");
+    }
+};
+
+#include "proxywidgets.moc"
+
+Q_EXPORT_PLUGIN2(proxywidgetsplugin, ProxyWidgetsPlugin);
diff --git a/examples/declarative/cppextensions/proxywidgets/proxywidgets.pro b/examples/declarative/cppextensions/proxywidgets/proxywidgets.pro
new file mode 100644
index 0000000..cb07d80
--- /dev/null
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.pro
@@ -0,0 +1,21 @@
+TEMPLATE = lib
+DESTDIR = ProxyWidgets
+TARGET  = proxywidgetsplugin
+CONFIG += qt plugin
+QT += declarative
+
+SOURCES += proxywidgets.cpp
+
+sources.files += proxywidgets.pro proxywidgets.cpp proxywidgets.qml
+
+sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
+
+target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
+
+INSTALLS += sources target
+
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+
+symbian:{
+    TARGET.EPOCALLOWDLLDATA = 1
+}
\ No newline at end of file
diff --git a/examples/declarative/cppextensions/proxywidgets/proxywidgets.qml b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qml
new file mode 100644
index 0000000..88de37f
--- /dev/null
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qml
@@ -0,0 +1,70 @@
+import Qt 4.7
+import "ProxyWidgets" 1.0
+
+Rectangle {
+    id: window
+
+    property int margin: 30
+
+    width: 640; height: 480
+    color: palette.window
+
+    SystemPalette { id: palette }
+
+    MyPushButton {
+        id: button1
+        x: margin; y: margin
+        text: "Right"
+        transformOriginPoint: Qt.point(width / 2, height / 2)
+
+        onClicked: window.state = "right"
+    }
+
+    MyPushButton {
+        id: button2
+        x: margin; y: margin + 30
+        text: "Bottom"
+        transformOriginPoint: Qt.point(width / 2, height / 2)
+
+        onClicked: window.state = "bottom"
+    }
+
+    MyPushButton {
+        id: button3
+        x: margin; y: margin + 60
+        text: "Quit"
+        transformOriginPoint: Qt.point(width / 2, height / 2)
+
+        onClicked: Qt.quit()
+    }
+
+    states: [
+        State {
+            name: "right"
+            PropertyChanges { target: button1; x: window.width - width - margin; text: "Left"; onClicked: window.state = "" }
+            PropertyChanges { target: button2; x: window.width - width - margin }
+            PropertyChanges { target: button3; x: window.width - width - margin }
+            PropertyChanges { target: window; color: Qt.darker(palette.window) }
+        },
+        State {
+            name: "bottom"
+            PropertyChanges { target: button1; y: window.height - height - margin; rotation: 180 }
+            PropertyChanges {
+                target: button2
+                x: button1.x + button1.width + 10; y: window.height - height - margin
+                rotation: 180
+                text: "Top"
+                onClicked: window.state = ""
+            }
+            PropertyChanges { target: button3; x: button2.x + button2.width + 10; y: window.height - height - margin;  rotation: 180 }
+            PropertyChanges { target: window; color: Qt.lighter(palette.window) }
+        }
+    ]
+
+    transitions: Transition {
+        ParallelAnimation {
+            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: Easing.OutQuad }
+            ColorAnimation { target: window; duration: 600 }
+        }
+    }
+}
diff --git a/examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
new file mode 100644
index 0000000..25cf994
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
@@ -0,0 +1,366 @@
+/****************************************************************************
+**
+** 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 "graphicslayouts_p.h"
+
+#include 
+#include 
+
+QT_BEGIN_NAMESPACE
+
+LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
+: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
+{
+}
+
+void LinearLayoutAttached::setStretchFactor(int f)
+{
+    if (_stretch == f)
+        return;
+
+    _stretch = f;
+    emit stretchChanged(reinterpret_cast(parent()), _stretch);
+}
+
+void LinearLayoutAttached::setSpacing(int s)
+{
+    if (_spacing == s)
+        return;
+
+    _spacing = s;
+    emit spacingChanged(reinterpret_cast(parent()), _spacing);
+}
+
+void LinearLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
+}
+
+QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+Q_UNUSED(which);
+Q_UNUSED(constraint);
+return QSizeF();
+}
+
+
+QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+{
+}
+
+void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+{
+insertItem(index, item);
+
+//connect attached properties
+if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
+    setStretchFactor(item, obj->stretchFactor());
+    setAlignment(item, obj->alignment());
+    updateSpacing(item, obj->spacing());
+    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
+                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsLinearLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsLinearLayoutObject::contentsMargin() const
+{
+    qreal a,b,c,d;
+    getContentsMargins(&a, &b, &c, &d);
+    if(a==b && a==c && a==d)
+        return a;
+    return -1;
+}
+
+void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m,m,m,m);
+}
+
+void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+{
+QGraphicsLinearLayout::setStretchFactor(item, stretch);
+}
+
+void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
+{
+    for(int i=0; i < count(); i++){
+        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
+            QGraphicsLinearLayout::setItemSpacing(i, spacing);
+            return;
+        }
+    }
+}
+
+void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsLinearLayout::setAlignment(item, alignment);
+}
+
+QHash QGraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast(obj))
+    return 0;
+LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
+attachedProperties.insert(qobject_cast(obj), rv);
+return rv;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// QGraphicsGridLayout-related classes
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+GridLayoutAttached::GridLayoutAttached(QObject *parent)
+: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
+    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
+    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
+{
+}
+
+void GridLayoutAttached::setRow(int r)
+{
+    if (_row == r)
+        return;
+
+    _row = r;
+    //emit rowChanged(reinterpret_cast(parent()), _row);
+}
+
+void GridLayoutAttached::setColumn(int c)
+{
+    if (_column == c)
+        return;
+
+    _column = c;
+    //emit columnChanged(reinterpret_cast(parent()), _column);
+}
+
+void GridLayoutAttached::setRowSpan(int rs)
+{
+    if (_rowspan == rs)
+        return;
+
+    _rowspan = rs;
+    //emit rowSpanChanged(reinterpret_cast(parent()), _rowSpan);
+}
+
+void GridLayoutAttached::setColumnSpan(int cs)
+{
+    if (_colspan == cs)
+        return;
+
+    _colspan = cs;
+    //emit columnSpanChanged(reinterpret_cast(parent()), _columnSpan);
+}
+
+void GridLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (_alignment == a)
+        return;
+
+    _alignment = a;
+    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
+}
+
+void GridLayoutAttached::setRowStretchFactor(int f)
+{
+    _rowstretch = f;
+}
+
+void GridLayoutAttached::setColumnStretchFactor(int f)
+{
+    _colstretch = f;
+}
+
+void GridLayoutAttached::setRowSpacing(int s)
+{
+    _rowspacing = s;
+}
+
+void GridLayoutAttached::setColumnSpacing(int s)
+{
+    _colspacing = s;
+}
+
+
+QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+{
+}
+
+void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
+{
+//use attached properties
+if (QObject *obj = attachedProperties.value(qobject_cast(wid))) {
+    int row = static_cast(obj)->row();
+    int column = static_cast(obj)->column();
+    int rowSpan = static_cast(obj)->rowSpan();
+    int columnSpan = static_cast(obj)->columnSpan();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    addItem(wid, row, column, rowSpan, columnSpan);
+}
+}
+
+void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+{
+//use attached properties
+if (GridLayoutAttached *obj = attachedProperties.value(item)) {
+    int row = obj->row();
+    int column = obj->column();
+    int rowSpan = obj->rowSpan();
+    int columnSpan = obj->columnSpan();
+    Qt::Alignment alignment = obj->alignment();
+    if (row == -1 || column == -1) {
+        qWarning() << "Must set row and column for an item in a grid layout";
+        return;
+    }
+    if(obj->rowSpacing() != -1)
+        setRowSpacing(row, obj->rowSpacing());
+    if(obj->columnSpacing() != -1)
+        setColumnSpacing(column, obj->columnSpacing());
+    if(obj->rowStretchFactor() != -1)
+        setRowStretchFactor(row, obj->rowStretchFactor());
+    if(obj->columnStretchFactor() != -1)
+        setColumnStretchFactor(column, obj->columnStretchFactor());
+    if(obj->rowPreferredHeight() != -1)
+        setRowPreferredHeight(row, obj->rowPreferredHeight());
+    if(obj->rowMaximumHeight() != -1)
+        setRowMaximumHeight(row, obj->rowMaximumHeight());
+    if(obj->rowMinimumHeight() != -1)
+        setRowMinimumHeight(row, obj->rowMinimumHeight());
+    if(obj->rowFixedHeight() != -1)
+        setRowFixedHeight(row, obj->rowFixedHeight());
+    if(obj->columnPreferredWidth() != -1)
+        setColumnPreferredWidth(row, obj->columnPreferredWidth());
+    if(obj->columnMaximumWidth() != -1)
+        setColumnMaximumWidth(row, obj->columnMaximumWidth());
+    if(obj->columnMinimumWidth() != -1)
+        setColumnMinimumWidth(row, obj->columnMinimumWidth());
+    if(obj->columnFixedWidth() != -1)
+        setColumnFixedWidth(row, obj->columnFixedWidth());
+    addItem(item, row, column, rowSpan, columnSpan);
+    if (alignment != -1)
+        setAlignment(item,alignment);
+    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+    //### need to disconnect when widget is removed?
+}
+}
+
+//### is there a better way to do this?
+void QGraphicsGridLayoutObject::clearChildren()
+{
+for (int i = 0; i < count(); ++i)
+    removeAt(i);
+}
+
+qreal QGraphicsGridLayoutObject::spacing() const
+{
+if (verticalSpacing() == horizontalSpacing())
+    return verticalSpacing();
+return -1;  //###
+}
+
+qreal QGraphicsGridLayoutObject::contentsMargin() const
+{
+    qreal a,b,c,d;
+    getContentsMargins(&a, &b, &c, &d);
+    if(a==b && a==c && a==d)
+        return a;
+    return -1;
+}
+
+void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m,m,m,m);
+}
+
+
+void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+QGraphicsGridLayout::setAlignment(item, alignment);
+}
+
+QHash QGraphicsGridLayoutObject::attachedProperties;
+GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+// ### This is not allowed - you must attach to any object
+if (!qobject_cast(obj))
+    return 0;
+GridLayoutAttached *rv = new GridLayoutAttached(obj);
+attachedProperties.insert(qobject_cast(obj), rv);
+return rv;
+}
+
+QT_END_NAMESPACE
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
new file mode 100644
index 0000000..e5d91b2
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET  = graphicslayouts
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    main.cpp
+
+HEADERS += \
+    graphicslayouts_p.h
+
+RESOURCES += \
+    graphicslayouts.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
new file mode 100644
index 0000000..fcd78d5
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
@@ -0,0 +1,77 @@
+import Qt 4.7
+import GraphicsLayouts 4.7
+
+Item {
+    id: resizable
+
+    width: 800
+    height: 400
+
+    QGraphicsWidget {
+        size.width: parent.width/2
+        size.height: parent.height
+
+        layout: QGraphicsLinearLayout {
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+        }
+    }
+    QGraphicsWidget {
+        x: parent.width/2
+        size.width: parent.width/2
+        size.height: parent.height
+
+        layout: QGraphicsGridLayout {
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "red"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "100x100"
+                Rectangle { color: "orange"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 2
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "200x200"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "blue"; anchors.fill: parent }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
new file mode 100644
index 0000000..a199f8d
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
@@ -0,0 +1,5 @@
+
+
+    graphicslayouts.qml
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
new file mode 100644
index 0000000..ea9c614
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
@@ -0,0 +1,303 @@
+/****************************************************************************
+**
+** 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 GRAPHICSLAYOUTS_H
+#define GRAPHICSLAYOUTS_H
+
+#include 
+#include 
+#include 
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+public:
+    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+
+    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
+};
+
+class LinearLayoutAttached;
+class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty children READ children)
+    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsLinearLayoutObject(QObject * = 0);
+    ~QGraphicsLinearLayoutObject();
+
+    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+private Q_SLOTS:
+    void updateStretch(QGraphicsLayoutItem*,int);
+    void updateSpacing(QGraphicsLayoutItem*,int);
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class LinearLayoutAttached;
+    void clearChildren();
+    void insertLayoutItem(int, QGraphicsLayoutItem *);
+    static QHash attachedProperties;
+
+    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
+        static_cast(prop->object)->insertLayoutItem(-1, item);
+    }
+
+    static void children_clear(QDeclarativeListProperty *prop) {
+        static_cast(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty *prop) {
+        return static_cast(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
+        return static_cast(prop->object)->itemAt(index);
+    }
+};
+
+class GridLayoutAttached;
+class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty children READ children)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
+    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsGridLayoutObject(QObject * = 0);
+    ~QGraphicsGridLayoutObject();
+
+    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
+
+    qreal spacing() const;
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+    static GridLayoutAttached *qmlAttachedProperties(QObject *);
+
+private Q_SLOTS:
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class GraphicsLayoutAttached;
+    void addWidget(QGraphicsWidget *);
+    void clearChildren();
+    void addLayoutItem(QGraphicsLayoutItem *);
+    static QHash attachedProperties;
+
+    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
+        static_cast(prop->object)->addLayoutItem(item);
+    }
+
+    static void children_clear(QDeclarativeListProperty *prop) {
+        static_cast(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty *prop) {
+        return static_cast(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
+        return static_cast(prop->object)->itemAt(index);
+    }
+};
+
+class LinearLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+public:
+    LinearLayoutAttached(QObject *parent);
+
+    int stretchFactor() const { return _stretch; }
+    void setStretchFactor(int f);
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+    int spacing() const { return _spacing; }
+    void setSpacing(int s);
+
+Q_SIGNALS:
+    void stretchChanged(QGraphicsLayoutItem*,int);
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+    void spacingChanged(QGraphicsLayoutItem*,int);
+
+private:
+    int _stretch;
+    Qt::Alignment _alignment;
+    int _spacing;
+};
+
+class GridLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int row READ row WRITE setRow)
+    Q_PROPERTY(int column READ column WRITE setColumn)
+    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
+    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
+    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
+    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
+    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
+    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
+    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
+    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
+    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
+    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
+    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
+    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
+    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
+
+public:
+    GridLayoutAttached(QObject *parent);
+
+    int row() const { return _row; }
+    void setRow(int r);
+
+    int column() const { return _column; }
+    void setColumn(int c);
+
+    int rowSpan() const { return _rowspan; }
+    void setRowSpan(int rs);
+
+    int columnSpan() const { return _colspan; }
+    void setColumnSpan(int cs);
+
+    Qt::Alignment alignment() const { return _alignment; }
+    void setAlignment(Qt::Alignment a);
+
+    int rowStretchFactor() const { return _rowstretch; }
+    void setRowStretchFactor(int f);
+    int columnStretchFactor() const { return _colstretch; }
+    void setColumnStretchFactor(int f);
+
+    int rowSpacing() const { return _rowspacing; }
+    void setRowSpacing(int s);
+    int columnSpacing() const { return _colspacing; }
+    void setColumnSpacing(int s);
+
+    int rowPreferredHeight() const { return _rowprefheight; }
+    void setRowPreferredHeight(int s) { _rowprefheight = s; }
+
+    int rowMaximumHeight() const { return _rowmaxheight; }
+    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
+
+    int rowMinimumHeight() const { return _rowminheight; }
+    void setRowMinimumHeight(int s) { _rowminheight = s; }
+
+    int rowFixedHeight() const { return _rowfixheight; }
+    void setRowFixedHeight(int s) { _rowfixheight = s; }
+
+    int columnPreferredWidth() const { return _colprefwidth; }
+    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
+
+    int columnMaximumWidth() const { return _colmaxwidth; }
+    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
+
+    int columnMinimumWidth() const { return _colminwidth; }
+    void setColumnMinimumWidth(int s) { _colminwidth = s; }
+
+    int columnFixedWidth() const { return _colfixwidth; }
+    void setColumnFixedWidth(int s) { _colfixwidth = s; }
+
+Q_SIGNALS:
+    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    int _row;
+    int _column;
+    int _rowspan;
+    int _colspan;
+    Qt::Alignment _alignment;
+    int _rowstretch;
+    int _colstretch;
+    int _rowspacing;
+    int _colspacing;
+    int _rowprefheight;
+    int _rowmaxheight;
+    int _rowminheight;
+    int _rowfixheight;
+    int _colprefwidth;
+    int _colmaxwidth;
+    int _colminwidth;
+    int _colfixwidth;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // GRAPHICSLAYOUTS_H
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
new file mode 100644
index 0000000..89b69bf
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 
+#include 
+#include "graphicslayouts_p.h"
+#include 
+
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+    QDeclarativeView view;
+    qmlRegisterInterface("QGraphicsLayoutItem");
+    qmlRegisterInterface("QGraphicsLayout");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayout");
+    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsGridLayout");
+    view.setSource(QUrl(":graphicslayouts.qml"));
+    view.show();
+    return app.exec();
+};
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
new file mode 100644
index 0000000..4a3fc73
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Tue May 4 13:36:26 2010
+######################################################################
+
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp
+RESOURCES += layoutItem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
new file mode 100644
index 0000000..460c564
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+
+LayoutItem {//Sized by the layout
+    id: resizable
+    minimumSize: "100x100"
+    maximumSize: "300x300"
+    preferredSize: "100x100"
+    Rectangle { color: "yellow"; anchors.fill: parent }
+    Rectangle { 
+        width: 100; height: 100; 
+        anchors.top: parent.top; 
+        anchors.right: parent.right;
+        color: "green"; 
+    }
+}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
new file mode 100644
index 0000000..deb0fba
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
@@ -0,0 +1,5 @@
+
+
+    layoutItem.qml
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
new file mode 100644
index 0000000..a104251
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* This example demonstrates using a LayoutItem to let QML snippets integrate
+   nicely with existing QGraphicsView applications designed with GraphicsLayouts
+*/
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+    //Set up a graphics scene with a QGraphicsWidget and Layout
+    QGraphicsView view;
+    QGraphicsScene scene;
+    QGraphicsWidget *widget = new QGraphicsWidget();
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    widget->setLayout(layout);
+    scene.addItem(widget);
+    view.setScene(&scene);
+    //Add the QML snippet into the layout
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl(":layoutItem.qml"));
+    QGraphicsLayoutItem* obj = qobject_cast(c.create());
+    layout->addItem(obj);
+
+    widget->setGeometry(QRectF(0,0, 400,400));
+    view.show();
+    return app.exec();
+}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
new file mode 100644
index 0000000..6072de4
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET = adding
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp 
+HEADERS += person.h
+RESOURCES += adding.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/adding
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/adding
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc b/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/example.qml b/examples/declarative/cppextensions/referenceexamples/adding/example.qml
new file mode 100644
index 0000000..dc891e7
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/adding/example.qml
@@ -0,0 +1,8 @@
+// ![0]
+import People 1.0
+
+Person {
+    name: "Bob Jones"
+    shoeSize: 12
+}
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/main.cpp b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
new file mode 100644
index 0000000..7b33895
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+//![0]
+    qmlRegisterType("People", 1,0, "Person");
+//![0]
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    Person *person = qobject_cast(component.create());
+    if (person) {
+        qWarning() << "The person's name is" << person->name();
+        qWarning() << "They wear a" << person->shoeSize() << "sized shoe";
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/person.cpp b/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
new file mode 100644
index 0000000..cdf08e0
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+// ![0]
+Person::Person(QObject *parent)
+: QObject(parent), m_shoeSize(0)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+int Person::shoeSize() const
+{
+    return m_shoeSize;
+}
+
+void Person::setShoeSize(int s)
+{
+    m_shoeSize = s;
+}
+
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/person.h b/examples/declarative/cppextensions/referenceexamples/adding/person.h
new file mode 100644
index 0000000..d6de9a9
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/adding/person.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+// ![0]
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    int shoeSize() const;
+    void setShoeSize(int);
+
+private:
+    QString m_name;
+    int m_shoeSize;
+};
+// ![0]
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
new file mode 100644
index 0000000..f6d76ed
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = attached
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp 
+HEADERS += person.h \
+           birthdayparty.h
+RESOURCES += attached.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/attached
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/attached
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc b/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
new file mode 100644
index 0000000..7fa1748
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
@@ -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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
+: QObject(object)
+{
+}
+
+QDate BirthdayPartyAttached::rsvp() const
+{
+    return m_rsvp;
+}
+
+void BirthdayPartyAttached::setRsvp(const QDate &d)
+{
+    m_rsvp = d;
+}
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
+BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
+{
+    return new BirthdayPartyAttached(object);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
new file mode 100644
index 0000000..1c66f8c
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include 
+#include "person.h"
+
+class BirthdayPartyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
+public:
+    BirthdayPartyAttached(QObject *object);
+
+    QDate rsvp() const;
+    void setRsvp(const QDate &);
+
+private:
+    QDate m_rsvp;
+};
+
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+    Q_CLASSINFO("DefaultProperty", "guests")
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
+private:
+    Person *m_host;
+    QList m_guests;
+};
+
+QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/example.qml b/examples/declarative/cppextensions/referenceexamples/attached/example.qml
new file mode 100644
index 0000000..50f0a32
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/example.qml
@@ -0,0 +1,31 @@
+import People 1.0
+
+BirthdayParty {
+    host: Boy {
+        name: "Bob Jones"
+        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
+    }
+
+    // ![1]
+    Boy { 
+        name: "Leo Hodges" 
+        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
+
+        BirthdayParty.rsvp: "2009-07-06"
+    }
+    // ![1]
+    Boy { 
+        name: "Jack Smith" 
+        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
+    }
+    Girl { 
+        name: "Anne Brown" 
+        shoe.size: 7
+        shoe.color: "red"
+        shoe.brand: "Marc Jacobs"
+        shoe.price: 699.99 
+
+        BirthdayParty.rsvp: "2009-07-01"
+    }
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
new file mode 100644
index 0000000..f1055ae
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType();
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        for (int ii = 0; ii < party->guestCount(); ++ii) {
+            Person *guest = party->guest(ii);
+
+            QDate rsvpDate;
+            QObject *attached = 
+                qmlAttachedPropertiesObject(guest, false);
+            if (attached)
+                rsvpDate = attached->property("rsvp").toDate();
+
+            if (rsvpDate.isNull())
+                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
+            else
+                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
+        }
+
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/person.cpp b/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
new file mode 100644
index 0000000..0a9e508
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+ShoeDescription::ShoeDescription(QObject *parent)
+: QObject(parent), m_size(0), m_price(0)
+{
+}
+
+int ShoeDescription::size() const
+{
+    return m_size;
+}
+
+void ShoeDescription::setSize(int s)
+{
+    m_size = s;
+}
+
+QColor ShoeDescription::color() const
+{
+    return m_color;
+}
+
+void ShoeDescription::setColor(const QColor &c)
+{
+    m_color = c;
+}
+
+QString ShoeDescription::brand() const
+{
+    return m_brand;
+}
+
+void ShoeDescription::setBrand(const QString &b)
+{
+    m_brand = b;
+}
+
+qreal ShoeDescription::price() const
+{
+    return m_price;
+}
+
+void ShoeDescription::setPrice(qreal p)
+{
+    m_price = p;
+}
+
+Person::Person(QObject *parent)
+: QObject(parent)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+ShoeDescription *Person::shoe()
+{
+    return &m_shoe;
+}
+
+
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/person.h b/examples/declarative/cppextensions/referenceexamples/attached/person.h
new file mode 100644
index 0000000..2f444c5
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/attached/person.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+#include 
+
+class ShoeDescription : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int size READ size WRITE setSize)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
+    Q_PROPERTY(QString brand READ brand WRITE setBrand)
+    Q_PROPERTY(qreal price READ price WRITE setPrice)
+public:
+    ShoeDescription(QObject *parent = 0);
+
+    int size() const;
+    void setSize(int);
+
+    QColor color() const;
+    void setColor(const QColor &);
+
+    QString brand() const;
+    void setBrand(const QString &);
+
+    qreal price() const;
+    void setPrice(qreal);
+private:
+    int m_size;
+    QColor m_color;
+    QString m_brand;
+    qreal m_price;
+};
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(ShoeDescription *shoe READ shoe)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    ShoeDescription *shoe();
+private:
+    QString m_name;
+    ShoeDescription m_shoe;
+};
+
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
new file mode 100644
index 0000000..896ce25
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET = binding
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp \
+           happybirthdaysong.cpp 
+HEADERS += person.h \
+           birthdayparty.h \
+           happybirthdaysong.h
+RESOURCES += binding.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/binding
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/binding
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc b/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
new file mode 100644
index 0000000..000bb1f
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
+: QObject(object)
+{
+}
+
+QDate BirthdayPartyAttached::rsvp() const
+{
+    return m_rsvp;
+}
+
+void BirthdayPartyAttached::setRsvp(const QDate &d)
+{
+    if (d != m_rsvp) {
+        m_rsvp = d;
+        emit rsvpChanged();
+    }
+}
+
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    if (c == m_host) return;
+    m_host = c;
+    emit hostChanged();
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
+void BirthdayParty::startParty()
+{
+    QTime time = QTime::currentTime();
+    emit partyStarted(time);
+}
+
+QString BirthdayParty::announcement() const
+{
+    return QString();
+}
+
+void BirthdayParty::setAnnouncement(const QString &speak)
+{
+    qWarning() << qPrintable(speak);
+}
+
+BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
+{
+    return new BirthdayPartyAttached(object);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
new file mode 100644
index 0000000..c3f033e
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include 
+#include 
+#include "person.h"
+
+class BirthdayPartyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp NOTIFY rsvpChanged)
+public:
+    BirthdayPartyAttached(QObject *object);
+
+    QDate rsvp() const;
+    void setRsvp(const QDate &);
+
+signals:
+    void rsvpChanged();
+
+private:
+    QDate m_rsvp;
+};
+
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+// ![0]
+    Q_PROPERTY(Person *host READ host WRITE setHost NOTIFY hostChanged)
+// ![0]
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+    Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
+    Q_CLASSINFO("DefaultProperty", "guests")
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+    QString announcement() const;
+    void setAnnouncement(const QString &);
+
+    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
+
+    void startParty();
+signals:
+    void partyStarted(const QTime &time);
+    void hostChanged();
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+
+QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/example.qml b/examples/declarative/cppextensions/referenceexamples/binding/example.qml
new file mode 100644
index 0000000..82eb3be
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/example.qml
@@ -0,0 +1,37 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    id: theParty
+
+    HappyBirthdaySong on announcement { name: theParty.host.name }
+
+    host: Boy {
+        name: "Bob Jones"
+        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
+    }
+// ![0]
+    onPartyStarted: console.log("This party started rockin' at " + time);
+
+
+    Boy {
+        name: "Leo Hodges"
+        BirthdayParty.rsvp: "2009-07-06"
+        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
+    }
+    Boy {
+        name: "Jack Smith"
+        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
+    }
+    Girl {
+        name: "Anne Brown"
+        BirthdayParty.rsvp: "2009-07-01"
+        shoe.size: 7
+        shoe.color: "red"
+        shoe.brand: "Marc Jacobs"
+        shoe.price: 699.99
+    }
+
+// ![1]
+}
+// ![1]
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
new file mode 100644
index 0000000..a40e7fb
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "happybirthdaysong.h"
+#include 
+
+HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
+: QObject(parent), m_line(-1)
+{
+    setName(QString());
+    QTimer *timer = new QTimer(this);
+    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
+    timer->start(1000);
+}
+
+void HappyBirthdaySong::setTarget(const QDeclarativeProperty &p)
+{
+    m_target = p;
+}
+
+QString HappyBirthdaySong::name() const
+{
+    return m_name;
+}
+
+void HappyBirthdaySong::setName(const QString &name)
+{
+    if (m_name == name)
+        return;
+
+    m_name = name;
+
+    m_lyrics.clear();
+    m_lyrics << "Happy birthday to you,";
+    m_lyrics << "Happy birthday to you,";
+    m_lyrics << "Happy birthday dear " + m_name + ",";
+    m_lyrics << "Happy birthday to you!";
+    m_lyrics << "";
+    
+    emit nameChanged();
+}
+    
+void HappyBirthdaySong::advance()
+{
+    m_line = (m_line + 1) % m_lyrics.count();
+
+    m_target.write(m_lyrics.at(m_line));
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
new file mode 100644
index 0000000..e825b86
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 HAPPYBIRTHDAYSONG_H
+#define HAPPYBIRTHDAYSONG_H
+
+#include 
+#include 
+
+#include 
+
+class HappyBirthdaySong : public QObject, public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+public:
+    HappyBirthdaySong(QObject *parent = 0);
+
+    virtual void setTarget(const QDeclarativeProperty &);
+
+    QString name() const;
+    void setName(const QString &);
+
+private slots:
+    void advance();
+
+signals:
+    void nameChanged();
+private:
+    int m_line;
+    QStringList m_lyrics;
+    QDeclarativeProperty m_target;
+    QString m_name;
+};
+
+#endif // HAPPYBIRTHDAYSONG_H
+
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
new file mode 100644
index 0000000..2495676
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "happybirthdaysong.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType("People", 1,0, "HappyBirthdaySong");
+    qmlRegisterType();
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        for (int ii = 0; ii < party->guestCount(); ++ii) {
+            Person *guest = party->guest(ii);
+
+            QDate rsvpDate;
+            QObject *attached = 
+                qmlAttachedPropertiesObject(guest, false);
+            if (attached)
+                rsvpDate = attached->property("rsvp").toDate();
+
+            if (rsvpDate.isNull())
+                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
+            else
+                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
+        }
+
+        party->startParty();
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return app.exec();
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/person.cpp b/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
new file mode 100644
index 0000000..9a2248f
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+ShoeDescription::ShoeDescription(QObject *parent)
+: QObject(parent), m_size(0), m_price(0)
+{
+}
+
+int ShoeDescription::size() const
+{
+    return m_size;
+}
+
+void ShoeDescription::setSize(int s)
+{
+    if (m_size == s)
+        return;
+
+    m_size = s;
+    emit shoeChanged();
+}
+
+QColor ShoeDescription::color() const
+{
+    return m_color;
+}
+
+void ShoeDescription::setColor(const QColor &c)
+{
+    if (m_color == c)
+        return;
+
+    m_color = c;
+    emit shoeChanged();
+}
+
+QString ShoeDescription::brand() const
+{
+    return m_brand;
+}
+
+void ShoeDescription::setBrand(const QString &b)
+{
+    if (m_brand == b)
+        return;
+
+    m_brand = b;
+    emit shoeChanged();
+}
+
+qreal ShoeDescription::price() const
+{
+    return m_price;
+}
+
+void ShoeDescription::setPrice(qreal p)
+{
+    if (m_price == p)
+        return;
+
+    m_price = p;
+    emit shoeChanged();
+}
+
+Person::Person(QObject *parent)
+: QObject(parent)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    if (m_name == n)
+        return;
+
+    m_name = n;
+    emit nameChanged();
+}
+
+ShoeDescription *Person::shoe()
+{
+    return &m_shoe;
+}
+
+
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/person.h b/examples/declarative/cppextensions/referenceexamples/binding/person.h
new file mode 100644
index 0000000..2a68da0
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/binding/person.h
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+#include 
+
+class ShoeDescription : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int size READ size WRITE setSize NOTIFY shoeChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY shoeChanged)
+    Q_PROPERTY(QString brand READ brand WRITE setBrand NOTIFY shoeChanged)
+    Q_PROPERTY(qreal price READ price WRITE setPrice NOTIFY shoeChanged)
+public:
+    ShoeDescription(QObject *parent = 0);
+
+    int size() const;
+    void setSize(int);
+
+    QColor color() const;
+    void setColor(const QColor &);
+
+    QString brand() const;
+    void setBrand(const QString &);
+
+    qreal price() const;
+    void setPrice(qreal);
+signals:
+    void shoeChanged();
+
+private:
+    int m_size;
+    QColor m_color;
+    QString m_brand;
+    qreal m_price;
+};
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+// ![0]
+    Q_PROPERTY(ShoeDescription *shoe READ shoe CONSTANT)
+// ![0]
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    ShoeDescription *shoe();
+signals:
+    void nameChanged();
+
+private:
+    QString m_name;
+    ShoeDescription m_shoe;
+};
+
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
new file mode 100644
index 0000000..4f415a3
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
new file mode 100644
index 0000000..ee77e9a
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include "person.h"
+
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+// ![0]
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+// ![0]
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
new file mode 100644
index 0000000..c8daed8
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = coercion
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp 
+HEADERS += person.h \
+           birthdayparty.h
+RESOURCES += coercion.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/coercion
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/coercion
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/example.qml b/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
new file mode 100644
index 0000000..7b45950
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
@@ -0,0 +1,15 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    host: Boy {
+        name: "Bob Jones"
+        shoeSize: 12
+    }
+    guests: [
+        Boy { name: "Leo Hodges" },
+        Boy { name: "Jack Smith" },
+        Girl { name: "Anne Brown" }
+    ]
+}
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
new file mode 100644
index 0000000..2c7b545
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+// ![0]
+    qmlRegisterType();
+// ![0]
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        for (int ii = 0; ii < party->guestCount(); ++ii)
+            qWarning() << "   " << party->guest(ii)->name();
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
new file mode 100644
index 0000000..5b5203a
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+Person::Person(QObject *parent)
+: QObject(parent), m_shoeSize(0)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+int Person::shoeSize() const
+{
+    return m_shoeSize;
+}
+
+void Person::setShoeSize(int s)
+{
+    m_shoeSize = s;
+}
+
+// ![1]
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
+// ![1]
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.h b/examples/declarative/cppextensions/referenceexamples/coercion/person.h
new file mode 100644
index 0000000..1c95da7
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/person.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    int shoeSize() const;
+    void setShoeSize(int);
+private:
+    QString m_name;
+    int m_shoeSize;
+};
+
+
+// ![0]
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+// ![0]
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
new file mode 100644
index 0000000..4f415a3
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
new file mode 100644
index 0000000..9741040
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include "person.h"
+
+// ![0]
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+    Q_CLASSINFO("DefaultProperty", "guests")
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+// ![0]
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro
new file mode 100644
index 0000000..32aff0b
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = default
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp 
+HEADERS += person.h \
+           birthdayparty.h
+RESOURCES += default.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/default
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/default
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.qrc b/examples/declarative/cppextensions/referenceexamples/default/default.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/default/example.qml b/examples/declarative/cppextensions/referenceexamples/default/example.qml
new file mode 100644
index 0000000..c0f3cbb
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/example.qml
@@ -0,0 +1,14 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    host: Boy {
+        name: "Bob Jones"
+        shoeSize: 12
+    }
+
+    Boy { name: "Leo Hodges" }
+    Boy { name: "Jack Smith" }
+    Girl { name: "Anne Brown" }
+}
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/default/main.cpp b/examples/declarative/cppextensions/referenceexamples/default/main.cpp
new file mode 100644
index 0000000..2ffd180
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/main.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        for (int ii = 0; ii < party->guestCount(); ++ii)
+            qWarning() << "   " << party->guest(ii)->name();
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/default/person.cpp b/examples/declarative/cppextensions/referenceexamples/default/person.cpp
new file mode 100644
index 0000000..69216d3
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/person.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 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.
+**
+** 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 "person.h"
+
+Person::Person(QObject *parent)
+: QObject(parent), m_shoeSize(0)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+int Person::shoeSize() const
+{
+    return m_shoeSize;
+}
+
+void Person::setShoeSize(int s)
+{
+    m_shoeSize = s;
+}
+
+
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/default/person.h b/examples/declarative/cppextensions/referenceexamples/default/person.h
new file mode 100644
index 0000000..3e56860
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/default/person.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    int shoeSize() const;
+    void setShoeSize(int);
+private:
+    QString m_name;
+    int m_shoeSize;
+};
+
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/example.qml b/examples/declarative/cppextensions/referenceexamples/extended/example.qml
new file mode 100644
index 0000000..985ce20
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/extended/example.qml
@@ -0,0 +1,7 @@
+import People 1.0
+
+// ![0]
+QLineEdit {
+    leftMargin: 20
+}
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
new file mode 100644
index 0000000..97af286
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET = extended
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           lineedit.cpp 
+HEADERS += lineedit.h
+RESOURCES += extended.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/extended
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/extended
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc b/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
new file mode 100644
index 0000000..0e521ec
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "lineedit.h"
+#include 
+
+LineEditExtension::LineEditExtension(QObject *object)
+: QObject(object), m_lineedit(static_cast(object))
+{
+}
+
+int LineEditExtension::leftMargin() const
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    return l;
+}
+
+void LineEditExtension::setLeftMargin(int m)
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    m_lineedit->setTextMargins(m, t, r, b);
+}
+
+int LineEditExtension::rightMargin() const
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    return r;
+}
+
+void LineEditExtension::setRightMargin(int m) 
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    m_lineedit->setTextMargins(l, t, m, b);
+}
+
+int LineEditExtension::topMargin() const
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    return t;
+}
+
+void LineEditExtension::setTopMargin(int m) 
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    m_lineedit->setTextMargins(l, m, r, b);
+}
+
+int LineEditExtension::bottomMargin() const
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    return b;
+}
+
+void LineEditExtension::setBottomMargin(int m) 
+{
+    int l, r, t, b;
+    m_lineedit->getTextMargins(&l, &t, &r, &b);
+    m_lineedit->setTextMargins(l, t, r, m);
+}
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
new file mode 100644
index 0000000..3a464b0
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.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 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.
+**
+** 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 LINEEDIT_H
+#define LINEEDIT_H
+
+#include 
+
+class LineEditExtension : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int leftMargin READ leftMargin WRITE setLeftMargin NOTIFY marginsChanged)
+    Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin NOTIFY marginsChanged)
+    Q_PROPERTY(int topMargin READ topMargin WRITE setTopMargin NOTIFY marginsChanged)
+    Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY marginsChanged)
+public:
+    LineEditExtension(QObject *);
+
+    int leftMargin() const;
+    void setLeftMargin(int);
+
+    int rightMargin() const;
+    void setRightMargin(int);
+
+    int topMargin() const;
+    void setTopMargin(int);
+
+    int bottomMargin() const;
+    void setBottomMargin(int);
+signals:
+    void marginsChanged();
+
+private:
+    QLineEdit *m_lineedit;
+};
+
+#endif // LINEEDIT_H
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/main.cpp b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
new file mode 100644
index 0000000..ca7242d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include 
+#include "lineedit.h"
+
+int main(int argc, char ** argv)
+{
+    QApplication app(argc, argv);
+
+    qmlRegisterExtendedType("People", 1,0, "QLineEdit");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    QLineEdit *edit = qobject_cast(component.create());
+
+    if (edit) {
+        edit->show();
+        return app.exec();
+    } else {
+        qWarning() << "An error occured";
+        return 0;
+    }
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
new file mode 100644
index 0000000..4f415a3
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
new file mode 100644
index 0000000..31d21b2
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include "person.h"
+
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+    Q_CLASSINFO("DefaultProperty", "guests")
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
new file mode 100644
index 0000000..91b7a06
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
@@ -0,0 +1,33 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    host: Boy {
+        name: "Bob Jones"
+        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
+    }
+
+    Boy { 
+        name: "Leo Hodges" 
+        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
+    }
+    // ![1]
+    Boy { 
+        name: "Jack Smith" 
+        shoe { 
+            size: 8
+            color: "blue"
+            brand: "Puma" 
+            price: 19.95 
+        }
+    }
+    // ![1]
+    Girl { 
+        name: "Anne Brown" 
+        shoe.size: 7
+        shoe.color: "red"
+        shoe.brand: "Marc Jacobs"
+        shoe.price: 699.99 
+    }
+}
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
new file mode 100644
index 0000000..576e1d2
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = grouped
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp 
+HEADERS += person.h \
+           birthdayparty.h
+RESOURCES += grouped.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/grouped
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/grouped
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
new file mode 100644
index 0000000..baf32cf
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType();
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        Person *bestShoe = 0;
+        for (int ii = 0; ii < party->guestCount(); ++ii) {
+            Person *guest = party->guest(ii);
+            qWarning() << "   " << guest->name();
+
+            if (!bestShoe || bestShoe->shoe()->price() < guest->shoe()->price())
+                bestShoe = guest;
+        }
+        if (bestShoe)
+            qWarning() << bestShoe->name() << "is wearing the best shoes!";
+
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
new file mode 100644
index 0000000..0a9e508
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+ShoeDescription::ShoeDescription(QObject *parent)
+: QObject(parent), m_size(0), m_price(0)
+{
+}
+
+int ShoeDescription::size() const
+{
+    return m_size;
+}
+
+void ShoeDescription::setSize(int s)
+{
+    m_size = s;
+}
+
+QColor ShoeDescription::color() const
+{
+    return m_color;
+}
+
+void ShoeDescription::setColor(const QColor &c)
+{
+    m_color = c;
+}
+
+QString ShoeDescription::brand() const
+{
+    return m_brand;
+}
+
+void ShoeDescription::setBrand(const QString &b)
+{
+    m_brand = b;
+}
+
+qreal ShoeDescription::price() const
+{
+    return m_price;
+}
+
+void ShoeDescription::setPrice(qreal p)
+{
+    m_price = p;
+}
+
+Person::Person(QObject *parent)
+: QObject(parent)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+ShoeDescription *Person::shoe()
+{
+    return &m_shoe;
+}
+
+
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/person.h b/examples/declarative/cppextensions/referenceexamples/grouped/person.h
new file mode 100644
index 0000000..a031e69
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/person.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+#include 
+
+class ShoeDescription : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int size READ size WRITE setSize)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
+    Q_PROPERTY(QString brand READ brand WRITE setBrand)
+    Q_PROPERTY(qreal price READ price WRITE setPrice)
+public:
+    ShoeDescription(QObject *parent = 0);
+
+    int size() const;
+    void setSize(int);
+
+    QColor color() const;
+    void setColor(const QColor &);
+
+    QString brand() const;
+    void setBrand(const QString &);
+
+    qreal price() const;
+    void setPrice(qreal);
+private:
+    int m_size;
+    QColor m_color;
+    QString m_brand;
+    qreal m_price;
+};
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+// ![1]
+    Q_PROPERTY(ShoeDescription *shoe READ shoe)
+// ![1]
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    ShoeDescription *shoe();
+private:
+    QString m_name;
+    ShoeDescription m_shoe;
+};
+
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
new file mode 100644
index 0000000..27d17a1
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
@@ -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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+// ![0]
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+// ![0]
+
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
new file mode 100644
index 0000000..39ce9ba
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include "person.h"
+
+// ![0]
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+// ![0]
+// ![1]
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+// ![1]
+// ![2]
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+// ![2]
+// ![3]
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+// ![3]
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/example.qml b/examples/declarative/cppextensions/referenceexamples/properties/example.qml
new file mode 100644
index 0000000..35abdd6
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/example.qml
@@ -0,0 +1,15 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    host: Person {
+        name: "Bob Jones"
+        shoeSize: 12
+    }
+    guests: [
+        Person { name: "Leo Hodges" },
+        Person { name: "Jack Smith" },
+        Person { name: "Anne Brown" }
+    ]
+}
+// ![0]
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/main.cpp b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
new file mode 100644
index 0000000..85e9584
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType("People", 1,0, "Person");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+        qWarning() << "They are inviting:";
+        for (int ii = 0; ii < party->guestCount(); ++ii)
+            qWarning() << "   " << party->guest(ii)->name();
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/person.cpp b/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
new file mode 100644
index 0000000..92c54f5
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+Person::Person(QObject *parent)
+: QObject(parent), m_shoeSize(0)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+int Person::shoeSize() const
+{
+    return m_shoeSize;
+}
+
+void Person::setShoeSize(int s)
+{
+    m_shoeSize = s;
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/person.h b/examples/declarative/cppextensions/referenceexamples/properties/person.h
new file mode 100644
index 0000000..0029b09
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/person.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    int shoeSize() const;
+    void setShoeSize(int);
+private:
+    QString m_name;
+    int m_shoeSize;
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
new file mode 100644
index 0000000..a8f4301
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+TARGET = properties
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp 
+HEADERS += person.h \
+           birthdayparty.h
+RESOURCES += properties.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/properties
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/properties
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc b/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro b/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
new file mode 100644
index 0000000..169c7ab
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
@@ -0,0 +1,13 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    adding \
+    attached \
+    binding \
+    coercion \
+    default \
+    extended \
+    grouped \
+    properties \
+    signal \
+    valuesource
diff --git a/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject b/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
new file mode 100644
index 0000000..740c8c9
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
+: QObject(object)
+{
+}
+
+QDate BirthdayPartyAttached::rsvp() const
+{
+    return m_rsvp;
+}
+
+void BirthdayPartyAttached::setRsvp(const QDate &d)
+{
+    m_rsvp = d;
+}
+
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
+void BirthdayParty::startParty()
+{
+    QTime time = QTime::currentTime();
+    emit partyStarted(time);
+}
+
+BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
+{
+    return new BirthdayPartyAttached(object);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
new file mode 100644
index 0000000..ae4dd39
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include 
+#include "person.h"
+
+class BirthdayPartyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
+public:
+    BirthdayPartyAttached(QObject *object);
+
+    QDate rsvp() const;
+    void setRsvp(const QDate &);
+
+private:
+    QDate m_rsvp;
+};
+
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+    Q_CLASSINFO("DefaultProperty", "guests")
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
+
+    void startParty();
+// ![0]
+signals:
+    void partyStarted(const QTime &time);
+// ![0]
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/example.qml b/examples/declarative/cppextensions/referenceexamples/signal/example.qml
new file mode 100644
index 0000000..83d6a23
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/example.qml
@@ -0,0 +1,32 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    onPartyStarted: console.log("This party started rockin' at " + time);
+// ![0]
+
+    host: Boy {
+        name: "Bob Jones"
+        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
+    }
+
+    Boy { 
+        name: "Leo Hodges" 
+        BirthdayParty.rsvp: "2009-07-06"
+        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
+    }
+    Boy { 
+        name: "Jack Smith" 
+        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
+    }
+    Girl { 
+        name: "Anne Brown" 
+        BirthdayParty.rsvp: "2009-07-01"
+        shoe.size: 7
+        shoe.color: "red"
+        shoe.brand: "Marc Jacobs"
+        shoe.price: 699.99 
+    }
+// ![1]
+}
+// ![1]
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
new file mode 100644
index 0000000..453f688
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
@@ -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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType();
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        for (int ii = 0; ii < party->guestCount(); ++ii) {
+            Person *guest = party->guest(ii);
+
+            QDate rsvpDate;
+            QObject *attached = 
+                qmlAttachedPropertiesObject(guest, false);
+            if (attached)
+                rsvpDate = attached->property("rsvp").toDate();
+
+            if (rsvpDate.isNull())
+                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
+            else
+                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
+        }
+
+        party->startParty();
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return 0;
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/person.cpp b/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
new file mode 100644
index 0000000..0a9e508
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+ShoeDescription::ShoeDescription(QObject *parent)
+: QObject(parent), m_size(0), m_price(0)
+{
+}
+
+int ShoeDescription::size() const
+{
+    return m_size;
+}
+
+void ShoeDescription::setSize(int s)
+{
+    m_size = s;
+}
+
+QColor ShoeDescription::color() const
+{
+    return m_color;
+}
+
+void ShoeDescription::setColor(const QColor &c)
+{
+    m_color = c;
+}
+
+QString ShoeDescription::brand() const
+{
+    return m_brand;
+}
+
+void ShoeDescription::setBrand(const QString &b)
+{
+    m_brand = b;
+}
+
+qreal ShoeDescription::price() const
+{
+    return m_price;
+}
+
+void ShoeDescription::setPrice(qreal p)
+{
+    m_price = p;
+}
+
+Person::Person(QObject *parent)
+: QObject(parent)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+ShoeDescription *Person::shoe()
+{
+    return &m_shoe;
+}
+
+
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/person.h b/examples/declarative/cppextensions/referenceexamples/signal/person.h
new file mode 100644
index 0000000..2f444c5
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/person.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+#include 
+
+class ShoeDescription : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int size READ size WRITE setSize)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
+    Q_PROPERTY(QString brand READ brand WRITE setBrand)
+    Q_PROPERTY(qreal price READ price WRITE setPrice)
+public:
+    ShoeDescription(QObject *parent = 0);
+
+    int size() const;
+    void setSize(int);
+
+    QColor color() const;
+    void setColor(const QColor &);
+
+    QString brand() const;
+    void setBrand(const QString &);
+
+    qreal price() const;
+    void setPrice(qreal);
+private:
+    int m_size;
+    QColor m_color;
+    QString m_brand;
+    qreal m_price;
+};
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(ShoeDescription *shoe READ shoe)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    ShoeDescription *shoe();
+private:
+    QString m_name;
+    ShoeDescription m_shoe;
+};
+
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
new file mode 100644
index 0000000..6367a38
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = signal
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp 
+HEADERS += person.h \
+           birthdayparty.h
+RESOURCES += signal.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/signal
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/signal
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc b/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
new file mode 100644
index 0000000..b915f4f
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "birthdayparty.h"
+
+BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
+: QObject(object)
+{
+}
+
+QDate BirthdayPartyAttached::rsvp() const
+{
+    return m_rsvp;
+}
+
+void BirthdayPartyAttached::setRsvp(const QDate &d)
+{
+    m_rsvp = d;
+}
+
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_host(0)
+{
+}
+
+Person *BirthdayParty::host() const
+{
+    return m_host;
+}
+
+void BirthdayParty::setHost(Person *c)
+{
+    m_host = c;
+}
+
+QDeclarativeListProperty BirthdayParty::guests() 
+{
+    return QDeclarativeListProperty(this, m_guests);
+}
+
+int BirthdayParty::guestCount() const
+{
+    return m_guests.count();
+}
+
+Person *BirthdayParty::guest(int index) const
+{
+    return m_guests.at(index);
+}
+
+void BirthdayParty::startParty()
+{
+    QTime time = QTime::currentTime();
+    emit partyStarted(time);
+}
+
+QString BirthdayParty::announcement() const
+{
+    return QString();
+}
+
+void BirthdayParty::setAnnouncement(const QString &speak)
+{
+    qWarning() << qPrintable(speak);
+}
+
+BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
+{
+    return new BirthdayPartyAttached(object);
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
new file mode 100644
index 0000000..5f25781
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include 
+#include 
+#include 
+#include 
+#include "person.h"
+
+class BirthdayPartyAttached : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
+public:
+    BirthdayPartyAttached(QObject *object);
+
+    QDate rsvp() const;
+    void setRsvp(const QDate &);
+
+private:
+    QDate m_rsvp;
+};
+
+class BirthdayParty : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(Person *host READ host WRITE setHost)
+    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
+// ![0]
+    Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
+// ![0]
+    Q_CLASSINFO("DefaultProperty", "guests")
+public:
+    BirthdayParty(QObject *parent = 0);
+
+    Person *host() const;
+    void setHost(Person *);
+
+    QDeclarativeListProperty guests();
+    int guestCount() const;
+    Person *guest(int) const;
+
+    QString announcement() const;
+    void setAnnouncement(const QString &);
+
+    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
+
+    void startParty();
+signals:
+    void partyStarted(const QTime &time);
+
+private:
+    Person *m_host;
+    QList m_guests;
+};
+QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml b/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
new file mode 100644
index 0000000..5b8c8af
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
@@ -0,0 +1,36 @@
+import People 1.0
+
+// ![0]
+BirthdayParty {
+    HappyBirthdaySong on announcement { name: "Bob Jones" }
+// ![0]
+
+    onPartyStarted: console.log("This party started rockin' at " + time);
+
+
+    host: Boy {
+        name: "Bob Jones"
+        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
+    }
+
+    Boy { 
+        name: "Leo Hodges" 
+        BirthdayParty.rsvp: "2009-07-06"
+        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
+    }
+    Boy { 
+        name: "Jack Smith" 
+        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
+    }
+    Girl { 
+        name: "Anne Brown" 
+        BirthdayParty.rsvp: "2009-07-01"
+        shoe.size: 7
+        shoe.color: "red"
+        shoe.brand: "Marc Jacobs"
+        shoe.price: 699.99 
+    }
+
+// ![1]
+}
+// ![1]
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
new file mode 100644
index 0000000..8ea5c2b
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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.
+**
+** 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 "happybirthdaysong.h"
+#include 
+
+HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
+: QObject(parent), m_line(-1)
+{
+    setName(QString());
+    QTimer *timer = new QTimer(this);
+    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
+    timer->start(1000);
+}
+
+void HappyBirthdaySong::setTarget(const QDeclarativeProperty &p)
+{
+    m_target = p;
+}
+
+QString HappyBirthdaySong::name() const
+{
+    return m_name;
+}
+
+void HappyBirthdaySong::setName(const QString &name)
+{
+    m_name = name;
+
+    m_lyrics.clear();
+    m_lyrics << "Happy birthday to you,";
+    m_lyrics << "Happy birthday to you,";
+    m_lyrics << "Happy birthday dear " + m_name + ",";
+    m_lyrics << "Happy birthday to you!";
+    m_lyrics << "";
+}
+    
+void HappyBirthdaySong::advance()
+{
+    m_line = (m_line + 1) % m_lyrics.count();
+
+    m_target.write(m_lyrics.at(m_line));
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
new file mode 100644
index 0000000..3d07909
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 HAPPYBIRTHDAYSONG_H
+#define HAPPYBIRTHDAYSONG_H
+
+#include 
+#include 
+#include 
+
+#include 
+
+// ![0]
+class HappyBirthdaySong : public QObject, public QDeclarativePropertyValueSource
+{
+    Q_OBJECT
+    Q_INTERFACES(QDeclarativePropertyValueSource)
+// ![0]
+    Q_PROPERTY(QString name READ name WRITE setName)
+// ![1]
+public:
+    HappyBirthdaySong(QObject *parent = 0);
+
+    virtual void setTarget(const QDeclarativeProperty &);
+// ![1]
+
+    QString name() const;
+    void setName(const QString &);
+
+private slots:
+    void advance();
+
+private:
+    int m_line;
+    QStringList m_lyrics;
+    QDeclarativeProperty m_target;
+    QString m_name;
+// ![2]
+};
+// ![2]
+
+#endif // HAPPYBIRTHDAYSONG_H
+
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
new file mode 100644
index 0000000..00840ee
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 
+#include 
+#include 
+#include 
+#include "birthdayparty.h"
+#include "happybirthdaysong.h"
+#include "person.h"
+
+int main(int argc, char ** argv)
+{
+    QCoreApplication app(argc, argv);
+
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "BirthdayParty");
+    qmlRegisterType("People", 1,0, "HappyBirthdaySong");
+    qmlRegisterType();
+    qmlRegisterType();
+    qmlRegisterType("People", 1,0, "Boy");
+    qmlRegisterType("People", 1,0, "Girl");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, ":example.qml");
+    BirthdayParty *party = qobject_cast(component.create());
+
+    if (party && party->host()) {
+        qWarning() << party->host()->name() << "is having a birthday!";
+
+        if (qobject_cast(party->host()))
+            qWarning() << "He is inviting:";
+        else
+            qWarning() << "She is inviting:";
+
+        for (int ii = 0; ii < party->guestCount(); ++ii) {
+            Person *guest = party->guest(ii);
+
+            QDate rsvpDate;
+            QObject *attached = 
+                qmlAttachedPropertiesObject(guest, false);
+            if (attached)
+                rsvpDate = attached->property("rsvp").toDate();
+
+            if (rsvpDate.isNull())
+                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
+            else
+                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
+        }
+
+        party->startParty();
+    } else {
+        qWarning() << "An error occured";
+    }
+
+    return app.exec();
+}
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
new file mode 100644
index 0000000..0a9e508
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 "person.h"
+
+ShoeDescription::ShoeDescription(QObject *parent)
+: QObject(parent), m_size(0), m_price(0)
+{
+}
+
+int ShoeDescription::size() const
+{
+    return m_size;
+}
+
+void ShoeDescription::setSize(int s)
+{
+    m_size = s;
+}
+
+QColor ShoeDescription::color() const
+{
+    return m_color;
+}
+
+void ShoeDescription::setColor(const QColor &c)
+{
+    m_color = c;
+}
+
+QString ShoeDescription::brand() const
+{
+    return m_brand;
+}
+
+void ShoeDescription::setBrand(const QString &b)
+{
+    m_brand = b;
+}
+
+qreal ShoeDescription::price() const
+{
+    return m_price;
+}
+
+void ShoeDescription::setPrice(qreal p)
+{
+    m_price = p;
+}
+
+Person::Person(QObject *parent)
+: QObject(parent)
+{
+}
+
+QString Person::name() const
+{
+    return m_name;
+}
+
+void Person::setName(const QString &n)
+{
+    m_name = n;
+}
+
+ShoeDescription *Person::shoe()
+{
+    return &m_shoe;
+}
+
+
+Boy::Boy(QObject * parent)
+: Person(parent)
+{
+}
+
+
+Girl::Girl(QObject * parent)
+: Person(parent)
+{
+}
+
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/person.h b/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
new file mode 100644
index 0000000..2f444c5
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** 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 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.
+**
+** 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 PERSON_H
+#define PERSON_H
+
+#include 
+#include 
+
+class ShoeDescription : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int size READ size WRITE setSize)
+    Q_PROPERTY(QColor color READ color WRITE setColor)
+    Q_PROPERTY(QString brand READ brand WRITE setBrand)
+    Q_PROPERTY(qreal price READ price WRITE setPrice)
+public:
+    ShoeDescription(QObject *parent = 0);
+
+    int size() const;
+    void setSize(int);
+
+    QColor color() const;
+    void setColor(const QColor &);
+
+    QString brand() const;
+    void setBrand(const QString &);
+
+    qreal price() const;
+    void setPrice(qreal);
+private:
+    int m_size;
+    QColor m_color;
+    QString m_brand;
+    qreal m_price;
+};
+
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(ShoeDescription *shoe READ shoe)
+public:
+    Person(QObject *parent = 0);
+
+    QString name() const;
+    void setName(const QString &);
+
+    ShoeDescription *shoe();
+private:
+    QString m_name;
+    ShoeDescription m_shoe;
+};
+
+class Boy : public Person
+{
+    Q_OBJECT
+public:
+    Boy(QObject * parent = 0);
+};
+
+class Girl : public Person
+{
+    Q_OBJECT
+public:
+    Girl(QObject * parent = 0);
+};
+
+#endif // PERSON_H
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
new file mode 100644
index 0000000..0626c98
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET = valuesource
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           person.cpp \
+           birthdayparty.cpp \
+           happybirthdaysong.cpp 
+HEADERS += person.h \
+           birthdayparty.h \
+           happybirthdaysong.h
+RESOURCES += valuesource.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/valuesource
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/valuesource
+INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
new file mode 100644
index 0000000..e2fa01d
--- /dev/null
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
@@ -0,0 +1,5 @@
+
+
+    example.qml
+
+
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 913b2b0..e3d922c 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -2,53 +2,28 @@ TEMPLATE = subdirs
 
 # These examples contain some C++ and need to be built
 SUBDIRS = \
-   extending \
-   imageprovider \
-   objectlistmodel \
-   stringlistmodel \
-   proxyviewer \
-   plugins \
-   proxywidgets
+   cppextensions \
+   modelviews \
+   tutorials 
 
 # plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name
 symbian:SUBDIRS -= plugins
 
 # These examples contain no C++ and can simply be copied
 sources.files = \
-   animations \
-   aspectratio \
-   behaviors \
-   border-image \
-   clocks \
-   connections \
-   dial \
-   dynamic \
-   effects \
-   fillmode \
-   focus \
-   fonts \
-   gridview \
-   layouts \
-   listview \
-   mousearea \
-   package \
-   parallax \
-   progressbar \
-   scrollbar \
-   searchbox \
-   slideswitch \
-   spinner \
-   sql \
-   states \
-   tabwidget \
-   tic-tac-toe \
-   tutorials \
-   tvtennis \
-   velocity \
-   webview \
-   workerlistmodel \
-   workerscript \
-   xmldata \
-   xmlhttprequest
+   animation \
+   cppextensions \
+   i18n \
+   imageelements \
+   keyinteraction \
+   positioners \
+   sqllocalstorage \
+   text \
+   threading \
+   touchinteraction \
+   toys \
+   ui-components \
+   xml
+
 sources.path = $$[QT_INSTALL_EXAMPLES]/declarative
 INSTALLS += sources
diff --git a/examples/declarative/dial/content/Dial.qml b/examples/declarative/dial/content/Dial.qml
deleted file mode 100644
index f9ab3e3..0000000
--- a/examples/declarative/dial/content/Dial.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: root
-    property real value : 0
-
-    width: 210; height: 210
-
-    Image { source: "background.png" }
-
-    Image {
-        x: 93
-        y: 35
-        source: "needle_shadow.png"
-        transform: Rotation {
-            origin.x: 11; origin.y: 67
-            angle: needleRotation.angle
-        }
-    }
-    Image {
-        id: needle
-        x: 95; y: 33
-        smooth: true
-        source: "needle.png"
-        transform: Rotation {
-            id: needleRotation
-            origin.x: 7; origin.y: 65
-            angle: -130
-            SpringFollow on angle {
-                spring: 1.4
-                damping: .15
-                to: Math.min(Math.max(-130, root.value*2.6 - 130), 133)
-            }
-        }
-    }
-    Image { x: 21; y: 18; source: "overlay.png" }
-}
diff --git a/examples/declarative/dial/content/background.png b/examples/declarative/dial/content/background.png
deleted file mode 100644
index 75d555d..0000000
Binary files a/examples/declarative/dial/content/background.png and /dev/null differ
diff --git a/examples/declarative/dial/content/needle.png b/examples/declarative/dial/content/needle.png
deleted file mode 100644
index 2d19f75..0000000
Binary files a/examples/declarative/dial/content/needle.png and /dev/null differ
diff --git a/examples/declarative/dial/content/needle_shadow.png b/examples/declarative/dial/content/needle_shadow.png
deleted file mode 100644
index 8d8a928..0000000
Binary files a/examples/declarative/dial/content/needle_shadow.png and /dev/null differ
diff --git a/examples/declarative/dial/content/overlay.png b/examples/declarative/dial/content/overlay.png
deleted file mode 100644
index 3860a7b..0000000
Binary files a/examples/declarative/dial/content/overlay.png and /dev/null differ
diff --git a/examples/declarative/dial/dial-example.qml b/examples/declarative/dial/dial-example.qml
deleted file mode 100644
index 2e102b0..0000000
--- a/examples/declarative/dial/dial-example.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    color: "#545454"
-    width: 300; height: 300
-
-    // Dial with a slider to adjust it
-    Dial {
-        id: dial
-        anchors.centerIn: parent
-        value: slider.x * 100 / (container.width - 34)
-    }
-
-    Rectangle {
-        id: container
-        anchors { bottom: parent.bottom; left: parent.left; right: parent.right; leftMargin: 20; rightMargin: 20; bottomMargin: 10 }
-        height: 16
-
-        radius: 8
-        opacity: 0.7
-        smooth: true
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "gray" }
-            GradientStop { position: 1.0; color: "white" }
-        }
-
-        Rectangle {
-            id: slider
-            x: 1; y: 1; width: 30; height: 14
-            radius: 6
-            smooth: true
-            gradient: Gradient {
-                GradientStop { position: 0.0; color: "#424242" }
-                GradientStop { position: 1.0; color: "black" }
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                drag.target: parent; drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: container.width - 32
-            }
-        }
-    }
-}
diff --git a/examples/declarative/dial/dial.qmlproject b/examples/declarative/dial/dial.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/dial/dial.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
deleted file mode 100644
index 52c7c1e..0000000
--- a/examples/declarative/dynamic/dynamic.qml
+++ /dev/null
@@ -1,176 +0,0 @@
-import Qt 4.7
-import Qt.labs.particles 1.0
-import "qml"
-
-Item {
-    id: window
-
-    property int activeSuns: 0
-
-    //This is a desktop-sized example
-    width: 1024; height: 512
-    
-    //This is the message box that pops up when there's an error
-    Rectangle {
-        id: dialog
-
-        opacity: 0
-        anchors.centerIn: parent
-        width: dialogText.width + 6; height: dialogText.height + 6
-        border.color: 'black'
-        color: 'lightsteelblue'
-        z: 65535 //Arbitrary number chosen to be above all the items, including the scaled perspective ones.
-
-        function show(str){
-            dialogText.text = str;
-            dialogAnim.start();
-        }
-
-        Text {
-            id: dialogText
-            x: 3; y: 3
-            font.pixelSize: 14
-        }
-
-        SequentialAnimation {
-            id: dialogAnim
-            NumberAnimation { target: dialog; property:"opacity"; to: 1; duration: 1000 }
-            PauseAnimation { duration: 5000 }
-            NumberAnimation { target: dialog; property:"opacity"; to: 0; duration: 1000 }
-        }
-    }
-
-    // sky
-    Rectangle {
-        id: sky
-        anchors { left: parent.left; top: parent.top; right: toolbox.right; bottom: parent.verticalCenter }
-        gradient: Gradient {
-            GradientStop { id: gradientStopA; position: 0.0; color: "#0E1533" }
-            GradientStop { id: gradientStopB; position: 1.0; color: "#437284" }
-        }
-    }
-
-    // stars (when there's no sun)
-    Particles {
-        id: stars
-        x: 0; y: 0; width: parent.width; height: parent.height / 2
-        source: "images/star.png"
-        angleDeviation: 360
-        velocity: 0; velocityDeviation: 0
-        count: parent.width / 10
-        fadeInDuration: 2800
-        opacity: 1
-    }
-
-    // ground
-    Rectangle {
-        id: ground
-        z: 2    // just above the sun so that the sun can set behind it
-        anchors { left: parent.left; top: parent.verticalCenter; right: toolbox.left; bottom: parent.bottom }
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "ForestGreen" }
-            GradientStop { position: 1.0; color: "DarkGreen" }
-        }
-    }
-
-    SystemPalette { id: activePalette }
-
-    // right-hand panel
-    Rectangle {
-        id: toolbox
-
-        width: 480
-        color: activePalette.window
-        anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
-
-        Column {
-            anchors.centerIn: parent
-            spacing: 8
-
-            Text { text: "Drag an item into the scene." }
-
-            Rectangle {
-                width: childrenRect.width + 10; height: childrenRect.height + 10
-                border.color: "black"
-
-                Row {
-                    anchors.centerIn: parent
-                    spacing: 8
-
-                    PaletteItem {
-                        anchors.verticalCenter: parent.verticalCenter
-                        componentFile: "Sun.qml"
-                        image: "../images/sun.png"
-                    }
-                    PaletteItem {
-                        anchors.verticalCenter: parent.verticalCenter
-                        componentFile: "GenericSceneItem.qml"
-                        image: "../images/moon.png"
-                    }
-                    PaletteItem {
-                        anchors.verticalCenter: parent.verticalCenter
-                        componentFile: "PerspectiveItem.qml"
-                        image: "../images/tree_s.png"
-                    }
-                    PaletteItem {
-                        anchors.verticalCenter: parent.verticalCenter
-                        componentFile: "PerspectiveItem.qml"
-                        image: "../images/rabbit_brown.png"
-                    }
-                    PaletteItem {
-                        anchors.verticalCenter: parent.verticalCenter
-                        componentFile: "PerspectiveItem.qml"
-                        image: "../images/rabbit_bw.png"
-                    }
-                }
-            }
-
-            Text { text: "Active Suns: " + activeSuns }
-
-            Rectangle { width: parent.width; height: 1; color: "black" }
-
-            Text { text: "Arbitrary QML:" }
-
-            Rectangle {
-                width: 460; height: 240
-
-                TextEdit {
-                    id: qmlText
-                    anchors.fill: parent; anchors.margins: 5
-                    readOnly: false
-                    focusOnPress: true
-                    font.pixelSize: 14
-
-                    text: "import Qt 4.7\nImage {\n    id: smile\n    x: 500 * Math.random()\n    y: 200 * Math.random() \n    source: 'images/face-smile.png'\n\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n\n    Component.onCompleted: smile.destroy(1500);\n}"
-                }
-            }
-
-            Button {
-                text: "Create"
-                onClicked: {
-                    try { 
-                        Qt.createQmlObject(qmlText.text, window, 'CustomObject');
-                    } catch(err) {
-                        dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message);
-                    }
-                }
-            }
-        }
-    }
-
-    //Day state, for when a sun is added to the scene
-    states: State {
-        name: "Day"
-        when: window.activeSuns > 0
-
-        PropertyChanges { target: gradientStopA; color: "DeepSkyBlue" }
-        PropertyChanges { target: gradientStopB; color: "SkyBlue" }
-        PropertyChanges { target: stars; opacity: 0 }
-    }
-
-    transitions: Transition {
-        PropertyAnimation { duration: 3000 }
-        ColorAnimation { duration: 3000 }
-    }
-
-}
diff --git a/examples/declarative/dynamic/dynamic.qmlproject b/examples/declarative/dynamic/dynamic.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/dynamic/dynamic.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/dynamic/images/NOTE b/examples/declarative/dynamic/images/NOTE
deleted file mode 100644
index fcd87f9..0000000
--- a/examples/declarative/dynamic/images/NOTE
+++ /dev/null
@@ -1 +0,0 @@
-Images (except star.png) are from the KDE project.
diff --git a/examples/declarative/dynamic/images/face-smile.png b/examples/declarative/dynamic/images/face-smile.png
deleted file mode 100644
index 3d66d72..0000000
Binary files a/examples/declarative/dynamic/images/face-smile.png and /dev/null differ
diff --git a/examples/declarative/dynamic/images/moon.png b/examples/declarative/dynamic/images/moon.png
deleted file mode 100644
index 1c0d606..0000000
Binary files a/examples/declarative/dynamic/images/moon.png and /dev/null differ
diff --git a/examples/declarative/dynamic/images/rabbit_brown.png b/examples/declarative/dynamic/images/rabbit_brown.png
deleted file mode 100644
index ebfdeed..0000000
Binary files a/examples/declarative/dynamic/images/rabbit_brown.png and /dev/null differ
diff --git a/examples/declarative/dynamic/images/rabbit_bw.png b/examples/declarative/dynamic/images/rabbit_bw.png
deleted file mode 100644
index 7bff9b9..0000000
Binary files a/examples/declarative/dynamic/images/rabbit_bw.png and /dev/null differ
diff --git a/examples/declarative/dynamic/images/star.png b/examples/declarative/dynamic/images/star.png
deleted file mode 100644
index 27ef924..0000000
Binary files a/examples/declarative/dynamic/images/star.png and /dev/null differ
diff --git a/examples/declarative/dynamic/images/sun.png b/examples/declarative/dynamic/images/sun.png
deleted file mode 100644
index 7713ca5..0000000
Binary files a/examples/declarative/dynamic/images/sun.png and /dev/null differ
diff --git a/examples/declarative/dynamic/images/tree_s.png b/examples/declarative/dynamic/images/tree_s.png
deleted file mode 100644
index 6eac35a..0000000
Binary files a/examples/declarative/dynamic/images/tree_s.png and /dev/null differ
diff --git a/examples/declarative/dynamic/qml/Button.qml b/examples/declarative/dynamic/qml/Button.qml
deleted file mode 100644
index 963a850..0000000
--- a/examples/declarative/dynamic/qml/Button.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: container
-
-    property variant text
-    signal clicked
-
-    height: text.height + 10; width: text.width + 20
-    border.width: 1
-    radius: 4
-    smooth: true
-
-    gradient: Gradient {
-        GradientStop {
-            position: 0.0
-            color: !mouseArea.pressed ? activePalette.light : activePalette.button
-        }
-        GradientStop {
-            position: 1.0
-            color: !mouseArea.pressed ? activePalette.button : activePalette.dark
-        }
-    }
-
-    SystemPalette { id: activePalette }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: container.clicked()
-    }
-
-    Text {
-        id: text
-        anchors.centerIn:parent
-        font.pointSize: 10
-        text: parent.text
-        color: activePalette.buttonText
-    }
-}
diff --git a/examples/declarative/dynamic/qml/PaletteItem.qml b/examples/declarative/dynamic/qml/PaletteItem.qml
deleted file mode 100644
index dcb5cc3..0000000
--- a/examples/declarative/dynamic/qml/PaletteItem.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import Qt 4.7
-import "itemCreation.js" as Code
-
-Image {
-    id: paletteItem
-
-    property string componentFile
-    property string image
-
-    source: image
-
-    MouseArea { 
-        anchors.fill: parent
-
-        onPressed: Code.startDrag(mouse);
-        onPositionChanged: Code.continueDrag(mouse);
-        onReleased: Code.endDrag(mouse);
-    }
-}
diff --git a/examples/declarative/dynamic/qml/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml
deleted file mode 100644
index c04d3dc..0000000
--- a/examples/declarative/dynamic/qml/PerspectiveItem.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.7
-
-Image {
-    id: rootItem
-
-    property bool created: false
-    property string image 
-
-    property double scaledBottom: y + (height + height*scale) / 2 
-    property bool onLand: scaledBottom > window.height / 2
-
-    source: image
-    opacity: onLand ? 1 : 0.25
-    scale: Math.max((y + height - 250) * 0.01, 0.3)
-    smooth: true
-
-    onCreatedChanged: {
-        if (created && !onLand)
-            rootItem.destroy();
-        else
-            z = scaledBottom;
-    }
-
-    onYChanged: z = scaledBottom;
-}
diff --git a/examples/declarative/dynamic/qml/Sun.qml b/examples/declarative/dynamic/qml/Sun.qml
deleted file mode 100644
index 43dcb9a..0000000
--- a/examples/declarative/dynamic/qml/Sun.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import Qt 4.7
-
-Image {
-    id: sun
-
-    property bool created: false
-    property string image: "../images/sun.png"
-
-    source: image
-
-    // once item is created, start moving offscreen
-    NumberAnimation on y {
-        to: window.height / 2
-        running: created
-        onRunningChanged: {
-            if (running)
-                duration = (window.height - sun.y) * 10;
-            else
-                state = "OffScreen"
-        }
-    }
-
-    states: State {
-        name: "OffScreen"
-        StateChangeScript {
-            script: { sun.created = false; sun.destroy() }
-        }
-    }
-
-    onCreatedChanged: {
-        if (created) {
-            sun.z = 1;    // above the sky but below the ground layer 
-            window.activeSuns++;
-        } else {
-            window.activeSuns--;
-        }
-    }
-}
diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js
deleted file mode 100644
index 59750f3..0000000
--- a/examples/declarative/dynamic/qml/itemCreation.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var itemComponent = null;
-var draggedItem = null;
-var startingMouse;
-var posnInWindow;
-
-function startDrag(mouse)
-{
-    posnInWindow = paletteItem.mapToItem(null, 0, 0);
-    startingMouse = { x: mouse.x, y: mouse.y }
-    loadComponent();
-}
-
-//Creation is split into two functions due to an asynchronous wait while
-//possible external files are loaded.
-
-function loadComponent() {
-    if (itemComponent != null) { // component has been previously loaded
-        createItem();
-        return;
-    }
-
-    itemComponent = Qt.createComponent(paletteItem.componentFile);
-    if (itemComponent.status == Component.Loading)  //Depending on the content, it can be ready or error immediately
-        component.statusChanged.connect(createItem);
-    else    
-        createItem();
-}
-
-function createItem() {
-    if (itemComponent.status == Component.Ready && draggedItem == null) {
-        draggedItem = itemComponent.createObject(window);
-        draggedItem.image = paletteItem.image;
-        draggedItem.x = posnInWindow.x;
-        draggedItem.y = posnInWindow.y;
-        draggedItem.z = 3;  // make sure created item is above the ground layer
-    } else if (itemComponent.status == Component.Error) {
-        draggedItem = null;
-        console.log("error creating component");
-        console.log(component.errorsString());
-    }
-}
-
-function continueDrag(mouse)
-{
-    if (draggedItem == null)
-        return;
-
-    draggedItem.x = mouse.x + posnInWindow.x - startingMouse.x;
-    draggedItem.y = mouse.y + posnInWindow.y - startingMouse.y;
-}
-
-function endDrag(mouse)
-{
-    if (draggedItem == null)
-        return;
-
-    if (draggedItem.x + draggedItem.width > toolbox.x) { //Don't drop it in the toolbox
-        draggedItem.destroy();
-        draggedItem = null;
-    } else {
-        draggedItem.created = true;
-        draggedItem = null;
-    }
-}
-
diff --git a/examples/declarative/extending/adding/adding.pro b/examples/declarative/extending/adding/adding.pro
deleted file mode 100644
index 6072de4..0000000
--- a/examples/declarative/extending/adding/adding.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = adding
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp 
-HEADERS += person.h
-RESOURCES += adding.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/adding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/adding
-INSTALLS += target sources
diff --git a/examples/declarative/extending/adding/adding.qrc b/examples/declarative/extending/adding/adding.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/adding/adding.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/adding/example.qml b/examples/declarative/extending/adding/example.qml
deleted file mode 100644
index dc891e7..0000000
--- a/examples/declarative/extending/adding/example.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-// ![0]
-import People 1.0
-
-Person {
-    name: "Bob Jones"
-    shoeSize: 12
-}
-// ![0]
diff --git a/examples/declarative/extending/adding/main.cpp b/examples/declarative/extending/adding/main.cpp
deleted file mode 100644
index 7b33895..0000000
--- a/examples/declarative/extending/adding/main.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-//![0]
-    qmlRegisterType("People", 1,0, "Person");
-//![0]
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    Person *person = qobject_cast(component.create());
-    if (person) {
-        qWarning() << "The person's name is" << person->name();
-        qWarning() << "They wear a" << person->shoeSize() << "sized shoe";
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/adding/person.cpp b/examples/declarative/extending/adding/person.cpp
deleted file mode 100644
index cdf08e0..0000000
--- a/examples/declarative/extending/adding/person.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-// ![0]
-Person::Person(QObject *parent)
-: QObject(parent), m_shoeSize(0)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-int Person::shoeSize() const
-{
-    return m_shoeSize;
-}
-
-void Person::setShoeSize(int s)
-{
-    m_shoeSize = s;
-}
-
-// ![0]
diff --git a/examples/declarative/extending/adding/person.h b/examples/declarative/extending/adding/person.h
deleted file mode 100644
index d6de9a9..0000000
--- a/examples/declarative/extending/adding/person.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-// ![0]
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    int shoeSize() const;
-    void setShoeSize(int);
-
-private:
-    QString m_name;
-    int m_shoeSize;
-};
-// ![0]
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/attached/attached.pro b/examples/declarative/extending/attached/attached.pro
deleted file mode 100644
index f6d76ed..0000000
--- a/examples/declarative/extending/attached/attached.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-TARGET = attached
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp 
-HEADERS += person.h \
-           birthdayparty.h
-RESOURCES += attached.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/attached
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/attached
-INSTALLS += target sources
diff --git a/examples/declarative/extending/attached/attached.qrc b/examples/declarative/extending/attached/attached.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/attached/attached.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/attached/birthdayparty.cpp b/examples/declarative/extending/attached/birthdayparty.cpp
deleted file mode 100644
index 7fa1748..0000000
--- a/examples/declarative/extending/attached/birthdayparty.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
-: QObject(object)
-{
-}
-
-QDate BirthdayPartyAttached::rsvp() const
-{
-    return m_rsvp;
-}
-
-void BirthdayPartyAttached::setRsvp(const QDate &d)
-{
-    m_rsvp = d;
-}
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
-BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
-{
-    return new BirthdayPartyAttached(object);
-}
-
diff --git a/examples/declarative/extending/attached/birthdayparty.h b/examples/declarative/extending/attached/birthdayparty.h
deleted file mode 100644
index 1c66f8c..0000000
--- a/examples/declarative/extending/attached/birthdayparty.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include 
-#include "person.h"
-
-class BirthdayPartyAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
-public:
-    BirthdayPartyAttached(QObject *object);
-
-    QDate rsvp() const;
-    void setRsvp(const QDate &);
-
-private:
-    QDate m_rsvp;
-};
-
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-    Q_CLASSINFO("DefaultProperty", "guests")
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
-private:
-    Person *m_host;
-    QList m_guests;
-};
-
-QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/attached/example.qml b/examples/declarative/extending/attached/example.qml
deleted file mode 100644
index 50f0a32..0000000
--- a/examples/declarative/extending/attached/example.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import People 1.0
-
-BirthdayParty {
-    host: Boy {
-        name: "Bob Jones"
-        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
-    }
-
-    // ![1]
-    Boy { 
-        name: "Leo Hodges" 
-        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
-
-        BirthdayParty.rsvp: "2009-07-06"
-    }
-    // ![1]
-    Boy { 
-        name: "Jack Smith" 
-        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
-    }
-    Girl { 
-        name: "Anne Brown" 
-        shoe.size: 7
-        shoe.color: "red"
-        shoe.brand: "Marc Jacobs"
-        shoe.price: 699.99 
-
-        BirthdayParty.rsvp: "2009-07-01"
-    }
-}
-
diff --git a/examples/declarative/extending/attached/main.cpp b/examples/declarative/extending/attached/main.cpp
deleted file mode 100644
index f1055ae..0000000
--- a/examples/declarative/extending/attached/main.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType();
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        for (int ii = 0; ii < party->guestCount(); ++ii) {
-            Person *guest = party->guest(ii);
-
-            QDate rsvpDate;
-            QObject *attached = 
-                qmlAttachedPropertiesObject(guest, false);
-            if (attached)
-                rsvpDate = attached->property("rsvp").toDate();
-
-            if (rsvpDate.isNull())
-                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
-            else
-                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
-        }
-
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/attached/person.cpp b/examples/declarative/extending/attached/person.cpp
deleted file mode 100644
index 0a9e508..0000000
--- a/examples/declarative/extending/attached/person.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-ShoeDescription::ShoeDescription(QObject *parent)
-: QObject(parent), m_size(0), m_price(0)
-{
-}
-
-int ShoeDescription::size() const
-{
-    return m_size;
-}
-
-void ShoeDescription::setSize(int s)
-{
-    m_size = s;
-}
-
-QColor ShoeDescription::color() const
-{
-    return m_color;
-}
-
-void ShoeDescription::setColor(const QColor &c)
-{
-    m_color = c;
-}
-
-QString ShoeDescription::brand() const
-{
-    return m_brand;
-}
-
-void ShoeDescription::setBrand(const QString &b)
-{
-    m_brand = b;
-}
-
-qreal ShoeDescription::price() const
-{
-    return m_price;
-}
-
-void ShoeDescription::setPrice(qreal p)
-{
-    m_price = p;
-}
-
-Person::Person(QObject *parent)
-: QObject(parent)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-ShoeDescription *Person::shoe()
-{
-    return &m_shoe;
-}
-
-
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
diff --git a/examples/declarative/extending/attached/person.h b/examples/declarative/extending/attached/person.h
deleted file mode 100644
index 2f444c5..0000000
--- a/examples/declarative/extending/attached/person.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-#include 
-
-class ShoeDescription : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int size READ size WRITE setSize)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
-    Q_PROPERTY(QString brand READ brand WRITE setBrand)
-    Q_PROPERTY(qreal price READ price WRITE setPrice)
-public:
-    ShoeDescription(QObject *parent = 0);
-
-    int size() const;
-    void setSize(int);
-
-    QColor color() const;
-    void setColor(const QColor &);
-
-    QString brand() const;
-    void setBrand(const QString &);
-
-    qreal price() const;
-    void setPrice(qreal);
-private:
-    int m_size;
-    QColor m_color;
-    QString m_brand;
-    qreal m_price;
-};
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(ShoeDescription *shoe READ shoe)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    ShoeDescription *shoe();
-private:
-    QString m_name;
-    ShoeDescription m_shoe;
-};
-
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/binding/binding.pro b/examples/declarative/extending/binding/binding.pro
deleted file mode 100644
index 896ce25..0000000
--- a/examples/declarative/extending/binding/binding.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = binding
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp \
-           happybirthdaysong.cpp 
-HEADERS += person.h \
-           birthdayparty.h \
-           happybirthdaysong.h
-RESOURCES += binding.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/binding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/binding
-INSTALLS += target sources
diff --git a/examples/declarative/extending/binding/binding.qrc b/examples/declarative/extending/binding/binding.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/binding/binding.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/binding/birthdayparty.cpp b/examples/declarative/extending/binding/birthdayparty.cpp
deleted file mode 100644
index 000bb1f..0000000
--- a/examples/declarative/extending/binding/birthdayparty.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
-: QObject(object)
-{
-}
-
-QDate BirthdayPartyAttached::rsvp() const
-{
-    return m_rsvp;
-}
-
-void BirthdayPartyAttached::setRsvp(const QDate &d)
-{
-    if (d != m_rsvp) {
-        m_rsvp = d;
-        emit rsvpChanged();
-    }
-}
-
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    if (c == m_host) return;
-    m_host = c;
-    emit hostChanged();
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
-void BirthdayParty::startParty()
-{
-    QTime time = QTime::currentTime();
-    emit partyStarted(time);
-}
-
-QString BirthdayParty::announcement() const
-{
-    return QString();
-}
-
-void BirthdayParty::setAnnouncement(const QString &speak)
-{
-    qWarning() << qPrintable(speak);
-}
-
-BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
-{
-    return new BirthdayPartyAttached(object);
-}
-
diff --git a/examples/declarative/extending/binding/birthdayparty.h b/examples/declarative/extending/binding/birthdayparty.h
deleted file mode 100644
index c3f033e..0000000
--- a/examples/declarative/extending/binding/birthdayparty.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include 
-#include 
-#include "person.h"
-
-class BirthdayPartyAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp NOTIFY rsvpChanged)
-public:
-    BirthdayPartyAttached(QObject *object);
-
-    QDate rsvp() const;
-    void setRsvp(const QDate &);
-
-signals:
-    void rsvpChanged();
-
-private:
-    QDate m_rsvp;
-};
-
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-// ![0]
-    Q_PROPERTY(Person *host READ host WRITE setHost NOTIFY hostChanged)
-// ![0]
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-    Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
-    Q_CLASSINFO("DefaultProperty", "guests")
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-    QString announcement() const;
-    void setAnnouncement(const QString &);
-
-    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
-
-    void startParty();
-signals:
-    void partyStarted(const QTime &time);
-    void hostChanged();
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-
-QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/binding/example.qml b/examples/declarative/extending/binding/example.qml
deleted file mode 100644
index 82eb3be..0000000
--- a/examples/declarative/extending/binding/example.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    id: theParty
-
-    HappyBirthdaySong on announcement { name: theParty.host.name }
-
-    host: Boy {
-        name: "Bob Jones"
-        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
-    }
-// ![0]
-    onPartyStarted: console.log("This party started rockin' at " + time);
-
-
-    Boy {
-        name: "Leo Hodges"
-        BirthdayParty.rsvp: "2009-07-06"
-        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
-    }
-    Boy {
-        name: "Jack Smith"
-        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
-    }
-    Girl {
-        name: "Anne Brown"
-        BirthdayParty.rsvp: "2009-07-01"
-        shoe.size: 7
-        shoe.color: "red"
-        shoe.brand: "Marc Jacobs"
-        shoe.price: 699.99
-    }
-
-// ![1]
-}
-// ![1]
diff --git a/examples/declarative/extending/binding/happybirthdaysong.cpp b/examples/declarative/extending/binding/happybirthdaysong.cpp
deleted file mode 100644
index a40e7fb..0000000
--- a/examples/declarative/extending/binding/happybirthdaysong.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "happybirthdaysong.h"
-#include 
-
-HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
-: QObject(parent), m_line(-1)
-{
-    setName(QString());
-    QTimer *timer = new QTimer(this);
-    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
-    timer->start(1000);
-}
-
-void HappyBirthdaySong::setTarget(const QDeclarativeProperty &p)
-{
-    m_target = p;
-}
-
-QString HappyBirthdaySong::name() const
-{
-    return m_name;
-}
-
-void HappyBirthdaySong::setName(const QString &name)
-{
-    if (m_name == name)
-        return;
-
-    m_name = name;
-
-    m_lyrics.clear();
-    m_lyrics << "Happy birthday to you,";
-    m_lyrics << "Happy birthday to you,";
-    m_lyrics << "Happy birthday dear " + m_name + ",";
-    m_lyrics << "Happy birthday to you!";
-    m_lyrics << "";
-    
-    emit nameChanged();
-}
-    
-void HappyBirthdaySong::advance()
-{
-    m_line = (m_line + 1) % m_lyrics.count();
-
-    m_target.write(m_lyrics.at(m_line));
-}
-
diff --git a/examples/declarative/extending/binding/happybirthdaysong.h b/examples/declarative/extending/binding/happybirthdaysong.h
deleted file mode 100644
index e825b86..0000000
--- a/examples/declarative/extending/binding/happybirthdaysong.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 HAPPYBIRTHDAYSONG_H
-#define HAPPYBIRTHDAYSONG_H
-
-#include 
-#include 
-
-#include 
-
-class HappyBirthdaySong : public QObject, public QDeclarativePropertyValueSource
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_INTERFACES(QDeclarativePropertyValueSource)
-public:
-    HappyBirthdaySong(QObject *parent = 0);
-
-    virtual void setTarget(const QDeclarativeProperty &);
-
-    QString name() const;
-    void setName(const QString &);
-
-private slots:
-    void advance();
-
-signals:
-    void nameChanged();
-private:
-    int m_line;
-    QStringList m_lyrics;
-    QDeclarativeProperty m_target;
-    QString m_name;
-};
-
-#endif // HAPPYBIRTHDAYSONG_H
-
diff --git a/examples/declarative/extending/binding/main.cpp b/examples/declarative/extending/binding/main.cpp
deleted file mode 100644
index 2495676..0000000
--- a/examples/declarative/extending/binding/main.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "happybirthdaysong.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType("People", 1,0, "HappyBirthdaySong");
-    qmlRegisterType();
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        for (int ii = 0; ii < party->guestCount(); ++ii) {
-            Person *guest = party->guest(ii);
-
-            QDate rsvpDate;
-            QObject *attached = 
-                qmlAttachedPropertiesObject(guest, false);
-            if (attached)
-                rsvpDate = attached->property("rsvp").toDate();
-
-            if (rsvpDate.isNull())
-                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
-            else
-                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
-        }
-
-        party->startParty();
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return app.exec();
-}
diff --git a/examples/declarative/extending/binding/person.cpp b/examples/declarative/extending/binding/person.cpp
deleted file mode 100644
index 9a2248f..0000000
--- a/examples/declarative/extending/binding/person.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-ShoeDescription::ShoeDescription(QObject *parent)
-: QObject(parent), m_size(0), m_price(0)
-{
-}
-
-int ShoeDescription::size() const
-{
-    return m_size;
-}
-
-void ShoeDescription::setSize(int s)
-{
-    if (m_size == s)
-        return;
-
-    m_size = s;
-    emit shoeChanged();
-}
-
-QColor ShoeDescription::color() const
-{
-    return m_color;
-}
-
-void ShoeDescription::setColor(const QColor &c)
-{
-    if (m_color == c)
-        return;
-
-    m_color = c;
-    emit shoeChanged();
-}
-
-QString ShoeDescription::brand() const
-{
-    return m_brand;
-}
-
-void ShoeDescription::setBrand(const QString &b)
-{
-    if (m_brand == b)
-        return;
-
-    m_brand = b;
-    emit shoeChanged();
-}
-
-qreal ShoeDescription::price() const
-{
-    return m_price;
-}
-
-void ShoeDescription::setPrice(qreal p)
-{
-    if (m_price == p)
-        return;
-
-    m_price = p;
-    emit shoeChanged();
-}
-
-Person::Person(QObject *parent)
-: QObject(parent)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    if (m_name == n)
-        return;
-
-    m_name = n;
-    emit nameChanged();
-}
-
-ShoeDescription *Person::shoe()
-{
-    return &m_shoe;
-}
-
-
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
diff --git a/examples/declarative/extending/binding/person.h b/examples/declarative/extending/binding/person.h
deleted file mode 100644
index 2a68da0..0000000
--- a/examples/declarative/extending/binding/person.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-#include 
-
-class ShoeDescription : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int size READ size WRITE setSize NOTIFY shoeChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY shoeChanged)
-    Q_PROPERTY(QString brand READ brand WRITE setBrand NOTIFY shoeChanged)
-    Q_PROPERTY(qreal price READ price WRITE setPrice NOTIFY shoeChanged)
-public:
-    ShoeDescription(QObject *parent = 0);
-
-    int size() const;
-    void setSize(int);
-
-    QColor color() const;
-    void setColor(const QColor &);
-
-    QString brand() const;
-    void setBrand(const QString &);
-
-    qreal price() const;
-    void setPrice(qreal);
-signals:
-    void shoeChanged();
-
-private:
-    int m_size;
-    QColor m_color;
-    QString m_brand;
-    qreal m_price;
-};
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-// ![0]
-    Q_PROPERTY(ShoeDescription *shoe READ shoe CONSTANT)
-// ![0]
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    ShoeDescription *shoe();
-signals:
-    void nameChanged();
-
-private:
-    QString m_name;
-    ShoeDescription m_shoe;
-};
-
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/coercion/birthdayparty.cpp b/examples/declarative/extending/coercion/birthdayparty.cpp
deleted file mode 100644
index 4f415a3..0000000
--- a/examples/declarative/extending/coercion/birthdayparty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
diff --git a/examples/declarative/extending/coercion/birthdayparty.h b/examples/declarative/extending/coercion/birthdayparty.h
deleted file mode 100644
index ee77e9a..0000000
--- a/examples/declarative/extending/coercion/birthdayparty.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include "person.h"
-
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-// ![0]
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-// ![0]
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/coercion/coercion.pro b/examples/declarative/extending/coercion/coercion.pro
deleted file mode 100644
index c8daed8..0000000
--- a/examples/declarative/extending/coercion/coercion.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-TARGET = coercion
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp 
-HEADERS += person.h \
-           birthdayparty.h
-RESOURCES += coercion.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/coercion
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/coercion
-INSTALLS += target sources
diff --git a/examples/declarative/extending/coercion/coercion.qrc b/examples/declarative/extending/coercion/coercion.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/coercion/coercion.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/coercion/example.qml b/examples/declarative/extending/coercion/example.qml
deleted file mode 100644
index 7b45950..0000000
--- a/examples/declarative/extending/coercion/example.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    host: Boy {
-        name: "Bob Jones"
-        shoeSize: 12
-    }
-    guests: [
-        Boy { name: "Leo Hodges" },
-        Boy { name: "Jack Smith" },
-        Girl { name: "Anne Brown" }
-    ]
-}
-// ![0]
diff --git a/examples/declarative/extending/coercion/main.cpp b/examples/declarative/extending/coercion/main.cpp
deleted file mode 100644
index 2c7b545..0000000
--- a/examples/declarative/extending/coercion/main.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-// ![0]
-    qmlRegisterType();
-// ![0]
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        for (int ii = 0; ii < party->guestCount(); ++ii)
-            qWarning() << "   " << party->guest(ii)->name();
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/coercion/person.cpp b/examples/declarative/extending/coercion/person.cpp
deleted file mode 100644
index 5b5203a..0000000
--- a/examples/declarative/extending/coercion/person.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-Person::Person(QObject *parent)
-: QObject(parent), m_shoeSize(0)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-int Person::shoeSize() const
-{
-    return m_shoeSize;
-}
-
-void Person::setShoeSize(int s)
-{
-    m_shoeSize = s;
-}
-
-// ![1]
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
-// ![1]
diff --git a/examples/declarative/extending/coercion/person.h b/examples/declarative/extending/coercion/person.h
deleted file mode 100644
index 1c95da7..0000000
--- a/examples/declarative/extending/coercion/person.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    int shoeSize() const;
-    void setShoeSize(int);
-private:
-    QString m_name;
-    int m_shoeSize;
-};
-
-
-// ![0]
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-// ![0]
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/default/birthdayparty.cpp b/examples/declarative/extending/default/birthdayparty.cpp
deleted file mode 100644
index 4f415a3..0000000
--- a/examples/declarative/extending/default/birthdayparty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
diff --git a/examples/declarative/extending/default/birthdayparty.h b/examples/declarative/extending/default/birthdayparty.h
deleted file mode 100644
index 9741040..0000000
--- a/examples/declarative/extending/default/birthdayparty.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include "person.h"
-
-// ![0]
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-    Q_CLASSINFO("DefaultProperty", "guests")
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-// ![0]
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/default/default.pro b/examples/declarative/extending/default/default.pro
deleted file mode 100644
index 32aff0b..0000000
--- a/examples/declarative/extending/default/default.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-TARGET = default
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp 
-HEADERS += person.h \
-           birthdayparty.h
-RESOURCES += default.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/default
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/default
-INSTALLS += target sources
diff --git a/examples/declarative/extending/default/default.qrc b/examples/declarative/extending/default/default.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/default/default.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/default/example.qml b/examples/declarative/extending/default/example.qml
deleted file mode 100644
index c0f3cbb..0000000
--- a/examples/declarative/extending/default/example.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    host: Boy {
-        name: "Bob Jones"
-        shoeSize: 12
-    }
-
-    Boy { name: "Leo Hodges" }
-    Boy { name: "Jack Smith" }
-    Girl { name: "Anne Brown" }
-}
-// ![0]
diff --git a/examples/declarative/extending/default/main.cpp b/examples/declarative/extending/default/main.cpp
deleted file mode 100644
index 2ffd180..0000000
--- a/examples/declarative/extending/default/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        for (int ii = 0; ii < party->guestCount(); ++ii)
-            qWarning() << "   " << party->guest(ii)->name();
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/default/person.cpp b/examples/declarative/extending/default/person.cpp
deleted file mode 100644
index 69216d3..0000000
--- a/examples/declarative/extending/default/person.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-Person::Person(QObject *parent)
-: QObject(parent), m_shoeSize(0)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-int Person::shoeSize() const
-{
-    return m_shoeSize;
-}
-
-void Person::setShoeSize(int s)
-{
-    m_shoeSize = s;
-}
-
-
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
diff --git a/examples/declarative/extending/default/person.h b/examples/declarative/extending/default/person.h
deleted file mode 100644
index 3e56860..0000000
--- a/examples/declarative/extending/default/person.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    int shoeSize() const;
-    void setShoeSize(int);
-private:
-    QString m_name;
-    int m_shoeSize;
-};
-
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/extended/example.qml b/examples/declarative/extending/extended/example.qml
deleted file mode 100644
index 985ce20..0000000
--- a/examples/declarative/extending/extended/example.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import People 1.0
-
-// ![0]
-QLineEdit {
-    leftMargin: 20
-}
-// ![0]
diff --git a/examples/declarative/extending/extended/extended.pro b/examples/declarative/extending/extended/extended.pro
deleted file mode 100644
index 97af286..0000000
--- a/examples/declarative/extending/extended/extended.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = extended
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           lineedit.cpp 
-HEADERS += lineedit.h
-RESOURCES += extended.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/extended
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/extended
-INSTALLS += target sources
diff --git a/examples/declarative/extending/extended/extended.qrc b/examples/declarative/extending/extended/extended.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/extended/extended.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/extending/extended/lineedit.cpp
deleted file mode 100644
index 0e521ec..0000000
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "lineedit.h"
-#include 
-
-LineEditExtension::LineEditExtension(QObject *object)
-: QObject(object), m_lineedit(static_cast(object))
-{
-}
-
-int LineEditExtension::leftMargin() const
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return l;
-}
-
-void LineEditExtension::setLeftMargin(int m)
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(m, t, r, b);
-}
-
-int LineEditExtension::rightMargin() const
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return r;
-}
-
-void LineEditExtension::setRightMargin(int m) 
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(l, t, m, b);
-}
-
-int LineEditExtension::topMargin() const
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return t;
-}
-
-void LineEditExtension::setTopMargin(int m) 
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(l, m, r, b);
-}
-
-int LineEditExtension::bottomMargin() const
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    return b;
-}
-
-void LineEditExtension::setBottomMargin(int m) 
-{
-    int l, r, t, b;
-    m_lineedit->getTextMargins(&l, &t, &r, &b);
-    m_lineedit->setTextMargins(l, t, r, m);
-}
-
-
diff --git a/examples/declarative/extending/extended/lineedit.h b/examples/declarative/extending/extended/lineedit.h
deleted file mode 100644
index 3a464b0..0000000
--- a/examples/declarative/extending/extended/lineedit.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 LINEEDIT_H
-#define LINEEDIT_H
-
-#include 
-
-class LineEditExtension : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int leftMargin READ leftMargin WRITE setLeftMargin NOTIFY marginsChanged)
-    Q_PROPERTY(int rightMargin READ rightMargin WRITE setRightMargin NOTIFY marginsChanged)
-    Q_PROPERTY(int topMargin READ topMargin WRITE setTopMargin NOTIFY marginsChanged)
-    Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY marginsChanged)
-public:
-    LineEditExtension(QObject *);
-
-    int leftMargin() const;
-    void setLeftMargin(int);
-
-    int rightMargin() const;
-    void setRightMargin(int);
-
-    int topMargin() const;
-    void setTopMargin(int);
-
-    int bottomMargin() const;
-    void setBottomMargin(int);
-signals:
-    void marginsChanged();
-
-private:
-    QLineEdit *m_lineedit;
-};
-
-#endif // LINEEDIT_H
diff --git a/examples/declarative/extending/extended/main.cpp b/examples/declarative/extending/extended/main.cpp
deleted file mode 100644
index ca7242d..0000000
--- a/examples/declarative/extending/extended/main.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include 
-#include "lineedit.h"
-
-int main(int argc, char ** argv)
-{
-    QApplication app(argc, argv);
-
-    qmlRegisterExtendedType("People", 1,0, "QLineEdit");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    QLineEdit *edit = qobject_cast(component.create());
-
-    if (edit) {
-        edit->show();
-        return app.exec();
-    } else {
-        qWarning() << "An error occured";
-        return 0;
-    }
-}
diff --git a/examples/declarative/extending/extending.pro b/examples/declarative/extending/extending.pro
deleted file mode 100644
index 169c7ab..0000000
--- a/examples/declarative/extending/extending.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    adding \
-    attached \
-    binding \
-    coercion \
-    default \
-    extended \
-    grouped \
-    properties \
-    signal \
-    valuesource
diff --git a/examples/declarative/extending/extending.qmlproject b/examples/declarative/extending/extending.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/extending/extending.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/extending/grouped/birthdayparty.cpp b/examples/declarative/extending/grouped/birthdayparty.cpp
deleted file mode 100644
index 4f415a3..0000000
--- a/examples/declarative/extending/grouped/birthdayparty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
diff --git a/examples/declarative/extending/grouped/birthdayparty.h b/examples/declarative/extending/grouped/birthdayparty.h
deleted file mode 100644
index 31d21b2..0000000
--- a/examples/declarative/extending/grouped/birthdayparty.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include "person.h"
-
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-    Q_CLASSINFO("DefaultProperty", "guests")
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/grouped/example.qml b/examples/declarative/extending/grouped/example.qml
deleted file mode 100644
index 91b7a06..0000000
--- a/examples/declarative/extending/grouped/example.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    host: Boy {
-        name: "Bob Jones"
-        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
-    }
-
-    Boy { 
-        name: "Leo Hodges" 
-        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
-    }
-    // ![1]
-    Boy { 
-        name: "Jack Smith" 
-        shoe { 
-            size: 8
-            color: "blue"
-            brand: "Puma" 
-            price: 19.95 
-        }
-    }
-    // ![1]
-    Girl { 
-        name: "Anne Brown" 
-        shoe.size: 7
-        shoe.color: "red"
-        shoe.brand: "Marc Jacobs"
-        shoe.price: 699.99 
-    }
-}
-// ![0]
diff --git a/examples/declarative/extending/grouped/grouped.pro b/examples/declarative/extending/grouped/grouped.pro
deleted file mode 100644
index 576e1d2..0000000
--- a/examples/declarative/extending/grouped/grouped.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-TARGET = grouped
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp 
-HEADERS += person.h \
-           birthdayparty.h
-RESOURCES += grouped.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/grouped
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/grouped
-INSTALLS += target sources
diff --git a/examples/declarative/extending/grouped/grouped.qrc b/examples/declarative/extending/grouped/grouped.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/grouped/grouped.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/grouped/main.cpp b/examples/declarative/extending/grouped/main.cpp
deleted file mode 100644
index baf32cf..0000000
--- a/examples/declarative/extending/grouped/main.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType();
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        Person *bestShoe = 0;
-        for (int ii = 0; ii < party->guestCount(); ++ii) {
-            Person *guest = party->guest(ii);
-            qWarning() << "   " << guest->name();
-
-            if (!bestShoe || bestShoe->shoe()->price() < guest->shoe()->price())
-                bestShoe = guest;
-        }
-        if (bestShoe)
-            qWarning() << bestShoe->name() << "is wearing the best shoes!";
-
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/grouped/person.cpp b/examples/declarative/extending/grouped/person.cpp
deleted file mode 100644
index 0a9e508..0000000
--- a/examples/declarative/extending/grouped/person.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-ShoeDescription::ShoeDescription(QObject *parent)
-: QObject(parent), m_size(0), m_price(0)
-{
-}
-
-int ShoeDescription::size() const
-{
-    return m_size;
-}
-
-void ShoeDescription::setSize(int s)
-{
-    m_size = s;
-}
-
-QColor ShoeDescription::color() const
-{
-    return m_color;
-}
-
-void ShoeDescription::setColor(const QColor &c)
-{
-    m_color = c;
-}
-
-QString ShoeDescription::brand() const
-{
-    return m_brand;
-}
-
-void ShoeDescription::setBrand(const QString &b)
-{
-    m_brand = b;
-}
-
-qreal ShoeDescription::price() const
-{
-    return m_price;
-}
-
-void ShoeDescription::setPrice(qreal p)
-{
-    m_price = p;
-}
-
-Person::Person(QObject *parent)
-: QObject(parent)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-ShoeDescription *Person::shoe()
-{
-    return &m_shoe;
-}
-
-
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
diff --git a/examples/declarative/extending/grouped/person.h b/examples/declarative/extending/grouped/person.h
deleted file mode 100644
index a031e69..0000000
--- a/examples/declarative/extending/grouped/person.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-#include 
-
-class ShoeDescription : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int size READ size WRITE setSize)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
-    Q_PROPERTY(QString brand READ brand WRITE setBrand)
-    Q_PROPERTY(qreal price READ price WRITE setPrice)
-public:
-    ShoeDescription(QObject *parent = 0);
-
-    int size() const;
-    void setSize(int);
-
-    QColor color() const;
-    void setColor(const QColor &);
-
-    QString brand() const;
-    void setBrand(const QString &);
-
-    qreal price() const;
-    void setPrice(qreal);
-private:
-    int m_size;
-    QColor m_color;
-    QString m_brand;
-    qreal m_price;
-};
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-// ![1]
-    Q_PROPERTY(ShoeDescription *shoe READ shoe)
-// ![1]
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    ShoeDescription *shoe();
-private:
-    QString m_name;
-    ShoeDescription m_shoe;
-};
-
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/extending/properties/birthdayparty.cpp
deleted file mode 100644
index 27d17a1..0000000
--- a/examples/declarative/extending/properties/birthdayparty.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-// ![0]
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-// ![0]
-
diff --git a/examples/declarative/extending/properties/birthdayparty.h b/examples/declarative/extending/properties/birthdayparty.h
deleted file mode 100644
index 39ce9ba..0000000
--- a/examples/declarative/extending/properties/birthdayparty.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include "person.h"
-
-// ![0]
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-// ![0]
-// ![1]
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-// ![1]
-// ![2]
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-// ![2]
-// ![3]
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-// ![3]
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/properties/example.qml b/examples/declarative/extending/properties/example.qml
deleted file mode 100644
index 35abdd6..0000000
--- a/examples/declarative/extending/properties/example.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    host: Person {
-        name: "Bob Jones"
-        shoeSize: 12
-    }
-    guests: [
-        Person { name: "Leo Hodges" },
-        Person { name: "Jack Smith" },
-        Person { name: "Anne Brown" }
-    ]
-}
-// ![0]
diff --git a/examples/declarative/extending/properties/main.cpp b/examples/declarative/extending/properties/main.cpp
deleted file mode 100644
index 85e9584..0000000
--- a/examples/declarative/extending/properties/main.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType("People", 1,0, "Person");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-        qWarning() << "They are inviting:";
-        for (int ii = 0; ii < party->guestCount(); ++ii)
-            qWarning() << "   " << party->guest(ii)->name();
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/properties/person.cpp b/examples/declarative/extending/properties/person.cpp
deleted file mode 100644
index 92c54f5..0000000
--- a/examples/declarative/extending/properties/person.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-Person::Person(QObject *parent)
-: QObject(parent), m_shoeSize(0)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-int Person::shoeSize() const
-{
-    return m_shoeSize;
-}
-
-void Person::setShoeSize(int s)
-{
-    m_shoeSize = s;
-}
-
diff --git a/examples/declarative/extending/properties/person.h b/examples/declarative/extending/properties/person.h
deleted file mode 100644
index 0029b09..0000000
--- a/examples/declarative/extending/properties/person.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    int shoeSize() const;
-    void setShoeSize(int);
-private:
-    QString m_name;
-    int m_shoeSize;
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/properties/properties.pro b/examples/declarative/extending/properties/properties.pro
deleted file mode 100644
index a8f4301..0000000
--- a/examples/declarative/extending/properties/properties.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = app
-TARGET = properties
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp 
-HEADERS += person.h \
-           birthdayparty.h
-RESOURCES += properties.qrc
-
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/properties
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/properties
-INSTALLS += target sources
diff --git a/examples/declarative/extending/properties/properties.qrc b/examples/declarative/extending/properties/properties.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/properties/properties.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/signal/birthdayparty.cpp b/examples/declarative/extending/signal/birthdayparty.cpp
deleted file mode 100644
index 740c8c9..0000000
--- a/examples/declarative/extending/signal/birthdayparty.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
-: QObject(object)
-{
-}
-
-QDate BirthdayPartyAttached::rsvp() const
-{
-    return m_rsvp;
-}
-
-void BirthdayPartyAttached::setRsvp(const QDate &d)
-{
-    m_rsvp = d;
-}
-
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
-void BirthdayParty::startParty()
-{
-    QTime time = QTime::currentTime();
-    emit partyStarted(time);
-}
-
-BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
-{
-    return new BirthdayPartyAttached(object);
-}
-
diff --git a/examples/declarative/extending/signal/birthdayparty.h b/examples/declarative/extending/signal/birthdayparty.h
deleted file mode 100644
index ae4dd39..0000000
--- a/examples/declarative/extending/signal/birthdayparty.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include 
-#include "person.h"
-
-class BirthdayPartyAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
-public:
-    BirthdayPartyAttached(QObject *object);
-
-    QDate rsvp() const;
-    void setRsvp(const QDate &);
-
-private:
-    QDate m_rsvp;
-};
-
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-    Q_CLASSINFO("DefaultProperty", "guests")
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
-
-    void startParty();
-// ![0]
-signals:
-    void partyStarted(const QTime &time);
-// ![0]
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/signal/example.qml b/examples/declarative/extending/signal/example.qml
deleted file mode 100644
index 83d6a23..0000000
--- a/examples/declarative/extending/signal/example.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    onPartyStarted: console.log("This party started rockin' at " + time);
-// ![0]
-
-    host: Boy {
-        name: "Bob Jones"
-        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
-    }
-
-    Boy { 
-        name: "Leo Hodges" 
-        BirthdayParty.rsvp: "2009-07-06"
-        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
-    }
-    Boy { 
-        name: "Jack Smith" 
-        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
-    }
-    Girl { 
-        name: "Anne Brown" 
-        BirthdayParty.rsvp: "2009-07-01"
-        shoe.size: 7
-        shoe.color: "red"
-        shoe.brand: "Marc Jacobs"
-        shoe.price: 699.99 
-    }
-// ![1]
-}
-// ![1]
diff --git a/examples/declarative/extending/signal/main.cpp b/examples/declarative/extending/signal/main.cpp
deleted file mode 100644
index 453f688..0000000
--- a/examples/declarative/extending/signal/main.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType();
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        for (int ii = 0; ii < party->guestCount(); ++ii) {
-            Person *guest = party->guest(ii);
-
-            QDate rsvpDate;
-            QObject *attached = 
-                qmlAttachedPropertiesObject(guest, false);
-            if (attached)
-                rsvpDate = attached->property("rsvp").toDate();
-
-            if (rsvpDate.isNull())
-                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
-            else
-                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
-        }
-
-        party->startParty();
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return 0;
-}
diff --git a/examples/declarative/extending/signal/person.cpp b/examples/declarative/extending/signal/person.cpp
deleted file mode 100644
index 0a9e508..0000000
--- a/examples/declarative/extending/signal/person.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-ShoeDescription::ShoeDescription(QObject *parent)
-: QObject(parent), m_size(0), m_price(0)
-{
-}
-
-int ShoeDescription::size() const
-{
-    return m_size;
-}
-
-void ShoeDescription::setSize(int s)
-{
-    m_size = s;
-}
-
-QColor ShoeDescription::color() const
-{
-    return m_color;
-}
-
-void ShoeDescription::setColor(const QColor &c)
-{
-    m_color = c;
-}
-
-QString ShoeDescription::brand() const
-{
-    return m_brand;
-}
-
-void ShoeDescription::setBrand(const QString &b)
-{
-    m_brand = b;
-}
-
-qreal ShoeDescription::price() const
-{
-    return m_price;
-}
-
-void ShoeDescription::setPrice(qreal p)
-{
-    m_price = p;
-}
-
-Person::Person(QObject *parent)
-: QObject(parent)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-ShoeDescription *Person::shoe()
-{
-    return &m_shoe;
-}
-
-
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
diff --git a/examples/declarative/extending/signal/person.h b/examples/declarative/extending/signal/person.h
deleted file mode 100644
index 2f444c5..0000000
--- a/examples/declarative/extending/signal/person.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-#include 
-
-class ShoeDescription : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int size READ size WRITE setSize)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
-    Q_PROPERTY(QString brand READ brand WRITE setBrand)
-    Q_PROPERTY(qreal price READ price WRITE setPrice)
-public:
-    ShoeDescription(QObject *parent = 0);
-
-    int size() const;
-    void setSize(int);
-
-    QColor color() const;
-    void setColor(const QColor &);
-
-    QString brand() const;
-    void setBrand(const QString &);
-
-    qreal price() const;
-    void setPrice(qreal);
-private:
-    int m_size;
-    QColor m_color;
-    QString m_brand;
-    qreal m_price;
-};
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(ShoeDescription *shoe READ shoe)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    ShoeDescription *shoe();
-private:
-    QString m_name;
-    ShoeDescription m_shoe;
-};
-
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/signal/signal.pro b/examples/declarative/extending/signal/signal.pro
deleted file mode 100644
index 6367a38..0000000
--- a/examples/declarative/extending/signal/signal.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-TARGET = signal
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp 
-HEADERS += person.h \
-           birthdayparty.h
-RESOURCES += signal.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/signal
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/signal
-INSTALLS += target sources
diff --git a/examples/declarative/extending/signal/signal.qrc b/examples/declarative/extending/signal/signal.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/signal/signal.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/extending/valuesource/birthdayparty.cpp b/examples/declarative/extending/valuesource/birthdayparty.cpp
deleted file mode 100644
index b915f4f..0000000
--- a/examples/declarative/extending/valuesource/birthdayparty.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "birthdayparty.h"
-
-BirthdayPartyAttached::BirthdayPartyAttached(QObject *object)
-: QObject(object)
-{
-}
-
-QDate BirthdayPartyAttached::rsvp() const
-{
-    return m_rsvp;
-}
-
-void BirthdayPartyAttached::setRsvp(const QDate &d)
-{
-    m_rsvp = d;
-}
-
-
-BirthdayParty::BirthdayParty(QObject *parent)
-: QObject(parent), m_host(0)
-{
-}
-
-Person *BirthdayParty::host() const
-{
-    return m_host;
-}
-
-void BirthdayParty::setHost(Person *c)
-{
-    m_host = c;
-}
-
-QDeclarativeListProperty BirthdayParty::guests() 
-{
-    return QDeclarativeListProperty(this, m_guests);
-}
-
-int BirthdayParty::guestCount() const
-{
-    return m_guests.count();
-}
-
-Person *BirthdayParty::guest(int index) const
-{
-    return m_guests.at(index);
-}
-
-void BirthdayParty::startParty()
-{
-    QTime time = QTime::currentTime();
-    emit partyStarted(time);
-}
-
-QString BirthdayParty::announcement() const
-{
-    return QString();
-}
-
-void BirthdayParty::setAnnouncement(const QString &speak)
-{
-    qWarning() << qPrintable(speak);
-}
-
-BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
-{
-    return new BirthdayPartyAttached(object);
-}
-
diff --git a/examples/declarative/extending/valuesource/birthdayparty.h b/examples/declarative/extending/valuesource/birthdayparty.h
deleted file mode 100644
index 5f25781..0000000
--- a/examples/declarative/extending/valuesource/birthdayparty.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 BIRTHDAYPARTY_H
-#define BIRTHDAYPARTY_H
-
-#include 
-#include 
-#include 
-#include 
-#include "person.h"
-
-class BirthdayPartyAttached : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QDate rsvp READ rsvp WRITE setRsvp)
-public:
-    BirthdayPartyAttached(QObject *object);
-
-    QDate rsvp() const;
-    void setRsvp(const QDate &);
-
-private:
-    QDate m_rsvp;
-};
-
-class BirthdayParty : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(Person *host READ host WRITE setHost)
-    Q_PROPERTY(QDeclarativeListProperty guests READ guests)
-// ![0]
-    Q_PROPERTY(QString announcement READ announcement WRITE setAnnouncement)
-// ![0]
-    Q_CLASSINFO("DefaultProperty", "guests")
-public:
-    BirthdayParty(QObject *parent = 0);
-
-    Person *host() const;
-    void setHost(Person *);
-
-    QDeclarativeListProperty guests();
-    int guestCount() const;
-    Person *guest(int) const;
-
-    QString announcement() const;
-    void setAnnouncement(const QString &);
-
-    static BirthdayPartyAttached *qmlAttachedProperties(QObject *);
-
-    void startParty();
-signals:
-    void partyStarted(const QTime &time);
-
-private:
-    Person *m_host;
-    QList m_guests;
-};
-QML_DECLARE_TYPEINFO(BirthdayParty, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // BIRTHDAYPARTY_H
diff --git a/examples/declarative/extending/valuesource/example.qml b/examples/declarative/extending/valuesource/example.qml
deleted file mode 100644
index 5b8c8af..0000000
--- a/examples/declarative/extending/valuesource/example.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import People 1.0
-
-// ![0]
-BirthdayParty {
-    HappyBirthdaySong on announcement { name: "Bob Jones" }
-// ![0]
-
-    onPartyStarted: console.log("This party started rockin' at " + time);
-
-
-    host: Boy {
-        name: "Bob Jones"
-        shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 }
-    }
-
-    Boy { 
-        name: "Leo Hodges" 
-        BirthdayParty.rsvp: "2009-07-06"
-        shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 }
-    }
-    Boy { 
-        name: "Jack Smith" 
-        shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 }
-    }
-    Girl { 
-        name: "Anne Brown" 
-        BirthdayParty.rsvp: "2009-07-01"
-        shoe.size: 7
-        shoe.color: "red"
-        shoe.brand: "Marc Jacobs"
-        shoe.price: 699.99 
-    }
-
-// ![1]
-}
-// ![1]
diff --git a/examples/declarative/extending/valuesource/happybirthdaysong.cpp b/examples/declarative/extending/valuesource/happybirthdaysong.cpp
deleted file mode 100644
index 8ea5c2b..0000000
--- a/examples/declarative/extending/valuesource/happybirthdaysong.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "happybirthdaysong.h"
-#include 
-
-HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
-: QObject(parent), m_line(-1)
-{
-    setName(QString());
-    QTimer *timer = new QTimer(this);
-    QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
-    timer->start(1000);
-}
-
-void HappyBirthdaySong::setTarget(const QDeclarativeProperty &p)
-{
-    m_target = p;
-}
-
-QString HappyBirthdaySong::name() const
-{
-    return m_name;
-}
-
-void HappyBirthdaySong::setName(const QString &name)
-{
-    m_name = name;
-
-    m_lyrics.clear();
-    m_lyrics << "Happy birthday to you,";
-    m_lyrics << "Happy birthday to you,";
-    m_lyrics << "Happy birthday dear " + m_name + ",";
-    m_lyrics << "Happy birthday to you!";
-    m_lyrics << "";
-}
-    
-void HappyBirthdaySong::advance()
-{
-    m_line = (m_line + 1) % m_lyrics.count();
-
-    m_target.write(m_lyrics.at(m_line));
-}
-
diff --git a/examples/declarative/extending/valuesource/happybirthdaysong.h b/examples/declarative/extending/valuesource/happybirthdaysong.h
deleted file mode 100644
index 3d07909..0000000
--- a/examples/declarative/extending/valuesource/happybirthdaysong.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 HAPPYBIRTHDAYSONG_H
-#define HAPPYBIRTHDAYSONG_H
-
-#include 
-#include 
-#include 
-
-#include 
-
-// ![0]
-class HappyBirthdaySong : public QObject, public QDeclarativePropertyValueSource
-{
-    Q_OBJECT
-    Q_INTERFACES(QDeclarativePropertyValueSource)
-// ![0]
-    Q_PROPERTY(QString name READ name WRITE setName)
-// ![1]
-public:
-    HappyBirthdaySong(QObject *parent = 0);
-
-    virtual void setTarget(const QDeclarativeProperty &);
-// ![1]
-
-    QString name() const;
-    void setName(const QString &);
-
-private slots:
-    void advance();
-
-private:
-    int m_line;
-    QStringList m_lyrics;
-    QDeclarativeProperty m_target;
-    QString m_name;
-// ![2]
-};
-// ![2]
-
-#endif // HAPPYBIRTHDAYSONG_H
-
diff --git a/examples/declarative/extending/valuesource/main.cpp b/examples/declarative/extending/valuesource/main.cpp
deleted file mode 100644
index 00840ee..0000000
--- a/examples/declarative/extending/valuesource/main.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include "birthdayparty.h"
-#include "happybirthdaysong.h"
-#include "person.h"
-
-int main(int argc, char ** argv)
-{
-    QCoreApplication app(argc, argv);
-
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "BirthdayParty");
-    qmlRegisterType("People", 1,0, "HappyBirthdaySong");
-    qmlRegisterType();
-    qmlRegisterType();
-    qmlRegisterType("People", 1,0, "Boy");
-    qmlRegisterType("People", 1,0, "Girl");
-
-    QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
-    BirthdayParty *party = qobject_cast(component.create());
-
-    if (party && party->host()) {
-        qWarning() << party->host()->name() << "is having a birthday!";
-
-        if (qobject_cast(party->host()))
-            qWarning() << "He is inviting:";
-        else
-            qWarning() << "She is inviting:";
-
-        for (int ii = 0; ii < party->guestCount(); ++ii) {
-            Person *guest = party->guest(ii);
-
-            QDate rsvpDate;
-            QObject *attached = 
-                qmlAttachedPropertiesObject(guest, false);
-            if (attached)
-                rsvpDate = attached->property("rsvp").toDate();
-
-            if (rsvpDate.isNull())
-                qWarning() << "   " << guest->name() << "RSVP date: Hasn't RSVP'd";
-            else
-                qWarning() << "   " << guest->name() << "RSVP date:" << qPrintable(rsvpDate.toString());
-        }
-
-        party->startParty();
-    } else {
-        qWarning() << "An error occured";
-    }
-
-    return app.exec();
-}
diff --git a/examples/declarative/extending/valuesource/person.cpp b/examples/declarative/extending/valuesource/person.cpp
deleted file mode 100644
index 0a9e508..0000000
--- a/examples/declarative/extending/valuesource/person.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 "person.h"
-
-ShoeDescription::ShoeDescription(QObject *parent)
-: QObject(parent), m_size(0), m_price(0)
-{
-}
-
-int ShoeDescription::size() const
-{
-    return m_size;
-}
-
-void ShoeDescription::setSize(int s)
-{
-    m_size = s;
-}
-
-QColor ShoeDescription::color() const
-{
-    return m_color;
-}
-
-void ShoeDescription::setColor(const QColor &c)
-{
-    m_color = c;
-}
-
-QString ShoeDescription::brand() const
-{
-    return m_brand;
-}
-
-void ShoeDescription::setBrand(const QString &b)
-{
-    m_brand = b;
-}
-
-qreal ShoeDescription::price() const
-{
-    return m_price;
-}
-
-void ShoeDescription::setPrice(qreal p)
-{
-    m_price = p;
-}
-
-Person::Person(QObject *parent)
-: QObject(parent)
-{
-}
-
-QString Person::name() const
-{
-    return m_name;
-}
-
-void Person::setName(const QString &n)
-{
-    m_name = n;
-}
-
-ShoeDescription *Person::shoe()
-{
-    return &m_shoe;
-}
-
-
-Boy::Boy(QObject * parent)
-: Person(parent)
-{
-}
-
-
-Girl::Girl(QObject * parent)
-: Person(parent)
-{
-}
-
diff --git a/examples/declarative/extending/valuesource/person.h b/examples/declarative/extending/valuesource/person.h
deleted file mode 100644
index 2f444c5..0000000
--- a/examples/declarative/extending/valuesource/person.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 PERSON_H
-#define PERSON_H
-
-#include 
-#include 
-
-class ShoeDescription : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int size READ size WRITE setSize)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
-    Q_PROPERTY(QString brand READ brand WRITE setBrand)
-    Q_PROPERTY(qreal price READ price WRITE setPrice)
-public:
-    ShoeDescription(QObject *parent = 0);
-
-    int size() const;
-    void setSize(int);
-
-    QColor color() const;
-    void setColor(const QColor &);
-
-    QString brand() const;
-    void setBrand(const QString &);
-
-    qreal price() const;
-    void setPrice(qreal);
-private:
-    int m_size;
-    QColor m_color;
-    QString m_brand;
-    qreal m_price;
-};
-
-class Person : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(ShoeDescription *shoe READ shoe)
-public:
-    Person(QObject *parent = 0);
-
-    QString name() const;
-    void setName(const QString &);
-
-    ShoeDescription *shoe();
-private:
-    QString m_name;
-    ShoeDescription m_shoe;
-};
-
-class Boy : public Person
-{
-    Q_OBJECT
-public:
-    Boy(QObject * parent = 0);
-};
-
-class Girl : public Person
-{
-    Q_OBJECT
-public:
-    Girl(QObject * parent = 0);
-};
-
-#endif // PERSON_H
diff --git a/examples/declarative/extending/valuesource/valuesource.pro b/examples/declarative/extending/valuesource/valuesource.pro
deleted file mode 100644
index 0626c98..0000000
--- a/examples/declarative/extending/valuesource/valuesource.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = valuesource
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           person.cpp \
-           birthdayparty.cpp \
-           happybirthdaysong.cpp 
-HEADERS += person.h \
-           birthdayparty.h \
-           happybirthdaysong.h
-RESOURCES += valuesource.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/valuesource
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/valuesource
-INSTALLS += target sources
diff --git a/examples/declarative/extending/valuesource/valuesource.qrc b/examples/declarative/extending/valuesource/valuesource.qrc
deleted file mode 100644
index e2fa01d..0000000
--- a/examples/declarative/extending/valuesource/valuesource.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    example.qml
-
-
diff --git a/examples/declarative/fillmode/content/QtLogo.qml b/examples/declarative/fillmode/content/QtLogo.qml
deleted file mode 100644
index 6dd714d..0000000
--- a/examples/declarative/fillmode/content/QtLogo.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: qtLogo
-
-    property alias fillMode: image.fillMode
-    property alias label: labelText.text
-
-    width: ((window.width - 20) - ((grid.columns - 1) * grid.spacing)) / grid.columns
-    height: ((window.height - 20) - ((grid.rows - 1) * grid.spacing)) / grid.rows
-
-    Column {
-        anchors.fill: parent
-
-        Rectangle {
-            height: qtLogo.height - 30; width: qtLogo.width
-            border.color: "black"; clip: true
-
-            Image {
-                id: image
-                anchors.fill: parent; smooth: true; source: "qt-logo.png"
-            }
-        }
-
-        Text {
-            id: labelText; anchors.horizontalCenter: parent.horizontalCenter
-            height: 30; verticalAlignment: Text.AlignVCenter
-        }
-    }
-}
diff --git a/examples/declarative/fillmode/content/qt-logo.png b/examples/declarative/fillmode/content/qt-logo.png
deleted file mode 100644
index 14ddf2a..0000000
Binary files a/examples/declarative/fillmode/content/qt-logo.png and /dev/null differ
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml
deleted file mode 100644
index e5b0336..0000000
--- a/examples/declarative/fillmode/fillmode.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    id: window
-
-    width: 800; height: 480
-    color: "#cdcdcd"
-
-    Grid {
-        id: grid
-        anchors { fill: parent; topMargin: 10; leftMargin: 10; rightMargin: 10; bottomMargin: 10 }
-        columns: 3; rows: 2; spacing: 20
-
-        QtLogo { fillMode: Image.Stretch; label: "Stretch" }
-        QtLogo { fillMode: Image.PreserveAspectFit; label: "PreserveAspectFit" }
-        QtLogo { fillMode: Image.PreserveAspectCrop; label: "PreserveAspectCrop" }
-        QtLogo { fillMode: Image.Tile; label: "Tile" }
-        QtLogo { fillMode: Image.TileHorizontally; label: "TileHorizontally" }
-        QtLogo { fillMode: Image.TileVertically; label: "TileVertically" }
-    }
-}
diff --git a/examples/declarative/fillmode/fillmode.qmlproject b/examples/declarative/fillmode/fillmode.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/fillmode/fillmode.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/flipable/content/5_heart.png b/examples/declarative/flipable/content/5_heart.png
deleted file mode 100644
index fb59d81..0000000
Binary files a/examples/declarative/flipable/content/5_heart.png and /dev/null differ
diff --git a/examples/declarative/flipable/content/9_club.png b/examples/declarative/flipable/content/9_club.png
deleted file mode 100644
index 2545001..0000000
Binary files a/examples/declarative/flipable/content/9_club.png and /dev/null differ
diff --git a/examples/declarative/flipable/content/Card.qml b/examples/declarative/flipable/content/Card.qml
deleted file mode 100644
index 2577d89..0000000
--- a/examples/declarative/flipable/content/Card.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import Qt 4.7
-
-Flipable {
-    id: container
-
-    property alias image: frontImage.source
-    property bool flipped: true
-    property int xAxis: 0
-    property int yAxis: 0
-    property int angle: 0
-
-    width: front.width; height: front.height; state: "back"
-
-    front: Image { id: frontImage; smooth: true }
-    back: Image { source: "back.png"; smooth: true }
-
-    MouseArea { anchors.fill: parent; onClicked: container.flipped = !container.flipped }
-
-    transform: Rotation {
-        id: rotation; origin.x: container.width / 2; origin.y: container.height / 2
-        axis.x: container.xAxis; axis.y: container.yAxis; axis.z: 0
-    }
-
-    states: State {
-        name: "back"; when: container.flipped
-        PropertyChanges { target: rotation; angle: container.angle }
-    }
-
-    transitions: Transition {
-        ParallelAnimation {
-            NumberAnimation { target: rotation; properties: "angle"; duration: 600 }
-            SequentialAnimation {
-                NumberAnimation { target: container; property: "scale"; to: 0.75; duration: 300 }
-                NumberAnimation { target: container; property: "scale"; to: 1.0; duration: 300 }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/flipable/content/back.png b/examples/declarative/flipable/content/back.png
deleted file mode 100644
index f715d74..0000000
Binary files a/examples/declarative/flipable/content/back.png and /dev/null differ
diff --git a/examples/declarative/flipable/flipable-example.qml b/examples/declarative/flipable/flipable-example.qml
deleted file mode 100644
index 4e09569..0000000
--- a/examples/declarative/flipable/flipable-example.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    id: window
-    
-    width: 480; height: 320
-    color: "darkgreen"
-
-    Row {
-        anchors.centerIn: parent; spacing: 30
-        Card { image: "content/9_club.png"; angle: 180; yAxis: 1 }
-        Card { image: "content/5_heart.png"; angle: 540; xAxis: 1 }
-    }
-}
diff --git a/examples/declarative/flipable/flipable.qmlproject b/examples/declarative/flipable/flipable.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/flipable/flipable.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/focus/Core/ContextMenu.qml b/examples/declarative/focus/Core/ContextMenu.qml
deleted file mode 100644
index 49a54bc..0000000
--- a/examples/declarative/focus/Core/ContextMenu.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.7
-
-FocusScope {
-    id: container
-
-    property bool open: false
-
-    Item {
-        anchors.fill: parent
-
-        Rectangle {
-            anchors.fill: parent
-            color: "#D1DBBD"
-            focus: true
-            Keys.onRightPressed: mainView.focus = true
-        }
-    }
-}
diff --git a/examples/declarative/focus/Core/GridMenu.qml b/examples/declarative/focus/Core/GridMenu.qml
deleted file mode 100644
index 3f727fd..0000000
--- a/examples/declarative/focus/Core/GridMenu.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import Qt 4.7
-
-FocusScope {
-    property alias interactive: gridView.interactive
-
-    onWantsFocusChanged: if (wantsFocus) mainView.state = ""
-
-    Rectangle {
-        anchors.fill: parent
-        clip: true
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "#193441" }
-            GradientStop { position: 1.0; color: Qt.darker("#193441") }
-        }
-
-        GridView {
-            id: gridView
-            x: 20; width: parent.width - 40; height: parent.height
-            cellWidth: 152; cellHeight: 152
-            focus: true
-            model: 12
-            KeyNavigation.down: listViews
-            KeyNavigation.left: contextMenu
-
-            delegate: Item {
-                id: container
-                width: GridView.view.cellWidth; height: GridView.view.cellHeight
-
-                Rectangle {
-                    id: content
-                    color: "transparent"
-                    smooth: true
-                    anchors.centerIn: parent; width: container.width - 40; height: container.height - 40; radius: 10
-
-                    Rectangle { color: "#91AA9D"; x: 3; y: 3; width: parent.width - 6; height: parent.height - 6; radius: 8 }
-                    Image { source: "images/qt-logo.png"; anchors.centerIn: parent; smooth: true }
-                }
-
-                MouseArea {
-                    id: mouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-
-                    onClicked: {
-                        GridView.view.currentIndex = index
-                        container.forceFocus()
-                    }
-                }
-
-                states: State {
-                    name: "active"; when: container.focus == true
-                    PropertyChanges { target: content; color: "#FCFFF5"; scale: 1.1 }
-                }
-
-                transitions: Transition {
-                    NumberAnimation { properties: "scale"; duration: 100 }
-                }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/focus/Core/ListViewDelegate.qml b/examples/declarative/focus/Core/ListViewDelegate.qml
deleted file mode 100644
index 14e2548..0000000
--- a/examples/declarative/focus/Core/ListViewDelegate.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: container
-    x: 5; width: ListView.view.width - 10; height: 60
-
-    Rectangle {
-        id: content
-        anchors.centerIn: parent; width: container.width - 40; height: container.height - 10
-        color: "transparent"
-        smooth: true
-        radius: 10
-
-        Rectangle { color: "#91AA9D"; x: 3; y: 3; width: parent.width - 6; height: parent.height - 6; radius: 8 }
-        Text {
-            text: "List element " + (index + 1); color: "#193441"; font.bold: false; anchors.centerIn: parent
-            font.pixelSize: 14
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-
-        onClicked: {
-            ListView.view.currentIndex = index
-            container.forceFocus()
-        }
-    }
-
-    states: State {
-        name: "active"; when: container.focus == true
-        PropertyChanges { target: content; color: "#FCFFF5"; scale: 1.1 }
-    }
-
-    transitions: Transition {
-        NumberAnimation { properties: "scale"; duration: 100 }
-    }
-}
diff --git a/examples/declarative/focus/Core/ListViews.qml b/examples/declarative/focus/Core/ListViews.qml
deleted file mode 100644
index 32a5d4c..0000000
--- a/examples/declarative/focus/Core/ListViews.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import Qt 4.7
-
-FocusScope {
-    clip: true
-
-    onWantsFocusChanged: if (wantsFocus) mainView.state = "showListViews"
-
-    ListView {
-        id: list1
-        y: wantsFocus ? 10 : 40; width: parent.width / 3; height: parent.height - 20
-        focus: true
-        KeyNavigation.up: gridMenu; KeyNavigation.left: contextMenu; KeyNavigation.right: list2
-        model: 10; cacheBuffer: 200
-        delegate: ListViewDelegate {}
-
-        Behavior on y {
-            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
-        }
-    }
-
-    ListView {
-        id: list2
-        y: wantsFocus ? 10 : 40; x: parent.width / 3; width: parent.width / 3; height: parent.height - 20
-        KeyNavigation.up: gridMenu; KeyNavigation.left: list1; KeyNavigation.right: list3
-        model: 10; cacheBuffer: 200
-        delegate: ListViewDelegate {}
-
-        Behavior on y {
-            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
-        }
-    }
-
-    ListView {
-        id: list3
-        y: wantsFocus ? 10 : 40; x: 2 * parent.width / 3; width: parent.width / 3; height: parent.height - 20
-        KeyNavigation.up: gridMenu; KeyNavigation.left: list2
-        model: 10; cacheBuffer: 200
-        delegate: ListViewDelegate {}
-
-        Behavior on y {
-            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
-        }
-    }
-
-    Rectangle { width: parent.width; height: 1; color: "#D1DBBD" }
-
-    Rectangle {
-        y: 1; width: parent.width; height: 10
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "#3E606F" }
-            GradientStop { position: 1.0; color: "transparent" }
-        }
-    }
-
-    Rectangle {
-        y: parent.height - 10; width: parent.width; height: 10
-        gradient: Gradient {
-            GradientStop { position: 1.0; color: "#3E606F" }
-            GradientStop { position: 0.0; color: "transparent" }
-        }
-    }
-}
diff --git a/examples/declarative/focus/Core/images/arrow.png b/examples/declarative/focus/Core/images/arrow.png
deleted file mode 100644
index 14978c2..0000000
Binary files a/examples/declarative/focus/Core/images/arrow.png and /dev/null differ
diff --git a/examples/declarative/focus/Core/images/qt-logo.png b/examples/declarative/focus/Core/images/qt-logo.png
deleted file mode 100644
index 14ddf2a..0000000
Binary files a/examples/declarative/focus/Core/images/qt-logo.png and /dev/null differ
diff --git a/examples/declarative/focus/Core/qmldir b/examples/declarative/focus/Core/qmldir
deleted file mode 100644
index e25d63c..0000000
--- a/examples/declarative/focus/Core/qmldir
+++ /dev/null
@@ -1,4 +0,0 @@
-ContextMenu ContextMenu.qml
-GridMenu GridMenu.qml
-ListViews ListViews.qml
-ListViewDelegate ListViewDelegate.qml
diff --git a/examples/declarative/focus/focus.qml b/examples/declarative/focus/focus.qml
deleted file mode 100644
index 8c992ae..0000000
--- a/examples/declarative/focus/focus.qml
+++ /dev/null
@@ -1,69 +0,0 @@
-import Qt 4.7
-import "Core"
-
-Rectangle {
-    id: window
-    
-    width: 800; height: 480
-    color: "#3E606F"
-
-    FocusScope {
-        id: mainView
-
-        width: parent.width; height: parent.height
-        focus: true
-
-        GridMenu {
-            id: gridMenu
-
-            width: parent.width; height: 320
-            focus: true
-            interactive: parent.wantsFocus
-        }
-
-        ListViews {
-            id: listViews
-            y: 320; width: parent.width; height: 320
-        }
-
-        Rectangle { 
-            id: shade
-            color: "black"; opacity: 0; anchors.fill: parent
-        }
-
-        states: State {
-            name: "showListViews"
-            PropertyChanges { target: gridMenu; y: -160 }
-            PropertyChanges { target: listViews; y: 160 }
-        }
-
-        transitions: Transition {
-            NumberAnimation { properties: "y"; duration: 600; easing.type: Easing.OutQuint }
-        }
-    }
-
-    Image {
-        source: "Core/images/arrow.png"
-        rotation: 90
-        anchors.verticalCenter: parent.verticalCenter
-
-        MouseArea {
-            anchors { fill: parent; leftMargin: -10; topMargin: -10; rightMargin: -10; bottomMargin: -10 }
-            onClicked: window.state = "contextMenuOpen"
-        }
-    }
-
-    ContextMenu { id: contextMenu; x: -265; width: 260; height: parent.height }
-
-    states: State {
-        name: "contextMenuOpen"
-        when: !mainView.wantsFocus
-        PropertyChanges { target: contextMenu; x: 0; open: true }
-        PropertyChanges { target: mainView; x: 130 }
-        PropertyChanges { target: shade; opacity: 0.25 }
-    }
-
-    transitions: Transition {
-        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: Easing.OutQuint }
-    }
-}
diff --git a/examples/declarative/focus/focus.qmlproject b/examples/declarative/focus/focus.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/focus/focus.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/fonts/availableFonts.qml b/examples/declarative/fonts/availableFonts.qml
deleted file mode 100644
index defa4ce..0000000
--- a/examples/declarative/fonts/availableFonts.qml
+++ /dev/null
@@ -1,17 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 480; height: 640; color: "steelblue"
-
-    ListView {
-        anchors.fill: parent; model: Qt.fontFamilies()
-
-        delegate: Item {
-            height: 40; width: ListView.view.width
-            Text {
-                anchors.centerIn: parent
-                text: modelData; font.family: modelData; font.pixelSize: 24; color: "white"
-            }
-        }
-    }
-}
diff --git a/examples/declarative/fonts/banner.qml b/examples/declarative/fonts/banner.qml
deleted file mode 100644
index 353354a..0000000
--- a/examples/declarative/fonts/banner.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: screen
-
-    property int pixelSize: screen.height * 1.25
-    property color textColor: "lightsteelblue"
-    property string text: "Hello world! "
-
-    width: 640; height: 320
-    color: "steelblue"
-
-    Row {
-        y: -screen.height / 4.5
-
-        NumberAnimation on x { from: 0; to: -text.width; duration: 6000; loops: Animation.Infinite }
-        Text { id: text; font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
-        Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
-        Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
-    }
-}
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
deleted file mode 100644
index f3eac48..0000000
--- a/examples/declarative/fonts/fonts.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    property string myText: "The quick brown fox jumps over the lazy dog."
-
-    width: 800; height: 480
-    color: "steelblue"
-
-    FontLoader { id: fixedFont; name: "Courier" }
-    FontLoader { id: localFont; source: "fonts/tarzeau_ocr_a.ttf" }
-    FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" }
-
-    Column {
-        anchors { fill: parent; leftMargin: 10; rightMargin: 10 }
-        spacing: 15
-
-        Text {
-            text: myText
-            color: "lightsteelblue"
-            width: parent.width
-            elide: Text.ElideRight
-            font.family: "Times"; font.pointSize: 42
-        }
-        Text {
-            text: myText
-            color: "lightsteelblue"
-            width: parent.width
-            elide: Text.ElideLeft
-            font { family: "Times"; pointSize: 42; capitalization: Font.AllUppercase }
-        }
-        Text {
-            text: myText
-            color: "lightsteelblue"
-            width: parent.width
-            elide: Text.ElideMiddle
-            font { family: fixedFont.name; pointSize: 42; weight: Font.Bold; capitalization: Font.AllLowercase }
-        }
-        Text {
-            text: myText
-            color: "lightsteelblue"
-            width: parent.width
-            elide: Text.ElideRight
-            font { family: fixedFont.name; pointSize: 42; italic: true; capitalization: Font.SmallCaps }
-        }
-        Text {
-            text: myText
-            color: "lightsteelblue"
-            width: parent.width
-            elide: Text.ElideLeft
-            font { family: localFont.name; pointSize: 42; capitalization: Font.Capitalize }
-        }
-        Text {
-            text: {
-                if (webFont.status == FontLoader.Ready) myText
-                else if (webFont.status == FontLoader.Loading) "Loading..."
-                else if (webFont.status == FontLoader.Error) "Error loading font"
-            }
-            color: "lightsteelblue"
-            width: parent.width
-            elide: Text.ElideMiddle
-            font.family: webFont.name; font.pointSize: 42
-        }
-    }
-}
diff --git a/examples/declarative/fonts/fonts.qmlproject b/examples/declarative/fonts/fonts.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/fonts/fonts.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf b/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf
deleted file mode 100644
index cf93f96..0000000
Binary files a/examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf and /dev/null differ
diff --git a/examples/declarative/fonts/hello.qml b/examples/declarative/fonts/hello.qml
deleted file mode 100644
index 0d6f4cd..0000000
--- a/examples/declarative/fonts/hello.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: screen
-
-    width: 800; height: 480
-    color: "black"
-
-    Item {
-        id: container
-        x: screen.width / 2; y: screen.height / 2
-
-        Text {
-            id: text
-            anchors.centerIn: parent
-            color: "white"
-            text: "Hello world!"
-            font.pixelSize: 60
-
-            SequentialAnimation on font.letterSpacing {
-                loops: Animation.Infinite;
-                NumberAnimation { from: 100; to: 300; easing.type: Easing.InQuad; duration: 3000 }
-                ScriptAction {
-                    script: {
-                        container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
-                        container.x = (screen.width / 4) + (Math.random() * screen.width / 2)
-                    }
-                }
-            }
-
-            SequentialAnimation on opacity {
-                loops: Animation.Infinite;
-                NumberAnimation { from: 1; to: 0; duration: 2600 }
-                PauseAnimation { duration: 400 }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/gestures/experimental-gestures.qml b/examples/declarative/gestures/experimental-gestures.qml
deleted file mode 100644
index cb190ea..0000000
--- a/examples/declarative/gestures/experimental-gestures.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import Qt 4.7
-import Qt.labs.gestures 1.0
-
-// Only works on platforms with Touch support.
-
-Rectangle {
-    id: rect
-    width: 320
-    height: 180
-
-    Text {
-        anchors.centerIn: parent
-        text: "Tap / TapAndHold / Pan / Pinch / Swipe\nOnly works on platforms with Touch support."
-        horizontalAlignment: Text.Center
-    }
-
-    GestureArea {
-        anchors.fill: parent
-        focus: true
-
-        // Only some of the many gesture properties are shown. See Gesture documentation.
-
-        onTap:
-            console.log("tap pos = (",gesture.position.x,",",gesture.position.y,")")
-        onTapAndHold:
-            console.log("tap and hold pos = (",gesture.position.x,",",gesture.position.y,")")
-        onPan:
-            console.log("pan delta = (",gesture.delta.x,",",gesture.delta.y,") acceleration = ",gesture.acceleration)
-        onPinch:
-            console.log("pinch center = (",gesture.centerPoint.x,",",gesture.centerPoint.y,") rotation =",gesture.rotationAngle," scale =",gesture.scaleFactor)
-        onSwipe:
-            console.log("swipe angle=",gesture.swipeAngle)
-        onGesture:
-            console.log("gesture hot spot = (",gesture.hotSpot.x,",",gesture.hotSpot.y,")")
-    }
-}
diff --git a/examples/declarative/gestures/gestures.qmlproject b/examples/declarative/gestures/gestures.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/gestures/gestures.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/gridview/gridview-example.qml b/examples/declarative/gridview/gridview-example.qml
deleted file mode 100644
index a5f41fb..0000000
--- a/examples/declarative/gridview/gridview-example.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 300; height: 400
-    color: "white"
-
-    ListModel {
-        id: appModel
-        ListElement { name: "Music"; icon: "pics/AudioPlayer_48.png" }
-        ListElement { name: "Movies"; icon: "pics/VideoPlayer_48.png" }
-        ListElement { name: "Camera"; icon: "pics/Camera_48.png" }
-        ListElement { name: "Calendar"; icon: "pics/DateBook_48.png" }
-        ListElement { name: "Messaging"; icon: "pics/EMail_48.png" }
-        ListElement { name: "Todo List"; icon: "pics/TodoList_48.png" }
-        ListElement { name: "Contacts"; icon: "pics/AddressBook_48.png" }
-    }
-
-    Component {
-        id: appDelegate
-
-        Item {
-            width: 100; height: 100
-
-            Image {
-                id: myIcon
-                y: 20; anchors.horizontalCenter: parent.horizontalCenter
-                source: icon
-            }
-            Text {
-                anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
-                text: name
-            }
-        }
-    }
-
-    Component {
-        id: appHighlight
-        Rectangle { width: 80; height: 80; color: "lightsteelblue" }
-    }
-
-    GridView {
-        anchors.fill: parent
-        cellWidth: 100; cellHeight: 100
-        highlight: appHighlight
-        focus: true
-        model: appModel
-        delegate: appDelegate
-    }
-}
diff --git a/examples/declarative/gridview/gridview.qmlproject b/examples/declarative/gridview/gridview.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/gridview/gridview.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/gridview/pics/AddressBook_48.png b/examples/declarative/gridview/pics/AddressBook_48.png
deleted file mode 100644
index 1ab7c8e..0000000
Binary files a/examples/declarative/gridview/pics/AddressBook_48.png and /dev/null differ
diff --git a/examples/declarative/gridview/pics/AudioPlayer_48.png b/examples/declarative/gridview/pics/AudioPlayer_48.png
deleted file mode 100644
index f4b8689..0000000
Binary files a/examples/declarative/gridview/pics/AudioPlayer_48.png and /dev/null differ
diff --git a/examples/declarative/gridview/pics/Camera_48.png b/examples/declarative/gridview/pics/Camera_48.png
deleted file mode 100644
index c76b524..0000000
Binary files a/examples/declarative/gridview/pics/Camera_48.png and /dev/null differ
diff --git a/examples/declarative/gridview/pics/DateBook_48.png b/examples/declarative/gridview/pics/DateBook_48.png
deleted file mode 100644
index 58f5787..0000000
Binary files a/examples/declarative/gridview/pics/DateBook_48.png and /dev/null differ
diff --git a/examples/declarative/gridview/pics/EMail_48.png b/examples/declarative/gridview/pics/EMail_48.png
deleted file mode 100644
index d6d84a6..0000000
Binary files a/examples/declarative/gridview/pics/EMail_48.png and /dev/null differ
diff --git a/examples/declarative/gridview/pics/TodoList_48.png b/examples/declarative/gridview/pics/TodoList_48.png
deleted file mode 100644
index 0988448..0000000
Binary files a/examples/declarative/gridview/pics/TodoList_48.png and /dev/null differ
diff --git a/examples/declarative/gridview/pics/VideoPlayer_48.png b/examples/declarative/gridview/pics/VideoPlayer_48.png
deleted file mode 100644
index 52638c5..0000000
Binary files a/examples/declarative/gridview/pics/VideoPlayer_48.png and /dev/null differ
diff --git a/examples/declarative/i18n/i18n.qmlproject b/examples/declarative/i18n/i18n.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/i18n/i18n.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/imageelements/borderimage/borderimage.qml b/examples/declarative/imageelements/borderimage/borderimage.qml
new file mode 100644
index 0000000..c334cea
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/borderimage.qml
@@ -0,0 +1,57 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: page
+    width: 1030; height: 540
+
+    Grid {
+        anchors.centerIn: parent; spacing: 20
+
+        MyBorderImage {
+            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+            source: "content/colors.png"; margin: 30
+        }
+
+        MyBorderImage {
+            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+            source: "content/colors.png"; margin: 30
+            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+        }
+
+        MyBorderImage {
+            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+            source: "content/colors.png"; margin: 30
+            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+        }
+
+        MyBorderImage {
+            minWidth: 120; maxWidth: 240; minHeight: 120; maxHeight: 240
+            source: "content/colors.png"; margin: 30
+            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+        }
+
+        MyBorderImage {
+            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+            source: "content/bw.png"; margin: 10
+        }
+
+        MyBorderImage {
+            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+            source: "content/bw.png"; margin: 10
+            horizontalMode: BorderImage.Repeat; verticalMode: BorderImage.Repeat
+        }
+
+        MyBorderImage {
+            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+            source: "content/bw.png"; margin: 10
+            horizontalMode: BorderImage.Stretch; verticalMode: BorderImage.Repeat
+        }
+
+        MyBorderImage {
+            minWidth: 60; maxWidth: 200; minHeight: 40; maxHeight: 200
+            source: "content/bw.png"; margin: 10
+            horizontalMode: BorderImage.Round; verticalMode: BorderImage.Round
+        }
+    }
+}
diff --git a/examples/declarative/imageelements/borderimage/borderimage.qmlproject b/examples/declarative/imageelements/borderimage/borderimage.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/borderimage.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml b/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
new file mode 100644
index 0000000..b47df7b
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
@@ -0,0 +1,50 @@
+import Qt 4.7
+
+Item {
+    id: container
+
+    property alias horizontalMode: image.horizontalTileMode
+    property alias verticalMode: image.verticalTileMode
+    property alias source: image.source
+
+    property int minWidth
+    property int minHeight
+    property int maxWidth
+    property int maxHeight
+    property int margin
+
+    width: 240; height: 240
+
+    BorderImage {
+        id: image; anchors.centerIn: parent
+
+        SequentialAnimation on width {
+            loops: Animation.Infinite
+            NumberAnimation {
+                from: container.minWidth; to: container.maxWidth
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+            NumberAnimation {
+                from: container.maxWidth; to: container.minWidth
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+        }
+
+        SequentialAnimation on height {
+            loops: Animation.Infinite
+            NumberAnimation {
+                from: container.minHeight; to: container.maxHeight
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+            NumberAnimation {
+                from: container.maxHeight; to: container.minHeight
+                duration: 2000; easing.type: Easing.InOutQuad
+            }
+        }
+
+        border.top: container.margin
+        border.left: container.margin
+        border.bottom: container.margin
+        border.right: container.margin
+    }
+}
diff --git a/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml b/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
new file mode 100644
index 0000000..629478b
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+
+Item {
+    property alias color : rectangle.color
+
+    BorderImage {
+        anchors.fill: rectangle
+        anchors { leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8 }
+        border { left: 10; top: 10; right: 10; bottom: 10 }
+        source: "shadow.png"; smooth: true
+    }
+
+    Rectangle { id: rectangle; anchors.fill: parent }
+}
diff --git a/examples/declarative/imageelements/borderimage/content/bw.png b/examples/declarative/imageelements/borderimage/content/bw.png
new file mode 100644
index 0000000..486eaae
Binary files /dev/null and b/examples/declarative/imageelements/borderimage/content/bw.png differ
diff --git a/examples/declarative/imageelements/borderimage/content/colors-round.sci b/examples/declarative/imageelements/borderimage/content/colors-round.sci
new file mode 100644
index 0000000..506f6f5
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/content/colors-round.sci
@@ -0,0 +1,7 @@
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+horizontalTileRule:Round
+verticalTileRule:Round
+source:colors.png
diff --git a/examples/declarative/imageelements/borderimage/content/colors-stretch.sci b/examples/declarative/imageelements/borderimage/content/colors-stretch.sci
new file mode 100644
index 0000000..e4989a7
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/content/colors-stretch.sci
@@ -0,0 +1,5 @@
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+source:colors.png
diff --git a/examples/declarative/imageelements/borderimage/content/colors.png b/examples/declarative/imageelements/borderimage/content/colors.png
new file mode 100644
index 0000000..dfb62f3
Binary files /dev/null and b/examples/declarative/imageelements/borderimage/content/colors.png differ
diff --git a/examples/declarative/imageelements/borderimage/content/shadow.png b/examples/declarative/imageelements/borderimage/content/shadow.png
new file mode 100644
index 0000000..431af85
Binary files /dev/null and b/examples/declarative/imageelements/borderimage/content/shadow.png differ
diff --git a/examples/declarative/imageelements/borderimage/shadows.qml b/examples/declarative/imageelements/borderimage/shadows.qml
new file mode 100644
index 0000000..a08d133
--- /dev/null
+++ b/examples/declarative/imageelements/borderimage/shadows.qml
@@ -0,0 +1,24 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: window
+
+    width: 480; height: 320
+    color: "gray"
+
+    ShadowRectangle {
+        anchors.centerIn: parent; width: 250; height: 250
+        color: "lightsteelblue"
+    }
+
+    ShadowRectangle {
+        anchors.centerIn: parent; width: 200; height: 200
+        color: "steelblue"
+    }
+
+    ShadowRectangle {
+        anchors.centerIn: parent; width: 150; height: 150
+        color: "thistle"
+    }
+}
diff --git a/examples/declarative/imageelements/image/face_fit.qml b/examples/declarative/imageelements/image/face_fit.qml
new file mode 100644
index 0000000..52cd4c2
--- /dev/null
+++ b/examples/declarative/imageelements/image/face_fit.qml
@@ -0,0 +1,26 @@
+import Qt 4.7
+
+// Here, we implement a hybrid of the "scale to fit" and "scale and crop"
+// behaviours which will crop up to 25% from *one* dimension if necessary
+// to fully scale the other. This is a realistic algorithm, for example
+// when the edges of the image contain less vital information than the
+// center - such as a face.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        anchors.centerIn: parent
+        source: "pics/face.png"
+        x: (parent.width-width*scale)/2
+        y: (parent.height-height*scale)/2
+        scale: Math.max(Math.min(parent.width/width*1.333,parent.height/height),
+                        Math.min(parent.width/width,parent.height/height*1.333))
+    }
+}
diff --git a/examples/declarative/imageelements/image/face_fit_animated.qml b/examples/declarative/imageelements/image/face_fit_animated.qml
new file mode 100644
index 0000000..63fc9c6
--- /dev/null
+++ b/examples/declarative/imageelements/image/face_fit_animated.qml
@@ -0,0 +1,28 @@
+import Qt 4.7
+
+// Here, we extend the "face_fit" example with animation to show how truly
+// diverse and usage-specific behaviours are made possible by NOT putting a
+// hard-coded aspect ratio feature into the Image primitive.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        anchors.centerIn: parent
+        source: "pics/face.png"
+        x: (parent.width-width*scale)/2
+        y: (parent.height-height*scale)/2
+        SpringFollow on scale {
+            to: Math.max(Math.min(face.parent.width/face.width*1.333,face.parent.height/face.height),
+                         Math.min(face.parent.width/face.width,face.parent.height/face.height*1.333))
+            spring: 1
+            damping: 0.05
+        }
+    }
+}
diff --git a/examples/declarative/imageelements/image/image.qmlproject b/examples/declarative/imageelements/image/image.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/imageelements/image/image.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/imageelements/image/pics/face.png b/examples/declarative/imageelements/image/pics/face.png
new file mode 100644
index 0000000..3d66d72
Binary files /dev/null and b/examples/declarative/imageelements/image/pics/face.png differ
diff --git a/examples/declarative/imageelements/image/scale_and_crop.qml b/examples/declarative/imageelements/image/scale_and_crop.qml
new file mode 100644
index 0000000..a438104
--- /dev/null
+++ b/examples/declarative/imageelements/image/scale_and_crop.qml
@@ -0,0 +1,21 @@
+import Qt 4.7
+
+// Here, we implement "Scale and Crop" behaviour.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        anchors.centerIn: parent
+        source: "pics/face.png"
+        x: (parent.width-width*scale)/2
+        y: (parent.height-height*scale)/2
+        scale: Math.max(parent.width/width,parent.height/height)
+    }
+}
diff --git a/examples/declarative/imageelements/image/scale_and_crop_simple.qml b/examples/declarative/imageelements/image/scale_and_crop_simple.qml
new file mode 100644
index 0000000..1160ec5
--- /dev/null
+++ b/examples/declarative/imageelements/image/scale_and_crop_simple.qml
@@ -0,0 +1,20 @@
+import Qt 4.7
+
+// Here, we implement "Scale to Fit" behaviour, using the
+// fillMode property.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        source: "pics/face.png"
+        fillMode: Image.PreserveAspectCrop
+        anchors.fill: parent
+    }
+}
diff --git a/examples/declarative/imageelements/image/scale_and_sidecrop.qml b/examples/declarative/imageelements/image/scale_and_sidecrop.qml
new file mode 100644
index 0000000..5593ab8
--- /dev/null
+++ b/examples/declarative/imageelements/image/scale_and_sidecrop.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+
+// Here, we implement a variant of "Scale and Crop" behaviour, where we
+// crop the sides if necessary to fully fit vertically, but not the reverse.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        anchors.centerIn: parent
+        source: "pics/face.png"
+        x: (parent.width-width*scale)/2
+        y: (parent.height-height*scale)/2
+        scale: parent.height/height
+    }
+}
diff --git a/examples/declarative/imageelements/image/scale_to_fit.qml b/examples/declarative/imageelements/image/scale_to_fit.qml
new file mode 100644
index 0000000..724a36e
--- /dev/null
+++ b/examples/declarative/imageelements/image/scale_to_fit.qml
@@ -0,0 +1,22 @@
+import Qt 4.7
+
+// Here, we implement "Scale to Fit" behaviour "manually", rather
+// than using the preserveAspect property.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        anchors.centerIn: parent
+        source: "pics/face.png"
+        x: (parent.width-width*scale)/2
+        y: (parent.height-height*scale)/2
+        scale: Math.min(parent.width/width,parent.height/height)
+    }
+}
diff --git a/examples/declarative/imageelements/image/scale_to_fit_simple.qml b/examples/declarative/imageelements/image/scale_to_fit_simple.qml
new file mode 100644
index 0000000..0e960b4
--- /dev/null
+++ b/examples/declarative/imageelements/image/scale_to_fit_simple.qml
@@ -0,0 +1,20 @@
+import Qt 4.7
+
+// Here, we implement "Scale to Fit" behaviour, using the
+// fillMode property.
+//
+Rectangle {
+    // default size: whole image, unscaled
+    width: face.width
+    height: face.height
+    color: "gray"
+    clip: true
+
+    Image {
+        id: face
+        smooth: true
+        source: "pics/face.png"
+        fillMode: Image.PreserveAspectFit
+        anchors.fill: parent
+    }
+}
diff --git a/examples/declarative/imageelements/imageelements.qmlproject b/examples/declarative/imageelements/imageelements.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/imageelements/imageelements.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/imageprovider/ImageProviderCore/qmldir b/examples/declarative/imageprovider/ImageProviderCore/qmldir
deleted file mode 100644
index 1028590..0000000
--- a/examples/declarative/imageprovider/ImageProviderCore/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin imageprovider
-
diff --git a/examples/declarative/imageprovider/imageprovider-example.qml b/examples/declarative/imageprovider/imageprovider-example.qml
deleted file mode 100644
index d774112..0000000
--- a/examples/declarative/imageprovider/imageprovider-example.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.7
-import "ImageProviderCore"
-//![0]
-ListView {
-    width: 100; height: 100
-    anchors.fill: parent
-
-    model: myModel
-
-    delegate: Component {
-        Item {
-            width: 100
-            height: 50
-            Text {
-                text: "Loading..."
-                anchors.centerIn: parent
-            }
-            Image {
-                source: modelData
-                sourceSize: "50x25"
-            }
-        }
-    }
-}
-//![0]
diff --git a/examples/declarative/imageprovider/imageprovider.cpp b/examples/declarative/imageprovider/imageprovider.cpp
deleted file mode 100644
index 4c4aa94..0000000
--- a/examples/declarative/imageprovider/imageprovider.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/*
-   This example illustrates using a QDeclarativeImageProvider to serve
-   images asynchronously.
-*/
-
-//![0]
-class ColorImageProvider : public QDeclarativeImageProvider
-{
-public:
-    // This is run in a low priority thread.
-    QImage request(const QString &id, QSize *size, const QSize &req_size)
-    {
-        if (size) *size = QSize(100,50);
-        QImage image(
-                req_size.width() > 0 ? req_size.width() : 100,
-                req_size.height() > 0 ? req_size.height() : 50,
-                QImage::Format_RGB32);
-        image.fill(QColor(id).rgba());
-        QPainter p(&image);
-        QFont f = p.font();
-        f.setPixelSize(30);
-        p.setFont(f);
-        p.setPen(Qt::black);
-        if (req_size.isValid())
-            p.scale(req_size.width()/100.0, req_size.height()/50.0);
-        p.drawText(QRectF(0,0,100,50),Qt::AlignCenter,id);
-        return image;
-    }
-};
-
-
-class ImageProviderExtensionPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    void registerTypes(const char *uri) {
-        Q_UNUSED(uri);
-
-    }
-
-    void initializeEngine(QDeclarativeEngine *engine, const char *uri) {
-        Q_UNUSED(uri);
-
-        engine->addImageProvider("colors", new ColorImageProvider);
-
-        QStringList dataList;
-        dataList.append("image://colors/red");
-        dataList.append("image://colors/green");
-        dataList.append("image://colors/blue");
-        dataList.append("image://colors/brown");
-        dataList.append("image://colors/orange");
-        dataList.append("image://colors/purple");
-        dataList.append("image://colors/yellow");
-
-        QDeclarativeContext *ctxt = engine->rootContext();
-        ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
-    }
-
-};
-
-#include "imageprovider.moc"
-
-Q_EXPORT_PLUGIN(ImageProviderExtensionPlugin);
-//![0]
-
diff --git a/examples/declarative/imageprovider/imageprovider.pro b/examples/declarative/imageprovider/imageprovider.pro
deleted file mode 100644
index 945a301..0000000
--- a/examples/declarative/imageprovider/imageprovider.pro
+++ /dev/null
@@ -1,25 +0,0 @@
-TEMPLATE = lib
-TARGET  = imageprovider
-QT += declarative
-CONFIG += qt plugin
-
-TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = ImageProviderCore
-
-# Input
-SOURCES += imageprovider.cpp
-
-sources.files = $$SOURCES imageprovider.qml imageprovider.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider
-
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
-
-ImageProviderCore_sources.files = \
-    ImageProviderCore/qmldir 
-ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
-
-symbian:{
-    TARGET.EPOCALLOWDLLDATA=1
-}
-
-INSTALLS = sources ImageProviderCore_sources target
diff --git a/examples/declarative/imageprovider/imageprovider.qmlproject b/examples/declarative/imageprovider/imageprovider.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/imageprovider/imageprovider.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/images/content/lemonade.jpg b/examples/declarative/images/content/lemonade.jpg
deleted file mode 100644
index db445c9..0000000
Binary files a/examples/declarative/images/content/lemonade.jpg and /dev/null differ
diff --git a/examples/declarative/images/images.qml b/examples/declarative/images/images.qml
deleted file mode 100644
index e48ad50..0000000
--- a/examples/declarative/images/images.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    color: "white"
-    width: grid.width + 50
-    height: grid.height + 50
-
-    Grid {
-        id: grid
-        x: 25; y: 25
-        columns: 3
-
-        Image {
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            sourceSize.width: 50
-            sourceSize.height: 50
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            sourceSize.width: 50
-            sourceSize.height: 50
-            smooth: true
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            scale: 1/3
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            scale: 1/3
-            sourceSize.width: 50
-            sourceSize.height: 50
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            scale: 1/3
-            sourceSize.width: 50
-            sourceSize.height: 50
-            smooth: true
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            width: 50; height: 50
-            transform: Translate { x: 50 }
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            width: 50; height: 50
-            transform: Translate { x: 50 }
-            sourceSize.width: 50
-            sourceSize.height: 50
-            source: "content/lemonade.jpg"
-        }
-
-        Image {
-            width: 50; height: 50
-            transform: Translate { x: 50 }
-            sourceSize: "50x50" // syntactic sugar
-            smooth: true
-            source: "content/lemonade.jpg"
-        }
-    }
-}
diff --git a/examples/declarative/images/images.qmlproject b/examples/declarative/images/images.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/images/images.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
new file mode 100644
index 0000000..49a54bc
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
@@ -0,0 +1,18 @@
+import Qt 4.7
+
+FocusScope {
+    id: container
+
+    property bool open: false
+
+    Item {
+        anchors.fill: parent
+
+        Rectangle {
+            anchors.fill: parent
+            color: "#D1DBBD"
+            focus: true
+            Keys.onRightPressed: mainView.focus = true
+        }
+    }
+}
diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
new file mode 100644
index 0000000..3f727fd
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
@@ -0,0 +1,61 @@
+import Qt 4.7
+
+FocusScope {
+    property alias interactive: gridView.interactive
+
+    onWantsFocusChanged: if (wantsFocus) mainView.state = ""
+
+    Rectangle {
+        anchors.fill: parent
+        clip: true
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#193441" }
+            GradientStop { position: 1.0; color: Qt.darker("#193441") }
+        }
+
+        GridView {
+            id: gridView
+            x: 20; width: parent.width - 40; height: parent.height
+            cellWidth: 152; cellHeight: 152
+            focus: true
+            model: 12
+            KeyNavigation.down: listViews
+            KeyNavigation.left: contextMenu
+
+            delegate: Item {
+                id: container
+                width: GridView.view.cellWidth; height: GridView.view.cellHeight
+
+                Rectangle {
+                    id: content
+                    color: "transparent"
+                    smooth: true
+                    anchors.centerIn: parent; width: container.width - 40; height: container.height - 40; radius: 10
+
+                    Rectangle { color: "#91AA9D"; x: 3; y: 3; width: parent.width - 6; height: parent.height - 6; radius: 8 }
+                    Image { source: "images/qt-logo.png"; anchors.centerIn: parent; smooth: true }
+                }
+
+                MouseArea {
+                    id: mouseArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+
+                    onClicked: {
+                        GridView.view.currentIndex = index
+                        container.forceFocus()
+                    }
+                }
+
+                states: State {
+                    name: "active"; when: container.focus == true
+                    PropertyChanges { target: content; color: "#FCFFF5"; scale: 1.1 }
+                }
+
+                transitions: Transition {
+                    NumberAnimation { properties: "scale"; duration: 100 }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
new file mode 100644
index 0000000..14e2548
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
@@ -0,0 +1,40 @@
+import Qt 4.7
+
+Item {
+    id: container
+    x: 5; width: ListView.view.width - 10; height: 60
+
+    Rectangle {
+        id: content
+        anchors.centerIn: parent; width: container.width - 40; height: container.height - 10
+        color: "transparent"
+        smooth: true
+        radius: 10
+
+        Rectangle { color: "#91AA9D"; x: 3; y: 3; width: parent.width - 6; height: parent.height - 6; radius: 8 }
+        Text {
+            text: "List element " + (index + 1); color: "#193441"; font.bold: false; anchors.centerIn: parent
+            font.pixelSize: 14
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        hoverEnabled: true
+
+        onClicked: {
+            ListView.view.currentIndex = index
+            container.forceFocus()
+        }
+    }
+
+    states: State {
+        name: "active"; when: container.focus == true
+        PropertyChanges { target: content; color: "#FCFFF5"; scale: 1.1 }
+    }
+
+    transitions: Transition {
+        NumberAnimation { properties: "scale"; duration: 100 }
+    }
+}
diff --git a/examples/declarative/keyinteraction/focus/Core/ListViews.qml b/examples/declarative/keyinteraction/focus/Core/ListViews.qml
new file mode 100644
index 0000000..32a5d4c
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/Core/ListViews.qml
@@ -0,0 +1,62 @@
+import Qt 4.7
+
+FocusScope {
+    clip: true
+
+    onWantsFocusChanged: if (wantsFocus) mainView.state = "showListViews"
+
+    ListView {
+        id: list1
+        y: wantsFocus ? 10 : 40; width: parent.width / 3; height: parent.height - 20
+        focus: true
+        KeyNavigation.up: gridMenu; KeyNavigation.left: contextMenu; KeyNavigation.right: list2
+        model: 10; cacheBuffer: 200
+        delegate: ListViewDelegate {}
+
+        Behavior on y {
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
+        }
+    }
+
+    ListView {
+        id: list2
+        y: wantsFocus ? 10 : 40; x: parent.width / 3; width: parent.width / 3; height: parent.height - 20
+        KeyNavigation.up: gridMenu; KeyNavigation.left: list1; KeyNavigation.right: list3
+        model: 10; cacheBuffer: 200
+        delegate: ListViewDelegate {}
+
+        Behavior on y {
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
+        }
+    }
+
+    ListView {
+        id: list3
+        y: wantsFocus ? 10 : 40; x: 2 * parent.width / 3; width: parent.width / 3; height: parent.height - 20
+        KeyNavigation.up: gridMenu; KeyNavigation.left: list2
+        model: 10; cacheBuffer: 200
+        delegate: ListViewDelegate {}
+
+        Behavior on y {
+            NumberAnimation { duration: 600; easing.type: Easing.OutQuint }
+        }
+    }
+
+    Rectangle { width: parent.width; height: 1; color: "#D1DBBD" }
+
+    Rectangle {
+        y: 1; width: parent.width; height: 10
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#3E606F" }
+            GradientStop { position: 1.0; color: "transparent" }
+        }
+    }
+
+    Rectangle {
+        y: parent.height - 10; width: parent.width; height: 10
+        gradient: Gradient {
+            GradientStop { position: 1.0; color: "#3E606F" }
+            GradientStop { position: 0.0; color: "transparent" }
+        }
+    }
+}
diff --git a/examples/declarative/keyinteraction/focus/Core/images/arrow.png b/examples/declarative/keyinteraction/focus/Core/images/arrow.png
new file mode 100644
index 0000000..14978c2
Binary files /dev/null and b/examples/declarative/keyinteraction/focus/Core/images/arrow.png differ
diff --git a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png b/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png
new file mode 100644
index 0000000..14ddf2a
Binary files /dev/null and b/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png differ
diff --git a/examples/declarative/keyinteraction/focus/Core/qmldir b/examples/declarative/keyinteraction/focus/Core/qmldir
new file mode 100644
index 0000000..e25d63c
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/Core/qmldir
@@ -0,0 +1,4 @@
+ContextMenu ContextMenu.qml
+GridMenu GridMenu.qml
+ListViews ListViews.qml
+ListViewDelegate ListViewDelegate.qml
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml
new file mode 100644
index 0000000..8c992ae
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/focus.qml
@@ -0,0 +1,69 @@
+import Qt 4.7
+import "Core"
+
+Rectangle {
+    id: window
+    
+    width: 800; height: 480
+    color: "#3E606F"
+
+    FocusScope {
+        id: mainView
+
+        width: parent.width; height: parent.height
+        focus: true
+
+        GridMenu {
+            id: gridMenu
+
+            width: parent.width; height: 320
+            focus: true
+            interactive: parent.wantsFocus
+        }
+
+        ListViews {
+            id: listViews
+            y: 320; width: parent.width; height: 320
+        }
+
+        Rectangle { 
+            id: shade
+            color: "black"; opacity: 0; anchors.fill: parent
+        }
+
+        states: State {
+            name: "showListViews"
+            PropertyChanges { target: gridMenu; y: -160 }
+            PropertyChanges { target: listViews; y: 160 }
+        }
+
+        transitions: Transition {
+            NumberAnimation { properties: "y"; duration: 600; easing.type: Easing.OutQuint }
+        }
+    }
+
+    Image {
+        source: "Core/images/arrow.png"
+        rotation: 90
+        anchors.verticalCenter: parent.verticalCenter
+
+        MouseArea {
+            anchors { fill: parent; leftMargin: -10; topMargin: -10; rightMargin: -10; bottomMargin: -10 }
+            onClicked: window.state = "contextMenuOpen"
+        }
+    }
+
+    ContextMenu { id: contextMenu; x: -265; width: 260; height: parent.height }
+
+    states: State {
+        name: "contextMenuOpen"
+        when: !mainView.wantsFocus
+        PropertyChanges { target: contextMenu; x: 0; open: true }
+        PropertyChanges { target: mainView; x: 130 }
+        PropertyChanges { target: shade; opacity: 0.25 }
+    }
+
+    transitions: Transition {
+        NumberAnimation { properties: "x,opacity"; duration: 600; easing.type: Easing.OutQuint }
+    }
+}
diff --git a/examples/declarative/keyinteraction/focus/focus.qmlproject b/examples/declarative/keyinteraction/focus/focus.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/keyinteraction/focus/focus.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/keyinteraction/keyinteraction.qmlproject b/examples/declarative/keyinteraction/keyinteraction.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/keyinteraction/keyinteraction.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
deleted file mode 100644
index 25cf994..0000000
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 "graphicslayouts_p.h"
-
-#include 
-#include 
-
-QT_BEGIN_NAMESPACE
-
-LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
-{
-}
-
-void LinearLayoutAttached::setStretchFactor(int f)
-{
-    if (_stretch == f)
-        return;
-
-    _stretch = f;
-    emit stretchChanged(reinterpret_cast(parent()), _stretch);
-}
-
-void LinearLayoutAttached::setSpacing(int s)
-{
-    if (_spacing == s)
-        return;
-
-    _spacing = s;
-    emit spacingChanged(reinterpret_cast(parent()), _spacing);
-}
-
-void LinearLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
-}
-
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-Q_UNUSED(which);
-Q_UNUSED(constraint);
-return QSizeF();
-}
-
-
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
-{
-}
-
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-insertItem(index, item);
-
-//connect attached properties
-if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-    setStretchFactor(item, obj->stretchFactor());
-    setAlignment(item, obj->alignment());
-    updateSpacing(item, obj->spacing());
-    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsLinearLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsLinearLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
-{
-    for(int i=0; i < count(); i++){
-        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
-            QGraphicsLinearLayout::setItemSpacing(i, spacing);
-            return;
-        }
-    }
-}
-
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast(obj))
-    return 0;
-LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-attachedProperties.insert(qobject_cast(obj), rv);
-return rv;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// QGraphicsGridLayout-related classes
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-GridLayoutAttached::GridLayoutAttached(QObject *parent)
-: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
-    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
-    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
-{
-}
-
-void GridLayoutAttached::setRow(int r)
-{
-    if (_row == r)
-        return;
-
-    _row = r;
-    //emit rowChanged(reinterpret_cast(parent()), _row);
-}
-
-void GridLayoutAttached::setColumn(int c)
-{
-    if (_column == c)
-        return;
-
-    _column = c;
-    //emit columnChanged(reinterpret_cast(parent()), _column);
-}
-
-void GridLayoutAttached::setRowSpan(int rs)
-{
-    if (_rowspan == rs)
-        return;
-
-    _rowspan = rs;
-    //emit rowSpanChanged(reinterpret_cast(parent()), _rowSpan);
-}
-
-void GridLayoutAttached::setColumnSpan(int cs)
-{
-    if (_colspan == cs)
-        return;
-
-    _colspan = cs;
-    //emit columnSpanChanged(reinterpret_cast(parent()), _columnSpan);
-}
-
-void GridLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast(parent()), _alignment);
-}
-
-void GridLayoutAttached::setRowStretchFactor(int f)
-{
-    _rowstretch = f;
-}
-
-void GridLayoutAttached::setColumnStretchFactor(int f)
-{
-    _colstretch = f;
-}
-
-void GridLayoutAttached::setRowSpacing(int s)
-{
-    _rowspacing = s;
-}
-
-void GridLayoutAttached::setColumnSpacing(int s)
-{
-    _colspacing = s;
-}
-
-
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
-{
-}
-
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
-{
-//use attached properties
-if (QObject *obj = attachedProperties.value(qobject_cast(wid))) {
-    int row = static_cast(obj)->row();
-    int column = static_cast(obj)->column();
-    int rowSpan = static_cast(obj)->rowSpan();
-    int columnSpan = static_cast(obj)->columnSpan();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    addItem(wid, row, column, rowSpan, columnSpan);
-}
-}
-
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-//use attached properties
-if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-    int row = obj->row();
-    int column = obj->column();
-    int rowSpan = obj->rowSpan();
-    int columnSpan = obj->columnSpan();
-    Qt::Alignment alignment = obj->alignment();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    if(obj->rowSpacing() != -1)
-        setRowSpacing(row, obj->rowSpacing());
-    if(obj->columnSpacing() != -1)
-        setColumnSpacing(column, obj->columnSpacing());
-    if(obj->rowStretchFactor() != -1)
-        setRowStretchFactor(row, obj->rowStretchFactor());
-    if(obj->columnStretchFactor() != -1)
-        setColumnStretchFactor(column, obj->columnStretchFactor());
-    if(obj->rowPreferredHeight() != -1)
-        setRowPreferredHeight(row, obj->rowPreferredHeight());
-    if(obj->rowMaximumHeight() != -1)
-        setRowMaximumHeight(row, obj->rowMaximumHeight());
-    if(obj->rowMinimumHeight() != -1)
-        setRowMinimumHeight(row, obj->rowMinimumHeight());
-    if(obj->rowFixedHeight() != -1)
-        setRowFixedHeight(row, obj->rowFixedHeight());
-    if(obj->columnPreferredWidth() != -1)
-        setColumnPreferredWidth(row, obj->columnPreferredWidth());
-    if(obj->columnMaximumWidth() != -1)
-        setColumnMaximumWidth(row, obj->columnMaximumWidth());
-    if(obj->columnMinimumWidth() != -1)
-        setColumnMinimumWidth(row, obj->columnMinimumWidth());
-    if(obj->columnFixedWidth() != -1)
-        setColumnFixedWidth(row, obj->columnFixedWidth());
-    addItem(item, row, column, rowSpan, columnSpan);
-    if (alignment != -1)
-        setAlignment(item,alignment);
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsGridLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsGridLayoutObject::spacing() const
-{
-if (verticalSpacing() == horizontalSpacing())
-    return verticalSpacing();
-return -1;  //###
-}
-
-qreal QGraphicsGridLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-
-void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsGridLayout::setAlignment(item, alignment);
-}
-
-QHash QGraphicsGridLayoutObject::attachedProperties;
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast(obj))
-    return 0;
-GridLayoutAttached *rv = new GridLayoutAttached(obj);
-attachedProperties.insert(qobject_cast(obj), rv);
-return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
deleted file mode 100644
index e5d91b2..0000000
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-TARGET  = graphicslayouts
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    main.cpp
-
-HEADERS += \
-    graphicslayouts_p.h
-
-RESOURCES += \
-    graphicslayouts.qrc
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
deleted file mode 100644
index fcd78d5..0000000
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-import Qt 4.7
-import GraphicsLayouts 4.7
-
-Item {
-    id: resizable
-
-    width: 800
-    height: 400
-
-    QGraphicsWidget {
-        size.width: parent.width/2
-        size.height: parent.height
-
-        layout: QGraphicsLinearLayout {
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-    QGraphicsWidget {
-        x: parent.width/2
-        size.width: parent.width/2
-        size.height: parent.height
-
-        layout: QGraphicsGridLayout {
-            LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { color: "red"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 1
-                QGraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "200x200"
-                preferredSize: "100x100"
-                Rectangle { color: "orange"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 2
-                QGraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "200x200"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "200x200"
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 1
-                QGraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { color: "blue"; anchors.fill: parent }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc b/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
deleted file mode 100644
index a199f8d..0000000
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    graphicslayouts.qml
-
-
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h b/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
deleted file mode 100644
index ea9c614..0000000
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
+++ /dev/null
@@ -1,303 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 GRAPHICSLAYOUTS_H
-#define GRAPHICSLAYOUTS_H
-
-#include 
-#include 
-#include 
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
-
-    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-private Q_SLOTS:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateSpacing(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-    static QHash attachedProperties;
-
-    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
-        static_cast(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QDeclarativeListProperty *prop) {
-        static_cast(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty *prop) {
-        return static_cast(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
-        return static_cast(prop->object)->itemAt(index);
-    }
-};
-
-class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
-
-    QDeclarativeListProperty children() { return QDeclarativeListProperty(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private Q_SLOTS:
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class GraphicsLayoutAttached;
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-    static QHash attachedProperties;
-
-    static void children_append(QDeclarativeListProperty *prop, QGraphicsLayoutItem *item) {
-        static_cast(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QDeclarativeListProperty *prop) {
-        static_cast(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty *prop) {
-        return static_cast(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty *prop, int index) {
-        return static_cast(prop->object)->itemAt(index);
-    }
-};
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-public:
-    LinearLayoutAttached(QObject *parent);
-
-    int stretchFactor() const { return _stretch; }
-    void setStretchFactor(int f);
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-    int spacing() const { return _spacing; }
-    void setSpacing(int s);
-
-Q_SIGNALS:
-    void stretchChanged(QGraphicsLayoutItem*,int);
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-    void spacingChanged(QGraphicsLayoutItem*,int);
-
-private:
-    int _stretch;
-    Qt::Alignment _alignment;
-    int _spacing;
-};
-
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
-    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
-    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
-    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
-    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
-    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
-    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
-    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
-    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
-    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
-    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
-    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
-
-public:
-    GridLayoutAttached(QObject *parent);
-
-    int row() const { return _row; }
-    void setRow(int r);
-
-    int column() const { return _column; }
-    void setColumn(int c);
-
-    int rowSpan() const { return _rowspan; }
-    void setRowSpan(int rs);
-
-    int columnSpan() const { return _colspan; }
-    void setColumnSpan(int cs);
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-
-    int rowStretchFactor() const { return _rowstretch; }
-    void setRowStretchFactor(int f);
-    int columnStretchFactor() const { return _colstretch; }
-    void setColumnStretchFactor(int f);
-
-    int rowSpacing() const { return _rowspacing; }
-    void setRowSpacing(int s);
-    int columnSpacing() const { return _colspacing; }
-    void setColumnSpacing(int s);
-
-    int rowPreferredHeight() const { return _rowprefheight; }
-    void setRowPreferredHeight(int s) { _rowprefheight = s; }
-
-    int rowMaximumHeight() const { return _rowmaxheight; }
-    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
-
-    int rowMinimumHeight() const { return _rowminheight; }
-    void setRowMinimumHeight(int s) { _rowminheight = s; }
-
-    int rowFixedHeight() const { return _rowfixheight; }
-    void setRowFixedHeight(int s) { _rowfixheight = s; }
-
-    int columnPreferredWidth() const { return _colprefwidth; }
-    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
-
-    int columnMaximumWidth() const { return _colmaxwidth; }
-    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
-
-    int columnMinimumWidth() const { return _colminwidth; }
-    void setColumnMinimumWidth(int s) { _colminwidth = s; }
-
-    int columnFixedWidth() const { return _colfixwidth; }
-    void setColumnFixedWidth(int s) { _colfixwidth = s; }
-
-Q_SIGNALS:
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _row;
-    int _column;
-    int _rowspan;
-    int _colspan;
-    Qt::Alignment _alignment;
-    int _rowstretch;
-    int _colstretch;
-    int _rowspacing;
-    int _colspacing;
-    int _rowprefheight;
-    int _rowmaxheight;
-    int _rowminheight;
-    int _rowfixheight;
-    int _colprefwidth;
-    int _colmaxwidth;
-    int _colminwidth;
-    int _colfixwidth;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // GRAPHICSLAYOUTS_H
diff --git a/examples/declarative/layouts/graphicsLayouts/main.cpp b/examples/declarative/layouts/graphicsLayouts/main.cpp
deleted file mode 100644
index 89b69bf..0000000
--- a/examples/declarative/layouts/graphicsLayouts/main.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 
-#include 
-#include "graphicslayouts_p.h"
-#include 
-
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-    QDeclarativeView view;
-    qmlRegisterInterface("QGraphicsLayoutItem");
-    qmlRegisterInterface("QGraphicsLayout");
-    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
-    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsLinearLayout");
-    qmlRegisterType("GraphicsLayouts",4,7,"QGraphicsGridLayout");
-    view.setSource(QUrl(":graphicslayouts.qml"));
-    view.show();
-    return app.exec();
-};
-
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.pro b/examples/declarative/layouts/layoutItem/layoutItem.pro
deleted file mode 100644
index 4a3fc73..0000000
--- a/examples/declarative/layouts/layoutItem/layoutItem.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Tue May 4 13:36:26 2010
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp
-RESOURCES += layoutItem.qrc
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qml b/examples/declarative/layouts/layoutItem/layoutItem.qml
deleted file mode 100644
index 460c564..0000000
--- a/examples/declarative/layouts/layoutItem/layoutItem.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.7
-
-LayoutItem {//Sized by the layout
-    id: resizable
-    minimumSize: "100x100"
-    maximumSize: "300x300"
-    preferredSize: "100x100"
-    Rectangle { color: "yellow"; anchors.fill: parent }
-    Rectangle { 
-        width: 100; height: 100; 
-        anchors.top: parent.top; 
-        anchors.right: parent.right;
-        color: "green"; 
-    }
-}
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qrc b/examples/declarative/layouts/layoutItem/layoutItem.qrc
deleted file mode 100644
index deb0fba..0000000
--- a/examples/declarative/layouts/layoutItem/layoutItem.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    layoutItem.qml
-
-
diff --git a/examples/declarative/layouts/layoutItem/main.cpp b/examples/declarative/layouts/layoutItem/main.cpp
deleted file mode 100644
index a104251..0000000
--- a/examples/declarative/layouts/layoutItem/main.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* This example demonstrates using a LayoutItem to let QML snippets integrate
-   nicely with existing QGraphicsView applications designed with GraphicsLayouts
-*/
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-    //Set up a graphics scene with a QGraphicsWidget and Layout
-    QGraphicsView view;
-    QGraphicsScene scene;
-    QGraphicsWidget *widget = new QGraphicsWidget();
-    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-    widget->setLayout(layout);
-    scene.addItem(widget);
-    view.setScene(&scene);
-    //Add the QML snippet into the layout
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl(":layoutItem.qml"));
-    QGraphicsLayoutItem* obj = qobject_cast(c.create());
-    layout->addItem(obj);
-
-    widget->setGeometry(QRectF(0,0, 400,400));
-    view.show();
-    return app.exec();
-}
diff --git a/examples/declarative/layouts/positioners/Button.qml b/examples/declarative/layouts/positioners/Button.qml
deleted file mode 100644
index d03eeb5..0000000
--- a/examples/declarative/layouts/positioners/Button.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-
-    property string text
-    property string icon
-    signal clicked
-
-    border.color: "black"; color: "steelblue"; radius: 5
-    width: pix.width + textelement.width + 13
-    height: pix.height + 10
-
-    Image { id: pix; x: 5; y:5; source: parent.icon }
-
-    Text {
-        id: textelement
-        text: page.text; color: "white"
-        x: pix.width + pix.x + 3
-        anchors.verticalCenter: pix.verticalCenter
-    }
-
-    MouseArea {
-        id: mr
-        anchors.fill: parent
-        onClicked: { parent.focus = true; page.clicked() }
-    }
-
-    states: State {
-        name: "pressed"; when: mr.pressed
-        PropertyChanges { target: textelement; x: 5 }
-        PropertyChanges { target: pix; x: textelement.x + textelement.width + 3 }
-    }
-
-    transitions: Transition {
-        NumberAnimation { properties: "x,left"; easing.type: Easing.InOutQuad; duration: 200 }
-    }
-}
diff --git a/examples/declarative/layouts/positioners/add.png b/examples/declarative/layouts/positioners/add.png
deleted file mode 100644
index f29d84b..0000000
Binary files a/examples/declarative/layouts/positioners/add.png and /dev/null differ
diff --git a/examples/declarative/layouts/positioners/del.png b/examples/declarative/layouts/positioners/del.png
deleted file mode 100644
index 1d753a3..0000000
Binary files a/examples/declarative/layouts/positioners/del.png and /dev/null differ
diff --git a/examples/declarative/layouts/positioners/positioners.qml b/examples/declarative/layouts/positioners/positioners.qml
deleted file mode 100644
index 2cb0b8b..0000000
--- a/examples/declarative/layouts/positioners/positioners.qml
+++ /dev/null
@@ -1,213 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-    width: 420; height: 420
-
-    Column {
-        id: layout1
-        y: 0
-        move: Transition {
-            NumberAnimation { properties: "y"; easing.type: Easing.OutBounce }
-        }
-        add: Transition {
-            NumberAnimation { properties: "y"; easing.type: Easing.OutQuad }
-        }
-
-        Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueV1
-            width: 100; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueV2
-            width: 100; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
-    }
-
-    Row {
-        id: layout2
-        y: 300 
-        move: Transition {
-            NumberAnimation { properties: "x"; easing.type: Easing.OutBounce }
-        }
-        add: Transition {
-            NumberAnimation { properties: "x"; easing.type: Easing.OutQuad }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueH1
-            width: 50; height: 100
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueH2
-            width: 50; height: 100
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
-    }
-
-    Button {
-        x: 135; y: 90
-        text: "Remove"
-        icon: "del.png"
-
-        onClicked: {
-            blueH2.opacity = 0
-            blueH1.opacity = 0
-            blueV1.opacity = 0
-            blueV2.opacity = 0
-            blueG1.opacity = 0
-            blueG2.opacity = 0
-            blueG3.opacity = 0
-            blueF1.opacity = 0
-            blueF2.opacity = 0
-            blueF3.opacity = 0
-        }
-    }
-
-    Button {
-        x: 145; y: 140
-        text: "Add"
-        icon: "add.png"
-
-        onClicked: {
-            blueH2.opacity = 1
-            blueH1.opacity = 1
-            blueV1.opacity = 1
-            blueV2.opacity = 1
-            blueG1.opacity = 1
-            blueG2.opacity = 1
-            blueG3.opacity = 1
-            blueF1.opacity = 1
-            blueF2.opacity = 1
-            blueF3.opacity = 1
-        }
-    }
-
-    Grid {
-        x: 260; y: 0
-        columns: 3
-
-        move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
-        }
-
-        add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG1
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG2
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueG3
-            width: 50; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-    }
-
-    Flow {
-        id: layout4
-        x: 260; y: 250; width: 150
-
-        move: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
-        }
-
-        add: Transition {
-            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
-        }
-
-        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueF1
-            width: 60; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "green"; width: 30; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle {
-            id: blueF2
-            width: 60; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
-
-        Rectangle { 
-            id: blueF3
-            width: 40; height: 50
-            color: "lightsteelblue"
-            border.color: "black"
-            radius: 15 
-            Behavior on opacity { NumberAnimation {} }
-        }
-
-        Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
-    }
-
-}
diff --git a/examples/declarative/layouts/positioners/positioners.qmlproject b/examples/declarative/layouts/positioners/positioners.qmlproject
deleted file mode 100644
index e526217..0000000
--- a/examples/declarative/layouts/positioners/positioners.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-/* File generated by QtCreator */
-
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/layouts/positioners/positioners.qmlproject.user b/examples/declarative/layouts/positioners/positioners.qmlproject.user
deleted file mode 100644
index 593479d..0000000
--- a/examples/declarative/layouts/positioners/positioners.qmlproject.user
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- 
-  ProjectExplorer.Project.ActiveTarget
-  0
- 
- 
-  ProjectExplorer.Project.EditorSettings
-  
-   UTF-8
-  
- 
- 
-  ProjectExplorer.Project.Target.0
-  
-   QML Runtime
-   QmlProjectManager.QmlTarget
-   -1
-   0
-   0
-   
-    QML Runtime
-    QmlProjectManager.QmlRunConfiguration
-    127.0.0.1
-    3768
-    positioners.qml
-    
-    
-   
-   1
-  
- 
- 
-  ProjectExplorer.Project.TargetCount
-  1
- 
- 
-  ProjectExplorer.Project.Updater.FileVersion
-  4
- 
-
diff --git a/examples/declarative/listmodel-threaded/dataloader.js b/examples/declarative/listmodel-threaded/dataloader.js
deleted file mode 100644
index d720f09..0000000
--- a/examples/declarative/listmodel-threaded/dataloader.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// ![0]
-WorkerScript.onMessage = function(msg) {
-    if (msg.action == 'appendCurrentTime') {
-        var data = {'time': new Date().toTimeString()};
-        msg.model.append(data);
-        msg.model.sync();   // updates the changes to the list
-    }
-}
-// ![0]
diff --git a/examples/declarative/listmodel-threaded/listmodel-threaded.qmlproject b/examples/declarative/listmodel-threaded/listmodel-threaded.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/listmodel-threaded/listmodel-threaded.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/listmodel-threaded/timedisplay.qml b/examples/declarative/listmodel-threaded/timedisplay.qml
deleted file mode 100644
index bad7010..0000000
--- a/examples/declarative/listmodel-threaded/timedisplay.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-// ![0]
-import Qt 4.7
-
-ListView {
-    width: 200
-    height: 300
-
-    model: listModel
-    delegate: Component {
-        Text { text: time }
-    }
-
-    ListModel { id: listModel }
-
-    WorkerScript {
-        id: worker
-        source: "dataloader.js"
-    }
-
-    Timer {
-        id: timer
-        interval: 2000; repeat: true
-        running: true
-        triggeredOnStart: true
-
-        onTriggered: {
-            var msg = {'action': 'appendCurrentTime', 'model': listModel};
-            worker.sendMessage(msg);
-        }
-    }
-}
-// ![0]
diff --git a/examples/declarative/listview/content/ClickAutoRepeating.qml b/examples/declarative/listview/content/ClickAutoRepeating.qml
deleted file mode 100644
index f65c2b3..0000000
--- a/examples/declarative/listview/content/ClickAutoRepeating.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: page
-    property int repeatdelay: 300
-    property int repeatperiod: 75
-    property bool isPressed: false
-
-    signal pressed
-    signal released
-    signal clicked
-
-    SequentialAnimation on isPressed {
-        running: false
-        id: autoRepeat
-        PropertyAction { target: page; property: "isPressed"; value: true }
-        ScriptAction { script: page.pressed() }
-        ScriptAction { script: page.clicked() }
-        PauseAnimation { duration: repeatdelay }
-        SequentialAnimation {
-            loops: Animation.Infinite
-            ScriptAction { script: page.clicked() }
-            PauseAnimation { duration: repeatperiod }
-        }
-    }
-    MouseArea {
-        anchors.fill: parent
-        onPressed: autoRepeat.start()
-        onReleased: { autoRepeat.stop(); parent.isPressed = false; page.released() }
-    }
-}
diff --git a/examples/declarative/listview/content/MediaButton.qml b/examples/declarative/listview/content/MediaButton.qml
deleted file mode 100644
index a625b4c..0000000
--- a/examples/declarative/listview/content/MediaButton.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.7
-
-Item {
-    property variant text
-    signal clicked
-
-    id: container
-    Image {
-        id: normal
-        source: "pics/button.png"
-    }
-    Image {
-        id: pressed
-        source: "pics/button-pressed.png"
-        opacity: 0
-    }
-    MouseArea {
-        id: clickRegion
-        anchors.fill: normal
-        onClicked: { container.clicked(); }
-    }
-    Text {
-        font.bold: true
-        color: "white"
-        anchors.centerIn: normal
-        text: container.text
-    }
-    width: normal.width
-
-    states: State {
-        name: "Pressed"
-        when: clickRegion.pressed == true
-        PropertyChanges { target: pressed; opacity: 1 }
-    }
-}
diff --git a/examples/declarative/listview/content/pics/add.png b/examples/declarative/listview/content/pics/add.png
deleted file mode 100644
index f29d84b..0000000
Binary files a/examples/declarative/listview/content/pics/add.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/archive-insert.png b/examples/declarative/listview/content/pics/archive-insert.png
deleted file mode 100644
index b706248..0000000
Binary files a/examples/declarative/listview/content/pics/archive-insert.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/archive-remove.png b/examples/declarative/listview/content/pics/archive-remove.png
deleted file mode 100644
index 9640f6b..0000000
Binary files a/examples/declarative/listview/content/pics/archive-remove.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/button-pressed.png b/examples/declarative/listview/content/pics/button-pressed.png
deleted file mode 100644
index e434d32..0000000
Binary files a/examples/declarative/listview/content/pics/button-pressed.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/button.png b/examples/declarative/listview/content/pics/button.png
deleted file mode 100644
index 56a63ce..0000000
Binary files a/examples/declarative/listview/content/pics/button.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/del.png b/examples/declarative/listview/content/pics/del.png
deleted file mode 100644
index 1d753a3..0000000
Binary files a/examples/declarative/listview/content/pics/del.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/fruit-salad.jpg b/examples/declarative/listview/content/pics/fruit-salad.jpg
deleted file mode 100644
index da5a6b1..0000000
Binary files a/examples/declarative/listview/content/pics/fruit-salad.jpg and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/go-down.png b/examples/declarative/listview/content/pics/go-down.png
deleted file mode 100644
index 63331a5..0000000
Binary files a/examples/declarative/listview/content/pics/go-down.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/go-up.png b/examples/declarative/listview/content/pics/go-up.png
deleted file mode 100644
index 4459024..0000000
Binary files a/examples/declarative/listview/content/pics/go-up.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/hamburger.jpg b/examples/declarative/listview/content/pics/hamburger.jpg
deleted file mode 100644
index d0a15be..0000000
Binary files a/examples/declarative/listview/content/pics/hamburger.jpg and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/lemonade.jpg b/examples/declarative/listview/content/pics/lemonade.jpg
deleted file mode 100644
index db445c9..0000000
Binary files a/examples/declarative/listview/content/pics/lemonade.jpg and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/list-add.png b/examples/declarative/listview/content/pics/list-add.png
deleted file mode 100644
index e029787..0000000
Binary files a/examples/declarative/listview/content/pics/list-add.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/list-remove.png b/examples/declarative/listview/content/pics/list-remove.png
deleted file mode 100644
index 2bb1a59..0000000
Binary files a/examples/declarative/listview/content/pics/list-remove.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/moreDown.png b/examples/declarative/listview/content/pics/moreDown.png
deleted file mode 100644
index 31a35d5..0000000
Binary files a/examples/declarative/listview/content/pics/moreDown.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/moreUp.png b/examples/declarative/listview/content/pics/moreUp.png
deleted file mode 100644
index fefb9c9..0000000
Binary files a/examples/declarative/listview/content/pics/moreUp.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/pancakes.jpg b/examples/declarative/listview/content/pics/pancakes.jpg
deleted file mode 100644
index 60c4396..0000000
Binary files a/examples/declarative/listview/content/pics/pancakes.jpg and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/trash.png b/examples/declarative/listview/content/pics/trash.png
deleted file mode 100644
index 2042595..0000000
Binary files a/examples/declarative/listview/content/pics/trash.png and /dev/null differ
diff --git a/examples/declarative/listview/content/pics/vegetable-soup.jpg b/examples/declarative/listview/content/pics/vegetable-soup.jpg
deleted file mode 100644
index 9dce332..0000000
Binary files a/examples/declarative/listview/content/pics/vegetable-soup.jpg and /dev/null differ
diff --git a/examples/declarative/listview/dummydata/MyPetsModel.qml b/examples/declarative/listview/dummydata/MyPetsModel.qml
deleted file mode 100644
index f15dda3..0000000
--- a/examples/declarative/listview/dummydata/MyPetsModel.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import Qt 4.7
-
-// ListModel allows free form list models to be defined and populated.
-
-ListModel {
-    id: petsModel
-    ListElement {
-        name: "Polly"
-        type: "Parrot"
-        age: 12
-        size: "Small"
-    }
-    ListElement {
-        name: "Penny"
-        type: "Turtle"
-        age: 4
-        size: "Small"
-    }
-    ListElement {
-        name: "Warren"
-        type: "Rabbit"
-        age: 2
-        size: "Small"
-    }
-    ListElement {
-        name: "Spot"
-        type: "Dog"
-        age: 9
-        size: "Medium"
-    }
-    ListElement {
-        name: "Schrödinger"
-        type: "Cat"
-        age: 2
-        size: "Medium"
-    }
-    ListElement {
-        name: "Joey"
-        type: "Kangaroo"
-        age: 1
-        size: "Medium"
-    }
-    ListElement {
-        name: "Kimba"
-        type: "Bunny"
-        age: 65
-        size: "Large"
-    }
-    ListElement {
-        name: "Rover"
-        type: "Dog"
-        age: 5
-        size: "Large"
-    }
-    ListElement {
-        name: "Tiny"
-        type: "Elephant"
-        age: 15
-        size: "Large"
-    }
-}
diff --git a/examples/declarative/listview/dummydata/Recipes.qml b/examples/declarative/listview/dummydata/Recipes.qml
deleted file mode 100644
index f707c82..0000000
--- a/examples/declarative/listview/dummydata/Recipes.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-import Qt 4.7
-
-ListModel {
-    id: recipesModel
-    ListElement {
-        title: "Pancakes"
-        picture: "content/pics/pancakes.jpg"
-        ingredients: " 
-                       
         
-                        
      •  1 cup (150g) self-raising flour 
-                        
      •  1 tbs caster sugar 
-                        
      •  3/4 cup (185ml) milk 
-                        
      •  1 egg 
-                       
       
-                      "
-        method: " 
-                  
         
-                   
      1.  Sift flour and sugar together into a bowl. Add a pinch of salt. 
-                   
      2.  Beat milk and egg together, then add to dry ingredients. Beat until smooth. 
-                   
      3.  Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. 
-                   
      4.  Turn over and cook other side until golden.  
-                  
      
-                 "
-    }
-    ListElement {
-        title: "Fruit Salad"
-        picture: "content/pics/fruit-salad.jpg"
-        ingredients: "* Seasonal Fruit"
-        method: "* Chop fruit and place in a bowl."
-    }
-    ListElement {
-        title: "Vegetable Soup"
-        picture: "content/pics/vegetable-soup.jpg"
-        ingredients: " 
-                       
         
-                        
      •  1 onion 
-                        
      •  1 turnip 
-                        
      •  1 potato 
-                        
      •  1 carrot 
-                        
      •  1 head of celery 
-                        
      •  1 1/2 litres of water 
-                       
       
-                      "
-        method: " 
-                  
         
-                   
      1.  Chop vegetables. 
-                   
      2.  Boil in water until vegetables soften. 
-                   
      3.  Season with salt and pepper to taste. 
-                  
       
-                 "
-    }
-    ListElement {
-        title: "Hamburger"
-        picture: "content/pics/hamburger.jpg"
-        ingredients: " 
-                       
         
-                        
      •  500g minced beef 
-                        
      •  Seasoning 
-                        
      •  lettuce, tomato, onion, cheese 
-                        
      •  1 hamburger bun for each burger 
-                       
       
-                      "
-        method: " 
-                  
         
-                   
      1.  Mix the beef, together with seasoning, in a food processor. 
-                   
      2.  Shape the beef into burgers. 
-                   
      3.  Grill the burgers for about 5 mins on each side (until cooked through) 
-                   
      4.  Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. 
-                  
       
-                 "
-    }
-    ListElement {
-        title: "Lemonade"
-        picture: "content/pics/lemonade.jpg"
-        ingredients: " 
-                       
         
-                        
      •  1 cup Lemon Juice 
-                        
      •  1 cup Sugar 
-                        
      •  6 Cups of Water (2 cups warm water, 4 cups cold water) 
-                       
       
-                      "
-        method: " 
-                  
         
-                   
      1.  Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. 
-                   
      2.  Pour in lemon juice, stir again, and add 4 cups of cold water. 
-                   
      3.  Chill or serve over ice cubes. 
-                  
       
-                 "
-    }
-}
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
deleted file mode 100644
index 64f324e..0000000
--- a/examples/declarative/listview/dynamic.qml
+++ /dev/null
@@ -1,208 +0,0 @@
-import Qt 4.7
-import "content"
-import "../scrollbar"
-
-Rectangle {
-    id: container
-    width: 640; height: 480
-    color: "#343434"
-
-    ListModel {
-        id: fruitModel
-
-        ListElement {
-            name: "Apple"; cost: 2.45
-            attributes: [
-                ListElement { description: "Core" },
-                ListElement { description: "Deciduous" }
-            ]
-        }
-        ListElement {
-            name: "Banana"; cost: 1.95
-            attributes: [
-                ListElement { description: "Tropical" },
-                ListElement { description: "Seedless" }
-            ]
-        }
-        ListElement {
-            name: "Cumquat"; cost: 3.25
-            attributes: [
-                ListElement { description: "Citrus" }
-            ]
-        }
-        ListElement {
-            name: "Durian"; cost: 9.95
-            attributes: [
-                ListElement { description: "Tropical" },
-                ListElement { description: "Smelly" }
-            ]
-        }
-        ListElement {
-            name: "Elderberry"; cost: 0.05
-            attributes: [
-                ListElement { description: "Berry" }
-            ]
-        }
-        ListElement {
-            name: "Fig"; cost: 0.25
-            attributes: [
-                ListElement { description: "Flower" }
-            ]
-        }
-    }
-
-    Component {
-        id: fruitDelegate
-
-        Item {
-            width: container.width; height: 55
-
-            Column {
-                id: moveButtons
-                x: 5; width: childrenRect.width; anchors.verticalCenter: parent.verticalCenter
-
-                Image {
-                    source: "content/pics/go-up.png"
-                    MouseArea { anchors.fill: parent; onClicked: fruitModel.move(index,index-1,1) }
-                }
-                Image { source: "content/pics/go-down.png"
-                    MouseArea { anchors.fill: parent; onClicked: fruitModel.move(index,index+1,1) }
-                }
-            }
-
-            Column {
-                anchors { right: itemButtons.left; verticalCenter: parent.verticalCenter; left: moveButtons.right; leftMargin: 10 }
-
-                Text {
-                    id: label
-                    width: parent.width
-                    color: "White"
-                    font.bold: true; font.pixelSize: 15
-                    text: name; elide: Text.ElideRight
-                }
-                Row {
-                    spacing: 5
-                    Repeater {
-                        model: attributes
-                        Component {
-                            Text { text: description; color: "White" }
-                        }
-                    }
-                }
-            }
-
-            Row {
-                id: itemButtons
-
-                anchors { right: removeButton.left; rightMargin: 35; verticalCenter: parent.verticalCenter }
-                width: childrenRect.width
-                spacing: 10
-
-                Image {
-                    source: "content/pics/list-add.png"
-                    scale: clickUp.isPressed ? 0.9 : 1
-
-                    ClickAutoRepeating {
-                        id: clickUp
-                        anchors.fill: parent
-                        onClicked: fruitModel.setProperty(index, "cost", cost+0.25)
-                    }
-                }
-
-                Text { id: costText; text: '$'+Number(cost).toFixed(2); font.pixelSize: 15; color: "White"; font.bold: true; }
-
-                Image {
-                    source: "content/pics/list-remove.png"
-                    scale: clickDown.isPressed ? 0.9 : 1
-
-                    ClickAutoRepeating {
-                        id: clickDown
-                        anchors.fill: parent
-                        onClicked: fruitModel.setProperty(index, "cost", Math.max(0,cost-0.25))
-                    }
-                }
-            }
-            Image {
-                id: removeButton
-                anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: 10 }
-                source: "content/pics/archive-remove.png"
-
-                MouseArea { anchors.fill:parent; onClicked: fruitModel.remove(index) }
-            }
-        }
-    }
-
-    ListView {
-        id: view
-        anchors { top: parent.top; left: parent.left; right: parent.right; bottom: buttons.top }
-        model: fruitModel
-        delegate: fruitDelegate
-    }
-
-    // Attach scrollbar to the right edge of the view.
-    ScrollBar {
-        id: verticalScrollBar
-
-        width: 8; height: view.height; anchors.right: view.right
-        opacity: 0
-        orientation: Qt.Vertical
-        position: view.visibleArea.yPosition
-        pageSize: view.visibleArea.heightRatio
-
-        // Only show the scrollbar when the view is moving.
-        states: State {
-            name: "ShowBars"; when: view.movingVertically
-            PropertyChanges { target: verticalScrollBar; opacity: 1 }
-        }
-        transitions: Transition {
-            NumberAnimation { properties: "opacity"; duration: 400 }
-        }
-    }
-
-    Row {
-        id: buttons
-
-        x: 8; width: childrenRect.width; height: childrenRect.height
-        anchors { bottom: parent.bottom; bottomMargin: 8 }
-        spacing: 8
-
-        Image {
-            source: "content/pics/archive-insert.png"
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    fruitModel.append({
-                        "name": "Pizza Margarita",
-                        "cost": 5.95,
-                        "attributes": [{"description": "Cheese"},{"description": "Tomato"}]
-                    })
-                }
-            }
-        }
-
-        Image {
-            source: "content/pics/archive-insert.png"
-
-            MouseArea {
-                anchors.fill: parent;
-                onClicked: {
-                    fruitModel.insert(0, {
-                        "name": "Pizza Supreme",
-                        "cost": 9.95,
-                        "attributes": [{"description": "Cheese"},{"description": "Tomato"},{"description": "The Works"}]
-                    })
-                }
-            }
-        }
-
-        Image {
-            source: "content/pics/archive-remove.png"
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: fruitModel.clear()
-            }
-        }
-    }
-}
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml
deleted file mode 100644
index ade355d..0000000
--- a/examples/declarative/listview/highlight.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 400; height: 300
-
-    // MyPets model is defined in dummydata/MyPetsModel.qml
-    // The launcher automatically loads files in dummydata/* to assist
-    // development without a real data source.
-    // This one contains my pets.
-
-    // Define a delegate component.  A component will be
-    // instantiated for each visible item in the list.
-    Component {
-        id: petDelegate
-        Item {
-            id: wrapper
-            width: 200; height: 50
-            Column {
-                Text { text: 'Name: ' + name }
-                Text { text: 'Type: ' + type }
-                Text { text: 'Age: ' + age }
-            }
-            // Use the ListView.isCurrentItem attached property to
-            // indent the item if it is the current item.
-            states: State {
-                name: "Current"
-                when: wrapper.ListView.isCurrentItem
-                PropertyChanges { target: wrapper; x: 10 }
-            }
-            transitions: Transition {
-                NumberAnimation { properties: "x"; duration: 200 } 
-            }
-        }
-    }
-    // Specify a highlight with custom movement.  Note that highlightFollowsCurrentItem
-    // is set to false in the ListView so that we can control how the
-    // highlight moves to the current item.
-    Component {
-        id: petHighlight
-        Rectangle {
-            width: 200; height: 50
-            color: "#FFFF88"
-            SpringFollow on y { to: list1.currentItem.y; spring: 3; damping: 0.1 }
-        }
-    }
-
-    ListView {
-        id: list1
-        width: 200; height: parent.height
-        model: MyPetsModel
-        delegate: petDelegate
-        highlight: petHighlight; highlightFollowsCurrentItem: false
-        focus: true
-    }
-}
diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml
deleted file mode 100644
index b73b3a3..0000000
--- a/examples/declarative/listview/itemlist.qml
+++ /dev/null
@@ -1,67 +0,0 @@
-// This example demonstrates placing items in a view using
-// a VisualItemModel
-
-import Qt 4.7
-
-Rectangle {
-    color: "lightgray"
-    width: 240
-    height: 320
-
-    VisualItemModel {
-        id: itemModel
-
-        Rectangle {
-            width: view.width; height: view.height
-            color: "#FFFEF0"
-            Text { text: "Page 1"; font.bold: true; anchors.centerIn: parent }
-        }
-        Rectangle {
-            width: view.width; height: view.height
-            color: "#F0FFF7"
-            Text { text: "Page 2"; font.bold: true; anchors.centerIn: parent }
-        }
-        Rectangle {
-            width: view.width; height: view.height
-            color: "#F4F0FF"
-            Text { text: "Page 3"; font.bold: true; anchors.centerIn: parent }
-        }
-    }
-
-    ListView {
-        id: view
-        anchors { fill: parent; bottomMargin: 30 }
-        model: itemModel
-        preferredHighlightBegin: 0; preferredHighlightEnd: 0
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        orientation: ListView.Horizontal
-        snapMode: ListView.SnapOneItem; flickDeceleration: 2000
-    }
-
-    Rectangle {
-        width: 240; height: 30
-        anchors { top: view.bottom; bottom: parent.bottom }
-        color: "gray"
-
-        Row {
-            anchors.centerIn: parent
-            spacing: 20
-
-            Repeater {
-                model: itemModel.count
-
-                Rectangle {
-                    width: 5; height: 5
-                    radius: 3
-                    color: view.currentIndex == index ? "blue" : "white"
-
-                    MouseArea {
-                        width: 20; height: 20
-                        anchors.centerIn: parent
-                        onClicked: view.currentIndex = index
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/listview/listview-example.qml b/examples/declarative/listview/listview-example.qml
deleted file mode 100644
index 2e8cdda..0000000
--- a/examples/declarative/listview/listview-example.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 600; height: 300
-
-    // MyPets model is defined in dummydata/MyPetsModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
-    // development without a real data source.
-    // This one contains my pets.
-
-    // Define a delegate component.  A component will be
-    // instantiated for each visible item in the list.
-    Component {
-        id: petDelegate
-        Item {
-            width: 200; height: 50
-            Column {
-                Text { text: 'Name: ' + name }
-                Text { text: 'Type: ' + type }
-                Text { text: 'Age: ' + age }
-            }
-        }
-    }
-
-    // Define a highlight component.  Just one of these will be instantiated
-    // by each ListView and placed behind the current item.
-    Component {
-        id: petHighlight
-        Rectangle { color: "#FFFF88" }
-    }
-
-    // Show the model in three lists, with different highlight ranges.
-    // preferredHighlightBegin and preferredHighlightEnd set the
-    // range in which to attempt to maintain the highlight.
-    //
-    // Note that the second and third ListView
-    // set their currentIndex to be the same as the first, and that
-    // the first ListView is given keyboard focus.
-    //
-    // The default mode allows the currentItem to move freely
-    // within the visible area.  If it would move outside the visible
-    // area, the view is scrolled to keep it visible.
-    //
-    // The second list sets a highlight range which attempts to keep the
-    // current item within the the bounds of the range, however
-    // items will not scroll beyond the beginning or end of the view,
-    // forcing the highlight to move outside the range at the ends.
-    //
-    // The third list sets the highlightRangeMode to StrictlyEnforceRange
-    // and sets a range smaller than the height of an item.  This
-    // forces the current item to change when the view is flicked,
-    // since the highlight is unable to move.
-    //
-    // Note that the first ListView sets its currentIndex to be equal to
-    // the third ListView's currentIndex.  By flicking List3 with
-    // the mouse, the current index of List1 will be changed.
-
-    ListView {
-        id: list1
-        width: 200; height: parent.height
-        model: MyPetsModel
-        delegate: petDelegate
-
-        highlight: petHighlight
-        currentIndex: list3.currentIndex
-        focus: true
-    }
-
-    ListView {
-        id: list2
-        x: 200; width: 200; height: parent.height
-        model: MyPetsModel
-        delegate: petDelegate
-
-        highlight: petHighlight
-        currentIndex: list1.currentIndex
-        preferredHighlightBegin: 80; preferredHighlightEnd: 220
-        highlightRangeMode: ListView.ApplyRange
-    }
-
-    ListView {
-        id: list3
-        x: 400; width: 200; height: parent.height
-        model: MyPetsModel
-        delegate: petDelegate
-
-        highlight: Rectangle { color: "lightsteelblue" }
-        currentIndex: list1.currentIndex
-        preferredHighlightBegin: 125; preferredHighlightEnd: 125
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        flickDeceleration: 1000
-    }
-}
diff --git a/examples/declarative/listview/listview.qmlproject b/examples/declarative/listview/listview.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/listview/listview.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
deleted file mode 100644
index 990e272..0000000
--- a/examples/declarative/listview/recipes.qml
+++ /dev/null
@@ -1,160 +0,0 @@
-import Qt 4.7
-import "content"
-
-// This example illustrates expanding a list item to show a more detailed view
-
-Rectangle {
-    id: page
-    width: 400; height: 240
-    color: "black"
-
-    // Delegate for the recipes.  This delegate has two modes:
-    // 1. the list mode (default), which just shows the picture and title of the recipe.
-    // 2. the details mode, which also shows the ingredients and method.
-    Component {
-        id: recipeDelegate
-
-        Item {
-            id: wrapper
-
-            // Create a property to contain the visibility of the details.
-            // We can bind multiple element's opacity to this one property,
-            // rather than having a "PropertyChanges" line for each element we
-            // want to fade.
-            property real detailsOpacity : 0
-
-            width: list.width
-
-            // A simple rounded rectangle for the background
-            Rectangle {
-                id: background
-                x: 1; y: 2; width: parent.width - 2; height: parent.height - 4
-                color: "#FEFFEE"
-                border.color: "#FFBE4F"
-                radius: 5
-            }
-
-            // This mouse region covers the entire delegate.
-            // When clicked it changes mode to 'Details'.  If we are already
-            // in Details mode, then no change will happen.
-            MouseArea {
-                id: pageMouse
-                anchors.fill: parent
-                onClicked: wrapper.state = 'Details';
-            }
-
-            // Layout the page.  Picture, title and ingredients at the top, method at the
-            // bottom.  Note that elements that should not be visible in the list
-            // mode have their opacity set to wrapper.detailsOpacity.
-            Row {
-                id: topLayout
-                x: 10; y: 10; height: recipePic.height; width: parent.width
-                spacing: 10
-
-                Image {
-                    id: recipePic
-                    source: picture; width: 48; height: 48
-                }
-
-                Column {
-                    width: background.width-recipePic.width-20; height: recipePic.height; 
-                    spacing: 5
-
-                    Text { id: name; text: title; font.bold: true; font.pointSize: 16 }
-
-                    Text {
-                        text: "Ingredients"
-                        font.pointSize: 12; font.bold: true
-                        opacity: wrapper.detailsOpacity
-                    }
-
-                    Text {
-                        text: ingredients
-                        wrapMode: Text.WordWrap
-                        width: parent.width
-                        opacity: wrapper.detailsOpacity
-                    }
-                }
-            }
-
-            Item {
-                id: details
-                x: 10; width: parent.width-20
-                anchors { top: topLayout.bottom; topMargin: 10; bottom: parent.bottom; bottomMargin: 10 }
-                opacity: wrapper.detailsOpacity
-
-                Text {
-                    id: methodTitle
-                    anchors.top: parent.top
-                    text: "Method"
-                    font.pointSize: 12; font.bold: true
-                }
-
-                Flickable {
-                    id: flick
-                    width: parent.width
-                    anchors { top: methodTitle.bottom; bottom: parent.bottom }
-                    contentHeight: methodText.height; clip: true
-
-                    Text { id: methodText; text: method; wrapMode: Text.WordWrap; width: details.width }
-                }
-
-                Image {
-                    anchors { right: flick.right; top: flick.top }
-                    source: "content/pics/moreUp.png"
-                    opacity: flick.atYBeginning ? 0 : 1
-                }
-
-                Image {
-                    anchors { right: flick.right; bottom: flick.bottom }
-                    source: "content/pics/moreDown.png"
-                    opacity: flick.atYEnd ? 0 : 1
-                }
-            }
-
-            // A button to close the detailed view, i.e. set the state back to default ('').
-            MediaButton {
-                y: 10; anchors { right: background.right; rightMargin: 5 }
-                opacity: wrapper.detailsOpacity
-                text: "Close"
-
-                onClicked: wrapper.state = '';
-            }
-
-            // Set the default height to the height of the picture, plus margin.
-            height: 68
-
-            states: State {
-                name: "Details"
-
-                PropertyChanges { target: background; color: "white" }
-                PropertyChanges { target: recipePic; width: 128; height: 128 } // Make picture bigger
-                PropertyChanges { target: wrapper; detailsOpacity: 1; x: 0 } // Make details visible
-                PropertyChanges { target: wrapper; height: list.height } // Fill the entire list area with the detailed view
-
-                // Move the list so that this item is at the top.
-                PropertyChanges { target: wrapper.ListView.view; explicit: true; contentY: wrapper.y }
-
-                // Disallow flicking while we're in detailed view
-                PropertyChanges { target: wrapper.ListView.view; interactive: false }
-            }
-
-            transitions: Transition {
-                // Make the state changes smooth
-                ParallelAnimation {
-                    ColorAnimation { property: "color"; duration: 500 }
-                    NumberAnimation { duration: 300; properties: "detailsOpacity,x,contentY,height,width" }
-                }
-            }
-        }
-    }
-
-    // The actual list
-    ListView {
-        id: list
-        anchors.fill: parent
-        clip: true
-        model: Recipes
-        delegate: recipeDelegate
-    }
-}
diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml
deleted file mode 100644
index 21f9f03..0000000
--- a/examples/declarative/listview/sections.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-import Qt 4.7
-
-//! [0]
-Rectangle {
-    width: 200
-    height: 240
-
-    // MyPets model is defined in dummydata/MyPetsModel.qml
-    // The viewer automatically loads files in dummydata/* to assist
-    // development without a real data source.
-    // This one contains my pets.
-
-    // Define a delegate component that includes a separator for sections.
-    Component {
-        id: petDelegate
-
-        Item {
-            id: wrapper
-            width: 200
-            height: desc.height // height is the combined height of the description and the section separator
-
-            Item {
-                id: desc
-                x: 5; height: layout.height + 4
-
-                Column {
-                    id: layout
-                    y: 2
-                    Text { text: 'Name: ' + name }
-                    Text { text: 'Type: ' + type }
-                    Text { text: 'Age: ' + age }
-                }
-            }
-        }
-    }
-
-    // Define a highlight component.  Just one of these will be instantiated
-    // by each ListView and placed behind the current item.
-    Component {
-        id: petHighlight
-        Rectangle { color: "#FFFF88" }
-    }
-
-    // The list
-    ListView {
-        id: myList
-
-        width: 200; height: parent.height
-        model: MyPetsModel
-        delegate: petDelegate
-        highlight: petHighlight
-        focus: true
-
-        // The sectionExpression is simply the size of the pet.
-        // We use this to determine which section we are in above.
-        section.property: "size"
-        section.criteria: ViewSection.FullString
-        section.delegate: Rectangle {
-            color: "lightsteelblue"
-            width: 200
-            height: 20
-            Text {
-                x: 2; height: parent.height
-                verticalAlignment: Text.AlignVCenter
-                text: section
-                font.bold: true
-            }
-        }
-    }
-}
-//! [0]
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/declarative/modelviews/gridview/gridview-example.qml
new file mode 100644
index 0000000..a5f41fb
--- /dev/null
+++ b/examples/declarative/modelviews/gridview/gridview-example.qml
@@ -0,0 +1,49 @@
+import Qt 4.7
+
+Rectangle {
+    width: 300; height: 400
+    color: "white"
+
+    ListModel {
+        id: appModel
+        ListElement { name: "Music"; icon: "pics/AudioPlayer_48.png" }
+        ListElement { name: "Movies"; icon: "pics/VideoPlayer_48.png" }
+        ListElement { name: "Camera"; icon: "pics/Camera_48.png" }
+        ListElement { name: "Calendar"; icon: "pics/DateBook_48.png" }
+        ListElement { name: "Messaging"; icon: "pics/EMail_48.png" }
+        ListElement { name: "Todo List"; icon: "pics/TodoList_48.png" }
+        ListElement { name: "Contacts"; icon: "pics/AddressBook_48.png" }
+    }
+
+    Component {
+        id: appDelegate
+
+        Item {
+            width: 100; height: 100
+
+            Image {
+                id: myIcon
+                y: 20; anchors.horizontalCenter: parent.horizontalCenter
+                source: icon
+            }
+            Text {
+                anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
+                text: name
+            }
+        }
+    }
+
+    Component {
+        id: appHighlight
+        Rectangle { width: 80; height: 80; color: "lightsteelblue" }
+    }
+
+    GridView {
+        anchors.fill: parent
+        cellWidth: 100; cellHeight: 100
+        highlight: appHighlight
+        focus: true
+        model: appModel
+        delegate: appDelegate
+    }
+}
diff --git a/examples/declarative/modelviews/gridview/gridview.qmlproject b/examples/declarative/modelviews/gridview/gridview.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/gridview/gridview.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png b/examples/declarative/modelviews/gridview/pics/AddressBook_48.png
new file mode 100644
index 0000000..1ab7c8e
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/AddressBook_48.png differ
diff --git a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png b/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png
new file mode 100644
index 0000000..f4b8689
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png differ
diff --git a/examples/declarative/modelviews/gridview/pics/Camera_48.png b/examples/declarative/modelviews/gridview/pics/Camera_48.png
new file mode 100644
index 0000000..c76b524
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/Camera_48.png differ
diff --git a/examples/declarative/modelviews/gridview/pics/DateBook_48.png b/examples/declarative/modelviews/gridview/pics/DateBook_48.png
new file mode 100644
index 0000000..58f5787
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/DateBook_48.png differ
diff --git a/examples/declarative/modelviews/gridview/pics/EMail_48.png b/examples/declarative/modelviews/gridview/pics/EMail_48.png
new file mode 100644
index 0000000..d6d84a6
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/EMail_48.png differ
diff --git a/examples/declarative/modelviews/gridview/pics/TodoList_48.png b/examples/declarative/modelviews/gridview/pics/TodoList_48.png
new file mode 100644
index 0000000..0988448
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/TodoList_48.png differ
diff --git a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png b/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png
new file mode 100644
index 0000000..52638c5
Binary files /dev/null and b/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png differ
diff --git a/examples/declarative/modelviews/listview/content/ClickAutoRepeating.qml b/examples/declarative/modelviews/listview/content/ClickAutoRepeating.qml
new file mode 100644
index 0000000..f65c2b3
--- /dev/null
+++ b/examples/declarative/modelviews/listview/content/ClickAutoRepeating.qml
@@ -0,0 +1,31 @@
+import Qt 4.7
+
+Item {
+    id: page
+    property int repeatdelay: 300
+    property int repeatperiod: 75
+    property bool isPressed: false
+
+    signal pressed
+    signal released
+    signal clicked
+
+    SequentialAnimation on isPressed {
+        running: false
+        id: autoRepeat
+        PropertyAction { target: page; property: "isPressed"; value: true }
+        ScriptAction { script: page.pressed() }
+        ScriptAction { script: page.clicked() }
+        PauseAnimation { duration: repeatdelay }
+        SequentialAnimation {
+            loops: Animation.Infinite
+            ScriptAction { script: page.clicked() }
+            PauseAnimation { duration: repeatperiod }
+        }
+    }
+    MouseArea {
+        anchors.fill: parent
+        onPressed: autoRepeat.start()
+        onReleased: { autoRepeat.stop(); parent.isPressed = false; page.released() }
+    }
+}
diff --git a/examples/declarative/modelviews/listview/content/MediaButton.qml b/examples/declarative/modelviews/listview/content/MediaButton.qml
new file mode 100644
index 0000000..a625b4c
--- /dev/null
+++ b/examples/declarative/modelviews/listview/content/MediaButton.qml
@@ -0,0 +1,35 @@
+import Qt 4.7
+
+Item {
+    property variant text
+    signal clicked
+
+    id: container
+    Image {
+        id: normal
+        source: "pics/button.png"
+    }
+    Image {
+        id: pressed
+        source: "pics/button-pressed.png"
+        opacity: 0
+    }
+    MouseArea {
+        id: clickRegion
+        anchors.fill: normal
+        onClicked: { container.clicked(); }
+    }
+    Text {
+        font.bold: true
+        color: "white"
+        anchors.centerIn: normal
+        text: container.text
+    }
+    width: normal.width
+
+    states: State {
+        name: "Pressed"
+        when: clickRegion.pressed == true
+        PropertyChanges { target: pressed; opacity: 1 }
+    }
+}
diff --git a/examples/declarative/modelviews/listview/content/pics/add.png b/examples/declarative/modelviews/listview/content/pics/add.png
new file mode 100644
index 0000000..f29d84b
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/add.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/archive-insert.png b/examples/declarative/modelviews/listview/content/pics/archive-insert.png
new file mode 100644
index 0000000..b706248
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/archive-insert.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/archive-remove.png b/examples/declarative/modelviews/listview/content/pics/archive-remove.png
new file mode 100644
index 0000000..9640f6b
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/archive-remove.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/button-pressed.png b/examples/declarative/modelviews/listview/content/pics/button-pressed.png
new file mode 100644
index 0000000..e434d32
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/button-pressed.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/button.png b/examples/declarative/modelviews/listview/content/pics/button.png
new file mode 100644
index 0000000..56a63ce
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/button.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/del.png b/examples/declarative/modelviews/listview/content/pics/del.png
new file mode 100644
index 0000000..1d753a3
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/del.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg b/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg
new file mode 100644
index 0000000..da5a6b1
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg differ
diff --git a/examples/declarative/modelviews/listview/content/pics/go-down.png b/examples/declarative/modelviews/listview/content/pics/go-down.png
new file mode 100644
index 0000000..63331a5
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/go-down.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/go-up.png b/examples/declarative/modelviews/listview/content/pics/go-up.png
new file mode 100644
index 0000000..4459024
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/go-up.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg b/examples/declarative/modelviews/listview/content/pics/hamburger.jpg
new file mode 100644
index 0000000..d0a15be
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/hamburger.jpg differ
diff --git a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg b/examples/declarative/modelviews/listview/content/pics/lemonade.jpg
new file mode 100644
index 0000000..db445c9
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/lemonade.jpg differ
diff --git a/examples/declarative/modelviews/listview/content/pics/list-add.png b/examples/declarative/modelviews/listview/content/pics/list-add.png
new file mode 100644
index 0000000..e029787
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/list-add.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/list-remove.png b/examples/declarative/modelviews/listview/content/pics/list-remove.png
new file mode 100644
index 0000000..2bb1a59
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/list-remove.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/moreDown.png b/examples/declarative/modelviews/listview/content/pics/moreDown.png
new file mode 100644
index 0000000..31a35d5
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/moreDown.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/moreUp.png b/examples/declarative/modelviews/listview/content/pics/moreUp.png
new file mode 100644
index 0000000..fefb9c9
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/moreUp.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg b/examples/declarative/modelviews/listview/content/pics/pancakes.jpg
new file mode 100644
index 0000000..60c4396
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/pancakes.jpg differ
diff --git a/examples/declarative/modelviews/listview/content/pics/trash.png b/examples/declarative/modelviews/listview/content/pics/trash.png
new file mode 100644
index 0000000..2042595
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/trash.png differ
diff --git a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg b/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg
new file mode 100644
index 0000000..9dce332
Binary files /dev/null and b/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg differ
diff --git a/examples/declarative/modelviews/listview/dummydata/MyPetsModel.qml b/examples/declarative/modelviews/listview/dummydata/MyPetsModel.qml
new file mode 100644
index 0000000..f15dda3
--- /dev/null
+++ b/examples/declarative/modelviews/listview/dummydata/MyPetsModel.qml
@@ -0,0 +1,61 @@
+import Qt 4.7
+
+// ListModel allows free form list models to be defined and populated.
+
+ListModel {
+    id: petsModel
+    ListElement {
+        name: "Polly"
+        type: "Parrot"
+        age: 12
+        size: "Small"
+    }
+    ListElement {
+        name: "Penny"
+        type: "Turtle"
+        age: 4
+        size: "Small"
+    }
+    ListElement {
+        name: "Warren"
+        type: "Rabbit"
+        age: 2
+        size: "Small"
+    }
+    ListElement {
+        name: "Spot"
+        type: "Dog"
+        age: 9
+        size: "Medium"
+    }
+    ListElement {
+        name: "Schrödinger"
+        type: "Cat"
+        age: 2
+        size: "Medium"
+    }
+    ListElement {
+        name: "Joey"
+        type: "Kangaroo"
+        age: 1
+        size: "Medium"
+    }
+    ListElement {
+        name: "Kimba"
+        type: "Bunny"
+        age: 65
+        size: "Large"
+    }
+    ListElement {
+        name: "Rover"
+        type: "Dog"
+        age: 5
+        size: "Large"
+    }
+    ListElement {
+        name: "Tiny"
+        type: "Elephant"
+        age: 15
+        size: "Large"
+    }
+}
diff --git a/examples/declarative/modelviews/listview/dummydata/Recipes.qml b/examples/declarative/modelviews/listview/dummydata/Recipes.qml
new file mode 100644
index 0000000..f707c82
--- /dev/null
+++ b/examples/declarative/modelviews/listview/dummydata/Recipes.qml
@@ -0,0 +1,90 @@
+import Qt 4.7
+
+ListModel {
+    id: recipesModel
+    ListElement {
+        title: "Pancakes"
+        picture: "content/pics/pancakes.jpg"
+        ingredients: " 
+                       
         
+                        
      •  1 cup (150g) self-raising flour 
+                        
      •  1 tbs caster sugar 
+                        
      •  3/4 cup (185ml) milk 
+                        
      •  1 egg 
+                       
       
+                      "
+        method: " 
+                  
         
+                   
      1.  Sift flour and sugar together into a bowl. Add a pinch of salt. 
+                   
      2.  Beat milk and egg together, then add to dry ingredients. Beat until smooth. 
+                   
      3.  Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. 
+                   
      4.  Turn over and cook other side until golden.  
+                  
      
+                 "
+    }
+    ListElement {
+        title: "Fruit Salad"
+        picture: "content/pics/fruit-salad.jpg"
+        ingredients: "* Seasonal Fruit"
+        method: "* Chop fruit and place in a bowl."
+    }
+    ListElement {
+        title: "Vegetable Soup"
+        picture: "content/pics/vegetable-soup.jpg"
+        ingredients: " 
+                       
         
+                        
      •  1 onion 
+                        
      •  1 turnip 
+                        
      •  1 potato 
+                        
      •  1 carrot 
+                        
      •  1 head of celery 
+                        
      •  1 1/2 litres of water 
+                       
       
+                      "
+        method: " 
+                  
         
+                   
      1.  Chop vegetables. 
+                   
      2.  Boil in water until vegetables soften. 
+                   
      3.  Season with salt and pepper to taste. 
+                  
       
+                 "
+    }
+    ListElement {
+        title: "Hamburger"
+        picture: "content/pics/hamburger.jpg"
+        ingredients: " 
+                       
         
+                        
      •  500g minced beef 
+                        
      •  Seasoning 
+                        
      •  lettuce, tomato, onion, cheese 
+                        
      •  1 hamburger bun for each burger 
+                       
       
+                      "
+        method: " 
+                  
         
+                   
      1.  Mix the beef, together with seasoning, in a food processor. 
+                   
      2.  Shape the beef into burgers. 
+                   
      3.  Grill the burgers for about 5 mins on each side (until cooked through) 
+                   
      4.  Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. 
+                  
       
+                 "
+    }
+    ListElement {
+        title: "Lemonade"
+        picture: "content/pics/lemonade.jpg"
+        ingredients: " 
+                       
         
+                        
      •  1 cup Lemon Juice 
+                        
      •  1 cup Sugar 
+                        
      •  6 Cups of Water (2 cups warm water, 4 cups cold water) 
+                       
       
+                      "
+        method: " 
+                  
         
+                   
      1.  Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. 
+                   
      2.  Pour in lemon juice, stir again, and add 4 cups of cold water. 
+                   
      3.  Chill or serve over ice cubes. 
+                  
       
+                 "
+    }
+}
diff --git a/examples/declarative/modelviews/listview/dynamic.qml b/examples/declarative/modelviews/listview/dynamic.qml
new file mode 100644
index 0000000..693e88a
--- /dev/null
+++ b/examples/declarative/modelviews/listview/dynamic.qml
@@ -0,0 +1,208 @@
+import Qt 4.7
+import "content"
+import "../../ui-components/scrollbar"
+
+Rectangle {
+    id: container
+    width: 640; height: 480
+    color: "#343434"
+
+    ListModel {
+        id: fruitModel
+
+        ListElement {
+            name: "Apple"; cost: 2.45
+            attributes: [
+                ListElement { description: "Core" },
+                ListElement { description: "Deciduous" }
+            ]
+        }
+        ListElement {
+            name: "Banana"; cost: 1.95
+            attributes: [
+                ListElement { description: "Tropical" },
+                ListElement { description: "Seedless" }
+            ]
+        }
+        ListElement {
+            name: "Cumquat"; cost: 3.25
+            attributes: [
+                ListElement { description: "Citrus" }
+            ]
+        }
+        ListElement {
+            name: "Durian"; cost: 9.95
+            attributes: [
+                ListElement { description: "Tropical" },
+                ListElement { description: "Smelly" }
+            ]
+        }
+        ListElement {
+            name: "Elderberry"; cost: 0.05
+            attributes: [
+                ListElement { description: "Berry" }
+            ]
+        }
+        ListElement {
+            name: "Fig"; cost: 0.25
+            attributes: [
+                ListElement { description: "Flower" }
+            ]
+        }
+    }
+
+    Component {
+        id: fruitDelegate
+
+        Item {
+            width: container.width; height: 55
+
+            Column {
+                id: moveButtons
+                x: 5; width: childrenRect.width; anchors.verticalCenter: parent.verticalCenter
+
+                Image {
+                    source: "content/pics/go-up.png"
+                    MouseArea { anchors.fill: parent; onClicked: fruitModel.move(index,index-1,1) }
+                }
+                Image { source: "content/pics/go-down.png"
+                    MouseArea { anchors.fill: parent; onClicked: fruitModel.move(index,index+1,1) }
+                }
+            }
+
+            Column {
+                anchors { right: itemButtons.left; verticalCenter: parent.verticalCenter; left: moveButtons.right; leftMargin: 10 }
+
+                Text {
+                    id: label
+                    width: parent.width
+                    color: "White"
+                    font.bold: true; font.pixelSize: 15
+                    text: name; elide: Text.ElideRight
+                }
+                Row {
+                    spacing: 5
+                    Repeater {
+                        model: attributes
+                        Component {
+                            Text { text: description; color: "White" }
+                        }
+                    }
+                }
+            }
+
+            Row {
+                id: itemButtons
+
+                anchors { right: removeButton.left; rightMargin: 35; verticalCenter: parent.verticalCenter }
+                width: childrenRect.width
+                spacing: 10
+
+                Image {
+                    source: "content/pics/list-add.png"
+                    scale: clickUp.isPressed ? 0.9 : 1
+
+                    ClickAutoRepeating {
+                        id: clickUp
+                        anchors.fill: parent
+                        onClicked: fruitModel.setProperty(index, "cost", cost+0.25)
+                    }
+                }
+
+                Text { id: costText; text: '$'+Number(cost).toFixed(2); font.pixelSize: 15; color: "White"; font.bold: true; }
+
+                Image {
+                    source: "content/pics/list-remove.png"
+                    scale: clickDown.isPressed ? 0.9 : 1
+
+                    ClickAutoRepeating {
+                        id: clickDown
+                        anchors.fill: parent
+                        onClicked: fruitModel.setProperty(index, "cost", Math.max(0,cost-0.25))
+                    }
+                }
+            }
+            Image {
+                id: removeButton
+                anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: 10 }
+                source: "content/pics/archive-remove.png"
+
+                MouseArea { anchors.fill:parent; onClicked: fruitModel.remove(index) }
+            }
+        }
+    }
+
+    ListView {
+        id: view
+        anchors { top: parent.top; left: parent.left; right: parent.right; bottom: buttons.top }
+        model: fruitModel
+        delegate: fruitDelegate
+    }
+
+    // Attach scrollbar to the right edge of the view.
+    ScrollBar {
+        id: verticalScrollBar
+
+        width: 8; height: view.height; anchors.right: view.right
+        opacity: 0
+        orientation: Qt.Vertical
+        position: view.visibleArea.yPosition
+        pageSize: view.visibleArea.heightRatio
+
+        // Only show the scrollbar when the view is moving.
+        states: State {
+            name: "ShowBars"; when: view.movingVertically
+            PropertyChanges { target: verticalScrollBar; opacity: 1 }
+        }
+        transitions: Transition {
+            NumberAnimation { properties: "opacity"; duration: 400 }
+        }
+    }
+
+    Row {
+        id: buttons
+
+        x: 8; width: childrenRect.width; height: childrenRect.height
+        anchors { bottom: parent.bottom; bottomMargin: 8 }
+        spacing: 8
+
+        Image {
+            source: "content/pics/archive-insert.png"
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    fruitModel.append({
+                        "name": "Pizza Margarita",
+                        "cost": 5.95,
+                        "attributes": [{"description": "Cheese"},{"description": "Tomato"}]
+                    })
+                }
+            }
+        }
+
+        Image {
+            source: "content/pics/archive-insert.png"
+
+            MouseArea {
+                anchors.fill: parent;
+                onClicked: {
+                    fruitModel.insert(0, {
+                        "name": "Pizza Supreme",
+                        "cost": 9.95,
+                        "attributes": [{"description": "Cheese"},{"description": "Tomato"},{"description": "The Works"}]
+                    })
+                }
+            }
+        }
+
+        Image {
+            source: "content/pics/archive-remove.png"
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: fruitModel.clear()
+            }
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/listview/highlight.qml b/examples/declarative/modelviews/listview/highlight.qml
new file mode 100644
index 0000000..ade355d
--- /dev/null
+++ b/examples/declarative/modelviews/listview/highlight.qml
@@ -0,0 +1,55 @@
+import Qt 4.7
+
+Rectangle {
+    width: 400; height: 300
+
+    // MyPets model is defined in dummydata/MyPetsModel.qml
+    // The launcher automatically loads files in dummydata/* to assist
+    // development without a real data source.
+    // This one contains my pets.
+
+    // Define a delegate component.  A component will be
+    // instantiated for each visible item in the list.
+    Component {
+        id: petDelegate
+        Item {
+            id: wrapper
+            width: 200; height: 50
+            Column {
+                Text { text: 'Name: ' + name }
+                Text { text: 'Type: ' + type }
+                Text { text: 'Age: ' + age }
+            }
+            // Use the ListView.isCurrentItem attached property to
+            // indent the item if it is the current item.
+            states: State {
+                name: "Current"
+                when: wrapper.ListView.isCurrentItem
+                PropertyChanges { target: wrapper; x: 10 }
+            }
+            transitions: Transition {
+                NumberAnimation { properties: "x"; duration: 200 } 
+            }
+        }
+    }
+    // Specify a highlight with custom movement.  Note that highlightFollowsCurrentItem
+    // is set to false in the ListView so that we can control how the
+    // highlight moves to the current item.
+    Component {
+        id: petHighlight
+        Rectangle {
+            width: 200; height: 50
+            color: "#FFFF88"
+            SpringFollow on y { to: list1.currentItem.y; spring: 3; damping: 0.1 }
+        }
+    }
+
+    ListView {
+        id: list1
+        width: 200; height: parent.height
+        model: MyPetsModel
+        delegate: petDelegate
+        highlight: petHighlight; highlightFollowsCurrentItem: false
+        focus: true
+    }
+}
diff --git a/examples/declarative/modelviews/listview/itemlist.qml b/examples/declarative/modelviews/listview/itemlist.qml
new file mode 100644
index 0000000..b73b3a3
--- /dev/null
+++ b/examples/declarative/modelviews/listview/itemlist.qml
@@ -0,0 +1,67 @@
+// This example demonstrates placing items in a view using
+// a VisualItemModel
+
+import Qt 4.7
+
+Rectangle {
+    color: "lightgray"
+    width: 240
+    height: 320
+
+    VisualItemModel {
+        id: itemModel
+
+        Rectangle {
+            width: view.width; height: view.height
+            color: "#FFFEF0"
+            Text { text: "Page 1"; font.bold: true; anchors.centerIn: parent }
+        }
+        Rectangle {
+            width: view.width; height: view.height
+            color: "#F0FFF7"
+            Text { text: "Page 2"; font.bold: true; anchors.centerIn: parent }
+        }
+        Rectangle {
+            width: view.width; height: view.height
+            color: "#F4F0FF"
+            Text { text: "Page 3"; font.bold: true; anchors.centerIn: parent }
+        }
+    }
+
+    ListView {
+        id: view
+        anchors { fill: parent; bottomMargin: 30 }
+        model: itemModel
+        preferredHighlightBegin: 0; preferredHighlightEnd: 0
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        orientation: ListView.Horizontal
+        snapMode: ListView.SnapOneItem; flickDeceleration: 2000
+    }
+
+    Rectangle {
+        width: 240; height: 30
+        anchors { top: view.bottom; bottom: parent.bottom }
+        color: "gray"
+
+        Row {
+            anchors.centerIn: parent
+            spacing: 20
+
+            Repeater {
+                model: itemModel.count
+
+                Rectangle {
+                    width: 5; height: 5
+                    radius: 3
+                    color: view.currentIndex == index ? "blue" : "white"
+
+                    MouseArea {
+                        width: 20; height: 20
+                        anchors.centerIn: parent
+                        onClicked: view.currentIndex = index
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/listview/listview-example.qml b/examples/declarative/modelviews/listview/listview-example.qml
new file mode 100644
index 0000000..2e8cdda
--- /dev/null
+++ b/examples/declarative/modelviews/listview/listview-example.qml
@@ -0,0 +1,93 @@
+import Qt 4.7
+
+Rectangle {
+    width: 600; height: 300
+
+    // MyPets model is defined in dummydata/MyPetsModel.qml
+    // The viewer automatically loads files in dummydata/* to assist
+    // development without a real data source.
+    // This one contains my pets.
+
+    // Define a delegate component.  A component will be
+    // instantiated for each visible item in the list.
+    Component {
+        id: petDelegate
+        Item {
+            width: 200; height: 50
+            Column {
+                Text { text: 'Name: ' + name }
+                Text { text: 'Type: ' + type }
+                Text { text: 'Age: ' + age }
+            }
+        }
+    }
+
+    // Define a highlight component.  Just one of these will be instantiated
+    // by each ListView and placed behind the current item.
+    Component {
+        id: petHighlight
+        Rectangle { color: "#FFFF88" }
+    }
+
+    // Show the model in three lists, with different highlight ranges.
+    // preferredHighlightBegin and preferredHighlightEnd set the
+    // range in which to attempt to maintain the highlight.
+    //
+    // Note that the second and third ListView
+    // set their currentIndex to be the same as the first, and that
+    // the first ListView is given keyboard focus.
+    //
+    // The default mode allows the currentItem to move freely
+    // within the visible area.  If it would move outside the visible
+    // area, the view is scrolled to keep it visible.
+    //
+    // The second list sets a highlight range which attempts to keep the
+    // current item within the the bounds of the range, however
+    // items will not scroll beyond the beginning or end of the view,
+    // forcing the highlight to move outside the range at the ends.
+    //
+    // The third list sets the highlightRangeMode to StrictlyEnforceRange
+    // and sets a range smaller than the height of an item.  This
+    // forces the current item to change when the view is flicked,
+    // since the highlight is unable to move.
+    //
+    // Note that the first ListView sets its currentIndex to be equal to
+    // the third ListView's currentIndex.  By flicking List3 with
+    // the mouse, the current index of List1 will be changed.
+
+    ListView {
+        id: list1
+        width: 200; height: parent.height
+        model: MyPetsModel
+        delegate: petDelegate
+
+        highlight: petHighlight
+        currentIndex: list3.currentIndex
+        focus: true
+    }
+
+    ListView {
+        id: list2
+        x: 200; width: 200; height: parent.height
+        model: MyPetsModel
+        delegate: petDelegate
+
+        highlight: petHighlight
+        currentIndex: list1.currentIndex
+        preferredHighlightBegin: 80; preferredHighlightEnd: 220
+        highlightRangeMode: ListView.ApplyRange
+    }
+
+    ListView {
+        id: list3
+        x: 400; width: 200; height: parent.height
+        model: MyPetsModel
+        delegate: petDelegate
+
+        highlight: Rectangle { color: "lightsteelblue" }
+        currentIndex: list1.currentIndex
+        preferredHighlightBegin: 125; preferredHighlightEnd: 125
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        flickDeceleration: 1000
+    }
+}
diff --git a/examples/declarative/modelviews/listview/listview.qmlproject b/examples/declarative/modelviews/listview/listview.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/listview/listview.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/modelviews/listview/recipes.qml b/examples/declarative/modelviews/listview/recipes.qml
new file mode 100644
index 0000000..990e272
--- /dev/null
+++ b/examples/declarative/modelviews/listview/recipes.qml
@@ -0,0 +1,160 @@
+import Qt 4.7
+import "content"
+
+// This example illustrates expanding a list item to show a more detailed view
+
+Rectangle {
+    id: page
+    width: 400; height: 240
+    color: "black"
+
+    // Delegate for the recipes.  This delegate has two modes:
+    // 1. the list mode (default), which just shows the picture and title of the recipe.
+    // 2. the details mode, which also shows the ingredients and method.
+    Component {
+        id: recipeDelegate
+
+        Item {
+            id: wrapper
+
+            // Create a property to contain the visibility of the details.
+            // We can bind multiple element's opacity to this one property,
+            // rather than having a "PropertyChanges" line for each element we
+            // want to fade.
+            property real detailsOpacity : 0
+
+            width: list.width
+
+            // A simple rounded rectangle for the background
+            Rectangle {
+                id: background
+                x: 1; y: 2; width: parent.width - 2; height: parent.height - 4
+                color: "#FEFFEE"
+                border.color: "#FFBE4F"
+                radius: 5
+            }
+
+            // This mouse region covers the entire delegate.
+            // When clicked it changes mode to 'Details'.  If we are already
+            // in Details mode, then no change will happen.
+            MouseArea {
+                id: pageMouse
+                anchors.fill: parent
+                onClicked: wrapper.state = 'Details';
+            }
+
+            // Layout the page.  Picture, title and ingredients at the top, method at the
+            // bottom.  Note that elements that should not be visible in the list
+            // mode have their opacity set to wrapper.detailsOpacity.
+            Row {
+                id: topLayout
+                x: 10; y: 10; height: recipePic.height; width: parent.width
+                spacing: 10
+
+                Image {
+                    id: recipePic
+                    source: picture; width: 48; height: 48
+                }
+
+                Column {
+                    width: background.width-recipePic.width-20; height: recipePic.height; 
+                    spacing: 5
+
+                    Text { id: name; text: title; font.bold: true; font.pointSize: 16 }
+
+                    Text {
+                        text: "Ingredients"
+                        font.pointSize: 12; font.bold: true
+                        opacity: wrapper.detailsOpacity
+                    }
+
+                    Text {
+                        text: ingredients
+                        wrapMode: Text.WordWrap
+                        width: parent.width
+                        opacity: wrapper.detailsOpacity
+                    }
+                }
+            }
+
+            Item {
+                id: details
+                x: 10; width: parent.width-20
+                anchors { top: topLayout.bottom; topMargin: 10; bottom: parent.bottom; bottomMargin: 10 }
+                opacity: wrapper.detailsOpacity
+
+                Text {
+                    id: methodTitle
+                    anchors.top: parent.top
+                    text: "Method"
+                    font.pointSize: 12; font.bold: true
+                }
+
+                Flickable {
+                    id: flick
+                    width: parent.width
+                    anchors { top: methodTitle.bottom; bottom: parent.bottom }
+                    contentHeight: methodText.height; clip: true
+
+                    Text { id: methodText; text: method; wrapMode: Text.WordWrap; width: details.width }
+                }
+
+                Image {
+                    anchors { right: flick.right; top: flick.top }
+                    source: "content/pics/moreUp.png"
+                    opacity: flick.atYBeginning ? 0 : 1
+                }
+
+                Image {
+                    anchors { right: flick.right; bottom: flick.bottom }
+                    source: "content/pics/moreDown.png"
+                    opacity: flick.atYEnd ? 0 : 1
+                }
+            }
+
+            // A button to close the detailed view, i.e. set the state back to default ('').
+            MediaButton {
+                y: 10; anchors { right: background.right; rightMargin: 5 }
+                opacity: wrapper.detailsOpacity
+                text: "Close"
+
+                onClicked: wrapper.state = '';
+            }
+
+            // Set the default height to the height of the picture, plus margin.
+            height: 68
+
+            states: State {
+                name: "Details"
+
+                PropertyChanges { target: background; color: "white" }
+                PropertyChanges { target: recipePic; width: 128; height: 128 } // Make picture bigger
+                PropertyChanges { target: wrapper; detailsOpacity: 1; x: 0 } // Make details visible
+                PropertyChanges { target: wrapper; height: list.height } // Fill the entire list area with the detailed view
+
+                // Move the list so that this item is at the top.
+                PropertyChanges { target: wrapper.ListView.view; explicit: true; contentY: wrapper.y }
+
+                // Disallow flicking while we're in detailed view
+                PropertyChanges { target: wrapper.ListView.view; interactive: false }
+            }
+
+            transitions: Transition {
+                // Make the state changes smooth
+                ParallelAnimation {
+                    ColorAnimation { property: "color"; duration: 500 }
+                    NumberAnimation { duration: 300; properties: "detailsOpacity,x,contentY,height,width" }
+                }
+            }
+        }
+    }
+
+    // The actual list
+    ListView {
+        id: list
+        anchors.fill: parent
+        clip: true
+        model: Recipes
+        delegate: recipeDelegate
+    }
+}
diff --git a/examples/declarative/modelviews/listview/sections.qml b/examples/declarative/modelviews/listview/sections.qml
new file mode 100644
index 0000000..21f9f03
--- /dev/null
+++ b/examples/declarative/modelviews/listview/sections.qml
@@ -0,0 +1,71 @@
+import Qt 4.7
+
+//! [0]
+Rectangle {
+    width: 200
+    height: 240
+
+    // MyPets model is defined in dummydata/MyPetsModel.qml
+    // The viewer automatically loads files in dummydata/* to assist
+    // development without a real data source.
+    // This one contains my pets.
+
+    // Define a delegate component that includes a separator for sections.
+    Component {
+        id: petDelegate
+
+        Item {
+            id: wrapper
+            width: 200
+            height: desc.height // height is the combined height of the description and the section separator
+
+            Item {
+                id: desc
+                x: 5; height: layout.height + 4
+
+                Column {
+                    id: layout
+                    y: 2
+                    Text { text: 'Name: ' + name }
+                    Text { text: 'Type: ' + type }
+                    Text { text: 'Age: ' + age }
+                }
+            }
+        }
+    }
+
+    // Define a highlight component.  Just one of these will be instantiated
+    // by each ListView and placed behind the current item.
+    Component {
+        id: petHighlight
+        Rectangle { color: "#FFFF88" }
+    }
+
+    // The list
+    ListView {
+        id: myList
+
+        width: 200; height: parent.height
+        model: MyPetsModel
+        delegate: petDelegate
+        highlight: petHighlight
+        focus: true
+
+        // The sectionExpression is simply the size of the pet.
+        // We use this to determine which section we are in above.
+        section.property: "size"
+        section.criteria: ViewSection.FullString
+        section.delegate: Rectangle {
+            color: "lightsteelblue"
+            width: 200
+            height: 20
+            Text {
+                x: 2; height: parent.height
+                verticalAlignment: Text.AlignVCenter
+                text: section
+                font.bold: true
+            }
+        }
+    }
+}
+//! [0]
diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro
new file mode 100644
index 0000000..b811e44
--- /dev/null
+++ b/examples/declarative/modelviews/modelviews.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    objectlistmodel \
+    stringlistmodel
+
+
diff --git a/examples/declarative/modelviews/modelviews.qmlproject b/examples/declarative/modelviews/modelviews.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/modelviews.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/modelviews/objectlistmodel/dataobject.cpp b/examples/declarative/modelviews/objectlistmodel/dataobject.cpp
new file mode 100644
index 0000000..14be1b9
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/dataobject.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 QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not 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 
+#include "dataobject.h"
+
+DataObject::DataObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+DataObject::DataObject(const QString &name, const QString &color, QObject *parent)
+    : QObject(parent), m_name(name), m_color(color)
+{
+}
+
+QString DataObject::name() const
+{
+    return m_name;
+}
+
+void DataObject::setName(const QString &name)
+{
+    if (name != m_name) {
+        m_name = name;
+        emit nameChanged();
+    }
+}
+
+QString DataObject::color() const
+{
+    return m_color;
+}
+
+void DataObject::setColor(const QString &color)
+{
+    if (color != m_color) {
+        m_color = color;
+        emit colorChanged();
+    }
+}
diff --git a/examples/declarative/modelviews/objectlistmodel/dataobject.h b/examples/declarative/modelviews/objectlistmodel/dataobject.h
new file mode 100644
index 0000000..852110d
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/dataobject.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 QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not 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 DATAOBJECT_H
+#define DATAOBJECT_H
+
+#include 
+
+class DataObject : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
+
+public:
+    DataObject(QObject *parent=0);
+    DataObject(const QString &name, const QString &color, QObject *parent=0);
+
+    QString name() const;
+    void setName(const QString &name);
+
+    QString color() const;
+    void setColor(const QString &color);
+
+signals:
+    void nameChanged();
+    void colorChanged();
+
+private:
+    QString m_name;
+    QString m_color;
+};
+
+#endif // DATAOBJECT_H
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp
new file mode 100644
index 0000000..b210570
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/main.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** 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 demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not 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 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "dataobject.h"
+
+/*
+   This example illustrates exposing a QList as a
+   model in QML
+*/
+
+int main(int argc, char ** argv)
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+
+    QList dataList;
+    dataList.append(new DataObject("Item 1", "red"));
+    dataList.append(new DataObject("Item 2", "green"));
+    dataList.append(new DataObject("Item 3", "blue"));
+    dataList.append(new DataObject("Item 4", "yellow"));
+
+    QDeclarativeContext *ctxt = view.rootContext();
+    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+
+    view.setSource(QUrl("qrc:view.qml"));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
new file mode 100644
index 0000000..869cde3
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+TARGET = objectlistmodel
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp \
+           dataobject.cpp
+HEADERS += dataobject.h
+RESOURCES += objectlistmodel.qrc
+
+sources.files = $$SOURCES $$HEADERS $$RESOURCES objectlistmodel.pro view.qml
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/objectlistmodel
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/objectlistmodel
+
+INSTALLS += sources target
+
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
new file mode 100644
index 0000000..17e9301
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
@@ -0,0 +1,5 @@
+
+
+    view.qml
+
+
diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/declarative/modelviews/objectlistmodel/view.qml
new file mode 100644
index 0000000..2b8383f
--- /dev/null
+++ b/examples/declarative/modelviews/objectlistmodel/view.qml
@@ -0,0 +1,16 @@
+import Qt 4.7
+
+ListView {
+    width: 100
+    height: 100
+    anchors.fill: parent
+    model: myModel
+    delegate: Component {
+        Rectangle {
+            height: 25
+            width: 100
+            color: model.modelData.color
+            Text { text: name }
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/package/Delegate.qml b/examples/declarative/modelviews/package/Delegate.qml
new file mode 100644
index 0000000..785fde6
--- /dev/null
+++ b/examples/declarative/modelviews/package/Delegate.qml
@@ -0,0 +1,48 @@
+import Qt 4.7
+
+//![0]
+Package {
+    Text { id: listDelegate; width: 200; height: 25; text: 'Empty'; Package.name: 'list' }
+    Text { id: gridDelegate; width: 100; height: 50; text: 'Empty'; Package.name: 'grid' }
+
+    Rectangle {
+        id: wrapper
+        width: 200; height: 25
+        color: 'lightsteelblue'
+
+        Text { text: display; anchors.centerIn: parent }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                if (wrapper.state == 'inList')
+                    wrapper.state = 'inGrid';
+                else
+                    wrapper.state = 'inList';
+            }
+        }
+
+        state: 'inList'
+        states: [
+            State {
+                name: 'inList'
+                ParentChange { target: wrapper; parent: listDelegate }
+            },
+            State {
+                name: 'inGrid'
+                ParentChange {
+                    target: wrapper; parent: gridDelegate
+                    x: 0; y: 0; width: gridDelegate.width; height: gridDelegate.height
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                ParentAnimation {
+                    NumberAnimation { properties: 'x,y,width,height'; duration: 300 }
+                }
+            }
+        ]
+    }
+}
+//![0]
diff --git a/examples/declarative/modelviews/package/package.qmlproject b/examples/declarative/modelviews/package/package.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/package/package.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/modelviews/package/view.qml b/examples/declarative/modelviews/package/view.qml
new file mode 100644
index 0000000..67f896b
--- /dev/null
+++ b/examples/declarative/modelviews/package/view.qml
@@ -0,0 +1,35 @@
+import Qt 4.7
+
+Item {
+    width: 400
+    height: 200
+
+    ListModel {
+        id: myModel
+        ListElement { display: "One" }
+        ListElement { display: "Two" }
+        ListElement { display: "Three" }
+        ListElement { display: "Four" }
+        ListElement { display: "Five" }
+        ListElement { display: "Six" }
+        ListElement { display: "Seven" }
+        ListElement { display: "Eight" }
+    }
+    //![0]
+    VisualDataModel {
+        id: visualModel
+        delegate: Delegate {}
+        model: myModel
+    }
+
+    ListView {
+        width: 200; height:200
+        model: visualModel.parts.list
+    }
+    GridView {
+        x: 200; width: 200; height:200
+        cellHeight: 50
+        model: visualModel.parts.grid
+    }
+    //![0]
+}
diff --git a/examples/declarative/modelviews/parallax/parallax.qml b/examples/declarative/modelviews/parallax/parallax.qml
new file mode 100644
index 0000000..110f17e
--- /dev/null
+++ b/examples/declarative/modelviews/parallax/parallax.qml
@@ -0,0 +1,41 @@
+import Qt 4.7
+import "../../toys/clocks/content"
+import "qml"
+
+Rectangle {
+    id: root
+
+    width: 320; height: 480
+
+    ParallaxView {
+        id: parallax
+        anchors.fill: parent
+        background: "pics/background.jpg"
+
+        Item {
+            property url icon: "pics/yast-wol.png"
+            width: 320; height: 480
+            Clock { anchors.centerIn: parent }
+        }
+
+        Item {
+            property url icon: "pics/home-page.svg"
+            width: 320; height: 480
+            Smiley { }
+        }
+
+        Item {
+            property url icon: "pics/yast-joystick.png"
+            width: 320; height: 480
+
+            Loader {
+                anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
+                width: 300; height: 400
+                clip: true; 
+                source: "../../../../demos/declarative/samegame/samegame.qml"
+            }
+        }
+
+        currentIndex: root.currentIndex
+    }
+}
diff --git a/examples/declarative/modelviews/parallax/parallax.qmlproject b/examples/declarative/modelviews/parallax/parallax.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/parallax/parallax.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/modelviews/parallax/pics/background.jpg b/examples/declarative/modelviews/parallax/pics/background.jpg
new file mode 100644
index 0000000..61cca2f
Binary files /dev/null and b/examples/declarative/modelviews/parallax/pics/background.jpg differ
diff --git a/examples/declarative/modelviews/parallax/pics/face-smile.png b/examples/declarative/modelviews/parallax/pics/face-smile.png
new file mode 100644
index 0000000..3d66d72
Binary files /dev/null and b/examples/declarative/modelviews/parallax/pics/face-smile.png differ
diff --git a/examples/declarative/modelviews/parallax/pics/home-page.svg b/examples/declarative/modelviews/parallax/pics/home-page.svg
new file mode 100644
index 0000000..4f16958
--- /dev/null
+++ b/examples/declarative/modelviews/parallax/pics/home-page.svg
@@ -0,0 +1,445 @@
+
+image/svg+xmlGo HomeJakub Steinerhttp://jimmac.musichall.czhomereturngodefaultuserdirectoryTuomas Kuosmanen
+				
+				
+				
+				
+				
+			
+						
+						
+						
+						
+						
+						
+						
+						
+					
+	
+
\ No newline at end of file
diff --git a/examples/declarative/modelviews/parallax/pics/shadow.png b/examples/declarative/modelviews/parallax/pics/shadow.png
new file mode 100644
index 0000000..8270565
Binary files /dev/null and b/examples/declarative/modelviews/parallax/pics/shadow.png differ
diff --git a/examples/declarative/modelviews/parallax/pics/yast-joystick.png b/examples/declarative/modelviews/parallax/pics/yast-joystick.png
new file mode 100644
index 0000000..858cea0
Binary files /dev/null and b/examples/declarative/modelviews/parallax/pics/yast-joystick.png differ
diff --git a/examples/declarative/modelviews/parallax/pics/yast-wol.png b/examples/declarative/modelviews/parallax/pics/yast-wol.png
new file mode 100644
index 0000000..7712180
Binary files /dev/null and b/examples/declarative/modelviews/parallax/pics/yast-wol.png differ
diff --git a/examples/declarative/modelviews/parallax/qml/ParallaxView.qml b/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
new file mode 100644
index 0000000..e869a21
--- /dev/null
+++ b/examples/declarative/modelviews/parallax/qml/ParallaxView.qml
@@ -0,0 +1,83 @@
+import Qt 4.7
+
+Item {
+    id: root
+
+    property alias background: background.source
+    default property alias content: visualModel.children
+    property int currentIndex: 0
+
+    Image {
+        id: background
+        fillMode: Image.TileHorizontally
+        x: -list.contentX / 2
+        width: Math.max(list.contentWidth, parent.width)
+    }
+
+    ListView {
+        id: list
+
+        currentIndex: root.currentIndex
+        onCurrentIndexChanged: root.currentIndex = currentIndex
+
+        orientation: Qt.Horizontal
+        boundsBehavior: Flickable.DragOverBounds
+        anchors.fill: parent
+        model: VisualItemModel { id: visualModel }
+
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        snapMode: ListView.SnapOneItem
+    }
+
+    ListView {
+        id: selector
+
+        Rectangle {
+            color: "#60FFFFFF"
+            x: -10; y: -10; radius: 10; z: -1
+            width: parent.width + 20; height: parent.height + 20
+        }
+        currentIndex: root.currentIndex
+        onCurrentIndexChanged: root.currentIndex = currentIndex
+
+        height: 50
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: Math.min(count * 50, parent.width - 20)
+        interactive: width == parent.width - 20
+        orientation: Qt.Horizontal
+
+        delegate: Item {
+            width: 50; height: 50
+            id: delegateRoot
+
+            Image {
+                id: image
+                source: modelData.icon
+                smooth: true
+                scale: 0.8
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: { root.currentIndex = index }
+            }
+
+            states: State {
+                name: "Selected"
+                when: delegateRoot.ListView.isCurrentItem == true
+                PropertyChanges {
+                    target: image
+                    scale: 1
+                    y: -5
+                }
+            }
+            transitions: Transition {
+                NumberAnimation {
+                    properties: "scale,y"
+                }
+             }
+        }
+        model: visualModel.children
+    }
+}
diff --git a/examples/declarative/modelviews/parallax/qml/Smiley.qml b/examples/declarative/modelviews/parallax/qml/Smiley.qml
new file mode 100644
index 0000000..662addc
--- /dev/null
+++ b/examples/declarative/modelviews/parallax/qml/Smiley.qml
@@ -0,0 +1,46 @@
+import Qt 4.7
+
+Item {
+    id: window
+    width: 320; height: 480
+
+    // The shadow for the smiley face
+    Image {
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "../pics/shadow.png"; y: smiley.minHeight + 58
+
+        // The scale property depends on the y position of the smiley face.
+        scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
+    }
+
+    Image {
+        id: smiley
+        property int maxHeight: window.height / 3
+        property int minHeight: 2 * window.height / 3
+
+        anchors.horizontalCenter: parent.horizontalCenter
+        source: "../pics/face-smile.png"; y: minHeight
+
+        // Animate the y property. Setting repeat to true makes the
+        // animation repeat indefinitely, otherwise it would only run once.
+        SequentialAnimation  on y {
+            loops: Animation.Infinite
+
+            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
+            NumberAnimation {
+                from: smiley.minHeight; to: smiley.maxHeight
+                easing.type: Easing.OutExpo; duration: 300
+            }
+
+            // Then move back to minHeight in 1 second, using the OutBounce easing function
+            NumberAnimation {
+                from: smiley.maxHeight; to: smiley.minHeight
+                easing.type: Easing.OutBounce; duration: 1000
+            }
+
+            // Then pause for 500ms
+            PauseAnimation { duration: 500 }
+        }
+    }
+}
+
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp
new file mode 100644
index 0000000..abbffa7
--- /dev/null
+++ b/examples/declarative/modelviews/stringlistmodel/main.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** 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 demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not 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 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
+/*
+   This example illustrates exposing a QStringList as a
+   model in QML
+*/
+
+int main(int argc, char ** argv)
+{
+    QApplication app(argc, argv);
+
+    QDeclarativeView view;
+
+    QStringList dataList;
+    dataList.append("Item 1");
+    dataList.append("Item 2");
+    dataList.append("Item 3");
+    dataList.append("Item 4");
+
+    QDeclarativeContext *ctxt = view.rootContext();
+    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+
+    view.setSource(QUrl("qrc:view.qml"));
+    view.show();
+
+    return app.exec();
+}
+
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
new file mode 100644
index 0000000..23dc481
--- /dev/null
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+TARGET = stringlistmodel
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+# Input
+SOURCES += main.cpp 
+RESOURCES += stringlistmodel.qrc
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
new file mode 100644
index 0000000..17e9301
--- /dev/null
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
@@ -0,0 +1,5 @@
+
+
+    view.qml
+
+
diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/declarative/modelviews/stringlistmodel/view.qml
new file mode 100644
index 0000000..41c03d9
--- /dev/null
+++ b/examples/declarative/modelviews/stringlistmodel/view.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+
+ListView {
+    width: 100
+    height: 100
+    anchors.fill: parent
+    model: myModel
+    delegate: Component {
+        Rectangle {
+            height: 25
+            width: 100
+            Text { text: modelData }
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/webview/alerts.html b/examples/declarative/modelviews/webview/alerts.html
new file mode 100644
index 0000000..82caddf
--- /dev/null
+++ b/examples/declarative/modelviews/webview/alerts.html
@@ -0,0 +1,5 @@
+
+
+
      This is a web page. It fires an alert when clicked.
+
+
diff --git a/examples/declarative/modelviews/webview/alerts.qml b/examples/declarative/modelviews/webview/alerts.qml
new file mode 100644
index 0000000..7684c3e
--- /dev/null
+++ b/examples/declarative/modelviews/webview/alerts.qml
@@ -0,0 +1,58 @@
+import Qt 4.7
+import org.webkit 1.0
+
+WebView {
+    id: webView
+    width: 120
+    height: 150
+    url: "alerts.html"
+
+    onAlert: popup.show(message)
+
+    Rectangle {
+        id: popup
+
+        color: "red"
+        border.color: "black"; border.width: 2
+        radius: 4
+
+        y: parent.height // off "screen"
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: label.width+5
+        height: label.height+5
+
+        opacity: 0
+
+        function show(t) {
+            label.text = t
+            popup.state = "visible"
+            timer.start()
+        }
+        states: State {
+            name: "visible"
+            PropertyChanges { target: popup; opacity: 1 }
+            PropertyChanges { target: popup; y: (webView.height-popup.height)/2 }
+        }
+
+        transitions: [
+            Transition { from: ""; PropertyAnimation { properties: "opacity,y"; duration: 65 } },
+            Transition { from: "visible"; PropertyAnimation { properties: "opacity,y"; duration: 500 } }
+        ]
+
+        Timer {
+            id: timer
+            interval: 1000
+            onTriggered: popup.state = ""
+        }
+
+        Text {
+            id: label
+            anchors.centerIn: parent
+            color: "white"
+            font.pixelSize: 20
+            width: webView.width*0.75
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/webview/autosize.qml b/examples/declarative/modelviews/webview/autosize.qml
new file mode 100644
index 0000000..9632883
--- /dev/null
+++ b/examples/declarative/modelviews/webview/autosize.qml
@@ -0,0 +1,62 @@
+import Qt 4.7
+import org.webkit 1.0
+
+// The WebView size is determined by the width, height,
+// preferredWidth, and preferredHeight properties.
+Rectangle {
+    id: rect
+    width: 200
+    height: layout.height
+
+    Column {
+        id: layout
+        spacing: 2
+        WebView {
+            html: "No width defined."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            width: rect.width
+            html: "The width is full."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            width: rect.width/2
+            html: "The width is half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            preferredWidth: rect.width/2
+            html: "The preferredWidth is half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            preferredWidth: rect.width/2
+            html: "The_preferredWidth_is_half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+        WebView {
+            width: rect.width/2
+            html: "The_width_is_half."
+            Rectangle {
+                color: "#10000000"
+                anchors.fill: parent
+            }
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/webview/content/FieldText.qml b/examples/declarative/modelviews/webview/content/FieldText.qml
new file mode 100644
index 0000000..d1d003f
--- /dev/null
+++ b/examples/declarative/modelviews/webview/content/FieldText.qml
@@ -0,0 +1,157 @@
+import Qt 4.7
+
+Item {
+    id: fieldText
+    height: 30
+    property string text: ""
+    property string label: ""
+    property bool mouseGrabbed: false
+    signal confirmed
+    signal cancelled
+    signal startEdit
+
+    function edit() {
+        if (!mouseGrabbed) {
+            fieldText.startEdit();
+            fieldText.state='editing';
+            mouseGrabbed=true;
+        }
+    }
+
+    function confirm() {
+        fieldText.state='';
+        fieldText.text = textEdit.text;
+        mouseGrabbed=false;
+        fieldText.confirmed();
+    }
+
+    function reset() {
+        textEdit.text = fieldText.text;
+        fieldText.state='';
+        mouseGrabbed=false;
+        fieldText.cancelled();
+    }
+
+    Image {
+        id: cancelIcon
+        width: 22
+        height: 22
+        anchors.right: parent.right
+        anchors.rightMargin: 4
+        anchors.verticalCenter: parent.verticalCenter
+        source: "pics/cancel.png"
+        opacity: 0
+    }
+
+    Image {
+        id: confirmIcon
+        width: 22
+        height: 22
+        anchors.left: parent.left
+        anchors.leftMargin: 4
+        anchors.verticalCenter: parent.verticalCenter
+        source: "pics/ok.png"
+        opacity: 0
+    }
+
+    TextInput {
+        id: textEdit
+        text: fieldText.text
+        focus: false
+        anchors.left: parent.left
+        anchors.leftMargin: 0
+        anchors.right: parent.right
+        anchors.rightMargin: 0
+        anchors.verticalCenter: parent.verticalCenter
+        color: "black"
+        font.bold: true
+        readOnly: true
+        onAccepted: confirm()
+        Keys.onEscapePressed: reset()
+    }
+
+    Text {
+        id: textLabel
+        x: 5
+        width: parent.width-10
+        anchors.verticalCenter: parent.verticalCenter
+        horizontalAlignment: Text.AlignHCenter
+        color: fieldText.state == "editing" ? "#505050" : "#AAAAAA"
+        font.italic: true
+        font.bold: true
+        text: label
+        opacity: textEdit.text == '' ? 1 : 0
+        Behavior on opacity {
+            NumberAnimation {
+                property: "opacity"
+                duration: 250
+            }
+        }
+    }
+
+    MouseArea {
+        anchors.fill: cancelIcon
+        onClicked: { reset() }
+    }
+
+    MouseArea {
+        anchors.fill: confirmIcon
+        onClicked: { confirm() }
+    }
+
+    MouseArea {
+        id: editRegion
+        anchors.fill: textEdit
+        onClicked: { edit() }
+    }
+
+    states: [
+    State {
+        name: "editing"
+        PropertyChanges {
+            target: confirmIcon
+            opacity: 1
+        }
+        PropertyChanges {
+            target: cancelIcon
+            opacity: 1
+        }
+        PropertyChanges {
+            target: textEdit
+            color: "black"
+            readOnly: false
+            focus: true
+            selectionStart: 0
+            selectionEnd: -1
+        }
+        PropertyChanges {
+            target: editRegion
+            opacity: 0
+        }
+        PropertyChanges {
+            target: textEdit.anchors
+            leftMargin: 34
+        }
+        PropertyChanges {
+            target: textEdit.anchors
+            rightMargin: 34
+        }
+    }
+    ]
+
+    transitions: [
+    Transition {
+        from: ""
+        to: "*"
+        reversible: true
+        NumberAnimation {
+            properties: "opacity,leftMargin,rightMargin"
+            duration: 200
+        }
+        ColorAnimation {
+            property: "color"
+            duration: 150
+        }
+    }
+    ]
+}
diff --git a/examples/declarative/modelviews/webview/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
new file mode 100644
index 0000000..5d3ba81
--- /dev/null
+++ b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
@@ -0,0 +1,26 @@
+import Qt 4.7
+import org.webkit 1.0
+
+Item {
+    id: page
+    property real latitude: -34.397
+    property real longitude: 150.644
+    property string address: ""
+    property alias status: js.status
+    WebView {
+        id: map
+        anchors.fill: parent
+        url: "map.html"
+        javaScriptWindowObjects: QtObject {
+            id: js
+            WebView.windowObjectName: "qml"
+            property real lat: page.latitude
+            property real lng: page.longitude
+            property string address: page.address
+            property string status: "Loading"
+            onAddressChanged: { if (map.url != "" && map.progress==1) map.evaluateJavaScript("goToAddress()") }
+        }
+        pressGrabTime: 0
+        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
+    }
+}
diff --git a/examples/declarative/modelviews/webview/content/Mapping/map.html b/examples/declarative/modelviews/webview/content/Mapping/map.html
new file mode 100755
index 0000000..a8726fd
--- /dev/null
+++ b/examples/declarative/modelviews/webview/content/Mapping/map.html
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+  
      
+
+
diff --git a/examples/declarative/modelviews/webview/content/SpinSquare.qml b/examples/declarative/modelviews/webview/content/SpinSquare.qml
new file mode 100644
index 0000000..dba48d4
--- /dev/null
+++ b/examples/declarative/modelviews/webview/content/SpinSquare.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+
+Item {
+    property variant period : 250
+    property variant color : "black"
+    id: root
+
+    Item {
+        x: root.width/2
+        y: root.height/2
+        Rectangle {
+            color: root.color
+            x: -width/2
+            y: -height/2
+            width: root.width
+            height: width
+        }
+        NumberAnimation on rotation {
+            from: 0
+            to: 360
+            loops: Animation.Infinite
+            duration: root.period
+        }
+    }
+}
diff --git a/examples/declarative/modelviews/webview/content/pics/cancel.png b/examples/declarative/modelviews/webview/content/pics/cancel.png
new file mode 100644
index 0000000..ecc9533
Binary files /dev/null and b/examples/declarative/modelviews/webview/content/pics/cancel.png differ
diff --git a/examples/declarative/modelviews/webview/content/pics/ok.png b/examples/declarative/modelviews/webview/content/pics/ok.png
new file mode 100644
index 0000000..5795f04
Binary files /dev/null and b/examples/declarative/modelviews/webview/content/pics/ok.png differ
diff --git a/examples/declarative/modelviews/webview/googleMaps.qml b/examples/declarative/modelviews/webview/googleMaps.qml
new file mode 100644
index 0000000..5506012
--- /dev/null
+++ b/examples/declarative/modelviews/webview/googleMaps.qml
@@ -0,0 +1,43 @@
+// This example demonstrates how Web services such as Google Maps can be
+// abstracted as QML types. Here we have a "Mapping" module with a "Map"
+// type. The Map type has an address property. Setting that property moves
+// the map. The underlying implementation uses WebView and the Google Maps
+// API, but users from QML don't need to understand the implementation in
+// order to create a Map.
+
+import Qt 4.7
+import org.webkit 1.0
+import "content/Mapping"
+
+Map {
+    id: map
+    width: 300
+    height: 300
+    address: "Paris"
+
+    Rectangle {
+        x: 70
+        width: input.width + 20
+        height: input.height + 4
+        anchors.bottom: parent.bottom; anchors.bottomMargin: 5
+        radius: 5
+        opacity: map.status == "Ready" ? 1 : 0
+
+        TextInput {
+            id: input
+            text: map.address
+            anchors.centerIn: parent
+            Keys.onReturnPressed: map.address = input.text
+        }
+    }
+
+    Text {
+        id: loading
+        anchors.centerIn: parent
+        text: map.status == "Error" ? "Error" : "Loading"
+        opacity: map.status == "Ready" ? 0 : 1
+        font.pixelSize: 30
+
+        Behavior on opacity { NumberAnimation{} }
+    }
+}
diff --git a/examples/declarative/modelviews/webview/inline-html.qml b/examples/declarative/modelviews/webview/inline-html.qml
new file mode 100644
index 0000000..eec7fc6
--- /dev/null
+++ b/examples/declarative/modelviews/webview/inline-html.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+import org.webkit 1.0
+
+// Inline HTML with loose formatting can be
+// set on the html property.
+WebView {
+    html:"\
+        \
+        \
+            
      OneTwoThree\
+            
      1X1X\
+            
      20X0\
+            
      3X1X\
+        
      "
+}
diff --git a/examples/declarative/modelviews/webview/newwindows.html b/examples/declarative/modelviews/webview/newwindows.html
new file mode 100644
index 0000000..f169599
--- /dev/null
+++ b/examples/declarative/modelviews/webview/newwindows.html
@@ -0,0 +1,3 @@
+
      Multiple windows...
      
+
+Popup!
diff --git a/examples/declarative/modelviews/webview/newwindows.qml b/examples/declarative/modelviews/webview/newwindows.qml
new file mode 100644
index 0000000..2e4a72e
--- /dev/null
+++ b/examples/declarative/modelviews/webview/newwindows.qml
@@ -0,0 +1,31 @@
+// Demonstrates opening new WebViews from HTML
+//
+// Note that to open windows from JavaScript, you will need to
+// allow it on WebView with settings.javascriptCanOpenWindows: true
+
+import Qt 4.7
+import org.webkit 1.0
+
+Grid {
+    columns: 3
+    id: pages
+    height: 300; width: 600
+
+    Component {
+        id: webViewPage
+        Rectangle {
+            width: webView.width
+            height: webView.height
+            border.color: "gray"
+
+            WebView {
+                id: webView
+                newWindowComponent: webViewPage
+                newWindowParent: pages
+                url: "newwindows.html"
+            }
+        }
+    }
+
+    Loader { sourceComponent: webViewPage }
+}
diff --git a/examples/declarative/modelviews/webview/transparent.qml b/examples/declarative/modelviews/webview/transparent.qml
new file mode 100644
index 0000000..e4efc31
--- /dev/null
+++ b/examples/declarative/modelviews/webview/transparent.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+import org.webkit 1.0
+
+// The WebView background is transparent
+// if the HTML does not specify a background
+Rectangle {
+    color: "green"
+    width: web.width
+    height: web.height
+
+    WebView {
+        id: web
+        html: "Hello World!"
+    }
+}
diff --git a/examples/declarative/modelviews/webview/webview.qmlproject b/examples/declarative/modelviews/webview/webview.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/modelviews/webview/webview.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/mousearea/mouse.qml b/examples/declarative/mousearea/mouse.qml
deleted file mode 100644
index 06134b7..0000000
--- a/examples/declarative/mousearea/mouse.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 200; height: 200
-
-    Rectangle {
-        width: 50; height: 50
-        color: "red"
-
-        Text { text: "Click"; anchors.centerIn: parent }
-
-        MouseArea {
-            anchors.fill: parent
-            hoverEnabled: true
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-            onPressed: console.log('press (x: ' + mouse.x + ' y: ' + mouse.y + ' button: ' + (mouse.button == Qt.RightButton ? 'right' : 'left') + ' Shift: ' + (mouse.modifiers & Qt.ShiftModifier ? 'true' : 'false') + ')') 
-            onReleased: console.log('release (x: ' + mouse.x + ' y: ' + mouse.y + ' isClick: ' + mouse.isClick + ' wasHeld: ' + mouse.wasHeld + ')') 
-            onClicked: console.log('click (x: ' + mouse.x + ' y: ' + mouse.y + ' wasHeld: ' + mouse.wasHeld + ')')
-            onDoubleClicked: console.log('double click (x: ' + mouse.x + ' y: ' + mouse.y + ')')
-            onPressAndHold: console.log('press and hold')
-            onEntered: console.log('entered ' + pressed)
-            onExited: console.log('exited ' + pressed)
-        }
-    }
-
-    Rectangle {
-        y: 100; width: 50; height: 50
-        color: "blue"
-
-        Text { text: "Drag"; anchors.centerIn: parent }
-
-        MouseArea {
-            anchors.fill: parent
-            drag.target: parent
-            drag.axis: Drag.XAxis
-            drag.minimumX: 0
-            drag.maximumX: 150
-
-            onPressed: console.log('press')
-            onReleased: console.log('release (isClick: ' + mouse.isClick + ') (wasHeld: ' + mouse.wasHeld + ')')
-            onClicked: console.log('click' + '(wasHeld: ' + mouse.wasHeld + ')')
-            onDoubleClicked: console.log('double click')
-            onPressAndHold: console.log('press and hold')
-        }
-    }
-}
diff --git a/examples/declarative/mousearea/mousearea.qmlproject b/examples/declarative/mousearea/mousearea.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/mousearea/mousearea.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/objectlistmodel/dataobject.cpp b/examples/declarative/objectlistmodel/dataobject.cpp
deleted file mode 100644
index 14be1b9..0000000
--- a/examples/declarative/objectlistmodel/dataobject.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-#include "dataobject.h"
-
-DataObject::DataObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-DataObject::DataObject(const QString &name, const QString &color, QObject *parent)
-    : QObject(parent), m_name(name), m_color(color)
-{
-}
-
-QString DataObject::name() const
-{
-    return m_name;
-}
-
-void DataObject::setName(const QString &name)
-{
-    if (name != m_name) {
-        m_name = name;
-        emit nameChanged();
-    }
-}
-
-QString DataObject::color() const
-{
-    return m_color;
-}
-
-void DataObject::setColor(const QString &color)
-{
-    if (color != m_color) {
-        m_color = color;
-        emit colorChanged();
-    }
-}
diff --git a/examples/declarative/objectlistmodel/dataobject.h b/examples/declarative/objectlistmodel/dataobject.h
deleted file mode 100644
index 852110d..0000000
--- a/examples/declarative/objectlistmodel/dataobject.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 DATAOBJECT_H
-#define DATAOBJECT_H
-
-#include 
-
-class DataObject : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged)
-
-public:
-    DataObject(QObject *parent=0);
-    DataObject(const QString &name, const QString &color, QObject *parent=0);
-
-    QString name() const;
-    void setName(const QString &name);
-
-    QString color() const;
-    void setColor(const QString &color);
-
-signals:
-    void nameChanged();
-    void colorChanged();
-
-private:
-    QString m_name;
-    QString m_color;
-};
-
-#endif // DATAOBJECT_H
diff --git a/examples/declarative/objectlistmodel/main.cpp b/examples/declarative/objectlistmodel/main.cpp
deleted file mode 100644
index b210570..0000000
--- a/examples/declarative/objectlistmodel/main.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "dataobject.h"
-
-/*
-   This example illustrates exposing a QList as a
-   model in QML
-*/
-
-int main(int argc, char ** argv)
-{
-    QApplication app(argc, argv);
-
-    QDeclarativeView view;
-
-    QList dataList;
-    dataList.append(new DataObject("Item 1", "red"));
-    dataList.append(new DataObject("Item 2", "green"));
-    dataList.append(new DataObject("Item 3", "blue"));
-    dataList.append(new DataObject("Item 4", "yellow"));
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
-
-    view.setSource(QUrl("qrc:view.qml"));
-    view.show();
-
-    return app.exec();
-}
-
diff --git a/examples/declarative/objectlistmodel/objectlistmodel.pro b/examples/declarative/objectlistmodel/objectlistmodel.pro
deleted file mode 100644
index 869cde3..0000000
--- a/examples/declarative/objectlistmodel/objectlistmodel.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = app
-TARGET = objectlistmodel
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp \
-           dataobject.cpp
-HEADERS += dataobject.h
-RESOURCES += objectlistmodel.qrc
-
-sources.files = $$SOURCES $$HEADERS $$RESOURCES objectlistmodel.pro view.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/objectlistmodel
-target.path = $$[QT_INSTALL_EXAMPLES]/declarative/objectlistmodel
-
-INSTALLS += sources target
-
diff --git a/examples/declarative/objectlistmodel/objectlistmodel.qmlproject b/examples/declarative/objectlistmodel/objectlistmodel.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/objectlistmodel/objectlistmodel.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/objectlistmodel/objectlistmodel.qrc b/examples/declarative/objectlistmodel/objectlistmodel.qrc
deleted file mode 100644
index 17e9301..0000000
--- a/examples/declarative/objectlistmodel/objectlistmodel.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    view.qml
-
-
diff --git a/examples/declarative/objectlistmodel/view.qml b/examples/declarative/objectlistmodel/view.qml
deleted file mode 100644
index 2b8383f..0000000
--- a/examples/declarative/objectlistmodel/view.qml
+++ /dev/null
@@ -1,16 +0,0 @@
-import Qt 4.7
-
-ListView {
-    width: 100
-    height: 100
-    anchors.fill: parent
-    model: myModel
-    delegate: Component {
-        Rectangle {
-            height: 25
-            width: 100
-            color: model.modelData.color
-            Text { text: name }
-        }
-    }
-}
diff --git a/examples/declarative/package/Delegate.qml b/examples/declarative/package/Delegate.qml
deleted file mode 100644
index 785fde6..0000000
--- a/examples/declarative/package/Delegate.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import Qt 4.7
-
-//![0]
-Package {
-    Text { id: listDelegate; width: 200; height: 25; text: 'Empty'; Package.name: 'list' }
-    Text { id: gridDelegate; width: 100; height: 50; text: 'Empty'; Package.name: 'grid' }
-
-    Rectangle {
-        id: wrapper
-        width: 200; height: 25
-        color: 'lightsteelblue'
-
-        Text { text: display; anchors.centerIn: parent }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                if (wrapper.state == 'inList')
-                    wrapper.state = 'inGrid';
-                else
-                    wrapper.state = 'inList';
-            }
-        }
-
-        state: 'inList'
-        states: [
-            State {
-                name: 'inList'
-                ParentChange { target: wrapper; parent: listDelegate }
-            },
-            State {
-                name: 'inGrid'
-                ParentChange {
-                    target: wrapper; parent: gridDelegate
-                    x: 0; y: 0; width: gridDelegate.width; height: gridDelegate.height
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                ParentAnimation {
-                    NumberAnimation { properties: 'x,y,width,height'; duration: 300 }
-                }
-            }
-        ]
-    }
-}
-//![0]
diff --git a/examples/declarative/package/package.qmlproject b/examples/declarative/package/package.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/package/package.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/package/view.qml b/examples/declarative/package/view.qml
deleted file mode 100644
index 67f896b..0000000
--- a/examples/declarative/package/view.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.7
-
-Item {
-    width: 400
-    height: 200
-
-    ListModel {
-        id: myModel
-        ListElement { display: "One" }
-        ListElement { display: "Two" }
-        ListElement { display: "Three" }
-        ListElement { display: "Four" }
-        ListElement { display: "Five" }
-        ListElement { display: "Six" }
-        ListElement { display: "Seven" }
-        ListElement { display: "Eight" }
-    }
-    //![0]
-    VisualDataModel {
-        id: visualModel
-        delegate: Delegate {}
-        model: myModel
-    }
-
-    ListView {
-        width: 200; height:200
-        model: visualModel.parts.list
-    }
-    GridView {
-        x: 200; width: 200; height:200
-        cellHeight: 50
-        model: visualModel.parts.grid
-    }
-    //![0]
-}
diff --git a/examples/declarative/parallax/parallax.qml b/examples/declarative/parallax/parallax.qml
deleted file mode 100644
index ca00176..0000000
--- a/examples/declarative/parallax/parallax.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import Qt 4.7
-import "../clocks/content"
-import "qml"
-
-Rectangle {
-    id: root
-
-    width: 320; height: 480
-
-    ParallaxView {
-        id: parallax
-        anchors.fill: parent
-        background: "pics/background.jpg"
-
-        Item {
-            property url icon: "pics/yast-wol.png"
-            width: 320; height: 480
-            Clock { anchors.centerIn: parent }
-        }
-
-        Item {
-            property url icon: "pics/home-page.svg"
-            width: 320; height: 480
-            Smiley { }
-        }
-
-        Item {
-            property url icon: "pics/yast-joystick.png"
-            width: 320; height: 480
-
-            Loader {
-                anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
-                width: 300; height: 400
-                clip: true; 
-                source: "../../../demos/declarative/samegame/samegame.qml"
-            }
-        }
-
-        currentIndex: root.currentIndex
-    }
-}
diff --git a/examples/declarative/parallax/parallax.qmlproject b/examples/declarative/parallax/parallax.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/parallax/parallax.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/parallax/pics/background.jpg b/examples/declarative/parallax/pics/background.jpg
deleted file mode 100644
index 61cca2f..0000000
Binary files a/examples/declarative/parallax/pics/background.jpg and /dev/null differ
diff --git a/examples/declarative/parallax/pics/face-smile.png b/examples/declarative/parallax/pics/face-smile.png
deleted file mode 100644
index 3d66d72..0000000
Binary files a/examples/declarative/parallax/pics/face-smile.png and /dev/null differ
diff --git a/examples/declarative/parallax/pics/home-page.svg b/examples/declarative/parallax/pics/home-page.svg
deleted file mode 100644
index 4f16958..0000000
--- a/examples/declarative/parallax/pics/home-page.svg
+++ /dev/null
@@ -1,445 +0,0 @@
-
-image/svg+xmlGo HomeJakub Steinerhttp://jimmac.musichall.czhomereturngodefaultuserdirectoryTuomas Kuosmanen
-				
-				
-				
-				
-				
-			
-						
-						
-						
-						
-						
-						
-						
-						
-					
-	
-
\ No newline at end of file
diff --git a/examples/declarative/parallax/pics/shadow.png b/examples/declarative/parallax/pics/shadow.png
deleted file mode 100644
index 8270565..0000000
Binary files a/examples/declarative/parallax/pics/shadow.png and /dev/null differ
diff --git a/examples/declarative/parallax/pics/yast-joystick.png b/examples/declarative/parallax/pics/yast-joystick.png
deleted file mode 100644
index 858cea0..0000000
Binary files a/examples/declarative/parallax/pics/yast-joystick.png and /dev/null differ
diff --git a/examples/declarative/parallax/pics/yast-wol.png b/examples/declarative/parallax/pics/yast-wol.png
deleted file mode 100644
index 7712180..0000000
Binary files a/examples/declarative/parallax/pics/yast-wol.png and /dev/null differ
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
deleted file mode 100644
index e869a21..0000000
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: root
-
-    property alias background: background.source
-    default property alias content: visualModel.children
-    property int currentIndex: 0
-
-    Image {
-        id: background
-        fillMode: Image.TileHorizontally
-        x: -list.contentX / 2
-        width: Math.max(list.contentWidth, parent.width)
-    }
-
-    ListView {
-        id: list
-
-        currentIndex: root.currentIndex
-        onCurrentIndexChanged: root.currentIndex = currentIndex
-
-        orientation: Qt.Horizontal
-        boundsBehavior: Flickable.DragOverBounds
-        anchors.fill: parent
-        model: VisualItemModel { id: visualModel }
-
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        snapMode: ListView.SnapOneItem
-    }
-
-    ListView {
-        id: selector
-
-        Rectangle {
-            color: "#60FFFFFF"
-            x: -10; y: -10; radius: 10; z: -1
-            width: parent.width + 20; height: parent.height + 20
-        }
-        currentIndex: root.currentIndex
-        onCurrentIndexChanged: root.currentIndex = currentIndex
-
-        height: 50
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: Math.min(count * 50, parent.width - 20)
-        interactive: width == parent.width - 20
-        orientation: Qt.Horizontal
-
-        delegate: Item {
-            width: 50; height: 50
-            id: delegateRoot
-
-            Image {
-                id: image
-                source: modelData.icon
-                smooth: true
-                scale: 0.8
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: { root.currentIndex = index }
-            }
-
-            states: State {
-                name: "Selected"
-                when: delegateRoot.ListView.isCurrentItem == true
-                PropertyChanges {
-                    target: image
-                    scale: 1
-                    y: -5
-                }
-            }
-            transitions: Transition {
-                NumberAnimation {
-                    properties: "scale,y"
-                }
-             }
-        }
-        model: visualModel.children
-    }
-}
diff --git a/examples/declarative/parallax/qml/Smiley.qml b/examples/declarative/parallax/qml/Smiley.qml
deleted file mode 100644
index 662addc..0000000
--- a/examples/declarative/parallax/qml/Smiley.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: window
-    width: 320; height: 480
-
-    // The shadow for the smiley face
-    Image {
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "../pics/shadow.png"; y: smiley.minHeight + 58
-
-        // The scale property depends on the y position of the smiley face.
-        scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
-    }
-
-    Image {
-        id: smiley
-        property int maxHeight: window.height / 3
-        property int minHeight: 2 * window.height / 3
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "../pics/face-smile.png"; y: minHeight
-
-        // Animate the y property. Setting repeat to true makes the
-        // animation repeat indefinitely, otherwise it would only run once.
-        SequentialAnimation  on y {
-            loops: Animation.Infinite
-
-            // Move from minHeight to maxHeight in 300ms, using the OutExpo easing function
-            NumberAnimation {
-                from: smiley.minHeight; to: smiley.maxHeight
-                easing.type: Easing.OutExpo; duration: 300
-            }
-
-            // Then move back to minHeight in 1 second, using the OutBounce easing function
-            NumberAnimation {
-                from: smiley.maxHeight; to: smiley.minHeight
-                easing.type: Easing.OutBounce; duration: 1000
-            }
-
-            // Then pause for 500ms
-            PauseAnimation { duration: 500 }
-        }
-    }
-}
-
diff --git a/examples/declarative/plugins/README b/examples/declarative/plugins/README
deleted file mode 100644
index fe519f8..0000000
--- a/examples/declarative/plugins/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This example shows a module "com.nokia.TimeExample" that is implemented
-by a C++ plugin (providing the "Time" type), and by QML files (providing the
-"Clock" type).
-
-To run:
-
-  make install
-  qml -I . plugins.qml
-
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
deleted file mode 100644
index 0048372..0000000
--- a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: clock
-    width: 200; height: 200; color: "gray"
-
-    property alias city: cityLabel.text
-    property variant hours
-    property variant minutes
-    property variant shift : 0
-
-    Image { id: background; source: "clock.png" }
-
-    Image {
-        x: 92.5; y: 27
-        source: "hour.png"
-        smooth: true
-        transform: Rotation {
-            id: hourRotation
-            origin.x: 7.5; origin.y: 73; angle: 0
-            SpringFollow on angle {
-                spring: 2; damping: 0.2; modulus: 360
-                to: (clock.hours * 30) + (clock.minutes * 0.5)
-            }
-        }
-    }
-
-    Image {
-        x: 93.5; y: 17
-        source: "minute.png"
-        smooth: true
-        transform: Rotation {
-            id: minuteRotation
-            origin.x: 6.5; origin.y: 83; angle: 0
-            SpringFollow on angle {
-                spring: 2; damping: 0.2; modulus: 360
-                to: clock.minutes * 6
-            }
-        }
-    }
-
-    Image {
-        anchors.centerIn: background; source: "center.png"
-    }
-
-    Text {
-        id: cityLabel; font.bold: true; font.pixelSize: 14; y:200; color: "white"
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/center.png b/examples/declarative/plugins/com/nokia/TimeExample/center.png
deleted file mode 100644
index 7fbd802..0000000
Binary files a/examples/declarative/plugins/com/nokia/TimeExample/center.png and /dev/null differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/clock.png b/examples/declarative/plugins/com/nokia/TimeExample/clock.png
deleted file mode 100644
index 462edac..0000000
Binary files a/examples/declarative/plugins/com/nokia/TimeExample/clock.png and /dev/null differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/hour.png b/examples/declarative/plugins/com/nokia/TimeExample/hour.png
deleted file mode 100644
index f8061a1..0000000
Binary files a/examples/declarative/plugins/com/nokia/TimeExample/hour.png and /dev/null differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/minute.png b/examples/declarative/plugins/com/nokia/TimeExample/minute.png
deleted file mode 100644
index 1297ec7..0000000
Binary files a/examples/declarative/plugins/com/nokia/TimeExample/minute.png and /dev/null differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/qmldir b/examples/declarative/plugins/com/nokia/TimeExample/qmldir
deleted file mode 100644
index e9ef115..0000000
--- a/examples/declarative/plugins/com/nokia/TimeExample/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-Clock 1.0 Clock.qml
-plugin qtimeexampleqmlplugin
diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/plugins/plugin.cpp
deleted file mode 100644
index fb51b0c..0000000
--- a/examples/declarative/plugins/plugin.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-// Implements a "TimeModel" class with hour and minute properties
-// that change on-the-minute yet efficiently sleep the rest
-// of the time.
-
-class MinuteTimer : public QObject
-{
-    Q_OBJECT
-public:
-    MinuteTimer(QObject *parent) : QObject(parent)
-    {
-    }
-
-    void start()
-    {
-        if (!timer.isActive()) {
-            time = QTime::currentTime();
-            timer.start(60000-time.second()*1000, this);
-        }
-    }
-
-    void stop()
-    {
-        timer.stop();
-    }
-
-    int hour() const { return time.hour(); }
-    int minute() const { return time.minute(); }
-
-signals:
-    void timeChanged();
-
-protected:
-    void timerEvent(QTimerEvent *)
-    {
-        QTime now = QTime::currentTime();
-        if (now.second() == 59 && now.minute() == time.minute() && now.hour() == time.hour()) {
-            // just missed time tick over, force it, wait extra 0.5 seconds
-            time.addSecs(60);
-            timer.start(60500, this);
-        } else {
-            time = now;
-            timer.start(60000-time.second()*1000, this);
-        }
-        emit timeChanged();
-    }
-
-private:
-    QTime time;
-    QBasicTimer timer;
-};
-
-class TimeModel : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int hour READ hour NOTIFY timeChanged)
-    Q_PROPERTY(int minute READ minute NOTIFY timeChanged)
-
-public:
-    TimeModel(QObject *parent=0) : QObject(parent)
-    {
-        if (++instances == 1) {
-            if (!timer)
-                timer = new MinuteTimer(qApp);
-            connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
-            timer->start();
-        }
-    }
-
-    ~TimeModel()
-    {
-        if (--instances == 0) {
-            timer->stop();
-        }
-    }
-
-    int minute() const { return timer->minute(); }
-    int hour() const { return timer->hour(); }
-
-signals:
-    void timeChanged();
-
-private:
-    QTime t;
-    static MinuteTimer *timer;
-    static int instances;
-};
-
-int TimeModel::instances=0;
-MinuteTimer *TimeModel::timer=0;
-
-class QExampleQmlPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    void registerTypes(const char *uri)
-    {
-        Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample"));
-        qmlRegisterType(uri, 1, 0, "Time");
-    }
-};
-
-#include "plugin.moc"
-
-Q_EXPORT_PLUGIN2(qtimeexampleqmlplugin, QExampleQmlPlugin);
diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro
deleted file mode 100644
index b501ae3..0000000
--- a/examples/declarative/plugins/plugins.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE = lib
-DESTDIR = com/nokia/TimeExample
-TARGET  = qtimeexampleqmlplugin
-CONFIG += qt plugin
-QT += declarative
-
-SOURCES += plugin.cpp
-
-qdeclarativesources.files += \
-    com/nokia/TimeExample/qmldir \
-    com/nokia/TimeExample/center.png \
-    com/nokia/TimeExample/clock.png \
-    com/nokia/TimeExample/Clock.qml \
-    com/nokia/TimeExample/hour.png \
-    com/nokia/TimeExample/minute.png
-
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
-
-sources.files += plugins.pro plugin.cpp plugins.qml README
-sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
-
-target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
-
-symbian:{
-    TARGET.EPOCALLOWDLLDATA=1
-}
-
-
-INSTALLS += qdeclarativesources sources target
-
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/declarative/plugins/plugins.qml b/examples/declarative/plugins/plugins.qml
deleted file mode 100644
index 449cd9a..0000000
--- a/examples/declarative/plugins/plugins.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import com.nokia.TimeExample 1.0 // import types from the plugin
-
-Clock { // this class is defined in QML (com/nokia/TimeExample/Clock.qml)
-
-    Time { // this class is defined in C++ (plugin.cpp)
-        id: time
-    }
-
-    hours: time.hour
-    minutes: time.minute
-}
diff --git a/examples/declarative/plugins/plugins.qmlproject b/examples/declarative/plugins/plugins.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/plugins/plugins.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/positioners/Button.qml b/examples/declarative/positioners/Button.qml
new file mode 100644
index 0000000..d03eeb5
--- /dev/null
+++ b/examples/declarative/positioners/Button.qml
@@ -0,0 +1,38 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+
+    property string text
+    property string icon
+    signal clicked
+
+    border.color: "black"; color: "steelblue"; radius: 5
+    width: pix.width + textelement.width + 13
+    height: pix.height + 10
+
+    Image { id: pix; x: 5; y:5; source: parent.icon }
+
+    Text {
+        id: textelement
+        text: page.text; color: "white"
+        x: pix.width + pix.x + 3
+        anchors.verticalCenter: pix.verticalCenter
+    }
+
+    MouseArea {
+        id: mr
+        anchors.fill: parent
+        onClicked: { parent.focus = true; page.clicked() }
+    }
+
+    states: State {
+        name: "pressed"; when: mr.pressed
+        PropertyChanges { target: textelement; x: 5 }
+        PropertyChanges { target: pix; x: textelement.x + textelement.width + 3 }
+    }
+
+    transitions: Transition {
+        NumberAnimation { properties: "x,left"; easing.type: Easing.InOutQuad; duration: 200 }
+    }
+}
diff --git a/examples/declarative/positioners/add.png b/examples/declarative/positioners/add.png
new file mode 100644
index 0000000..f29d84b
Binary files /dev/null and b/examples/declarative/positioners/add.png differ
diff --git a/examples/declarative/positioners/del.png b/examples/declarative/positioners/del.png
new file mode 100644
index 0000000..1d753a3
Binary files /dev/null and b/examples/declarative/positioners/del.png differ
diff --git a/examples/declarative/positioners/positioners.qml b/examples/declarative/positioners/positioners.qml
new file mode 100644
index 0000000..2cb0b8b
--- /dev/null
+++ b/examples/declarative/positioners/positioners.qml
@@ -0,0 +1,213 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    width: 420; height: 420
+
+    Column {
+        id: layout1
+        y: 0
+        move: Transition {
+            NumberAnimation { properties: "y"; easing.type: Easing.OutBounce }
+        }
+        add: Transition {
+            NumberAnimation { properties: "y"; easing.type: Easing.OutQuad }
+        }
+
+        Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueV1
+            width: 100; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 100; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueV2
+            width: 100; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 }
+    }
+
+    Row {
+        id: layout2
+        y: 300 
+        move: Transition {
+            NumberAnimation { properties: "x"; easing.type: Easing.OutBounce }
+        }
+        add: Transition {
+            NumberAnimation { properties: "x"; easing.type: Easing.OutQuad }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueH1
+            width: 50; height: 100
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 50; height: 100; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueH2
+            width: 50; height: 100
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 100; border.color: "black"; radius: 15 }
+    }
+
+    Button {
+        x: 135; y: 90
+        text: "Remove"
+        icon: "del.png"
+
+        onClicked: {
+            blueH2.opacity = 0
+            blueH1.opacity = 0
+            blueV1.opacity = 0
+            blueV2.opacity = 0
+            blueG1.opacity = 0
+            blueG2.opacity = 0
+            blueG3.opacity = 0
+            blueF1.opacity = 0
+            blueF2.opacity = 0
+            blueF3.opacity = 0
+        }
+    }
+
+    Button {
+        x: 145; y: 140
+        text: "Add"
+        icon: "add.png"
+
+        onClicked: {
+            blueH2.opacity = 1
+            blueH1.opacity = 1
+            blueV1.opacity = 1
+            blueV2.opacity = 1
+            blueG1.opacity = 1
+            blueG2.opacity = 1
+            blueG3.opacity = 1
+            blueF1.opacity = 1
+            blueF2.opacity = 1
+            blueF3.opacity = 1
+        }
+    }
+
+    Grid {
+        x: 260; y: 0
+        columns: 3
+
+        move: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
+        }
+
+        add: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG1
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG2
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueG3
+            width: 50; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+        Rectangle { color: "green"; width: 50; height: 50; border.color: "black"; radius: 15 }
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+    }
+
+    Flow {
+        id: layout4
+        x: 260; y: 250; width: 150
+
+        move: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
+        }
+
+        add: Transition {
+            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce }
+        }
+
+        Rectangle { color: "red"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueF1
+            width: 60; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "green"; width: 30; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle {
+            id: blueF2
+            width: 60; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 }
+
+        Rectangle { 
+            id: blueF3
+            width: 40; height: 50
+            color: "lightsteelblue"
+            border.color: "black"
+            radius: 15 
+            Behavior on opacity { NumberAnimation {} }
+        }
+
+        Rectangle { color: "red"; width: 80; height: 50; border.color: "black"; radius: 15 }
+    }
+
+}
diff --git a/examples/declarative/positioners/positioners.qmlproject b/examples/declarative/positioners/positioners.qmlproject
new file mode 100644
index 0000000..e526217
--- /dev/null
+++ b/examples/declarative/positioners/positioners.qmlproject
@@ -0,0 +1,18 @@
+/* File generated by QtCreator */
+
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/positioners/positioners.qmlproject.user b/examples/declarative/positioners/positioners.qmlproject.user
new file mode 100644
index 0000000..593479d
--- /dev/null
+++ b/examples/declarative/positioners/positioners.qmlproject.user
@@ -0,0 +1,41 @@
+
+
+ 
+  ProjectExplorer.Project.ActiveTarget
+  0
+ 
+ 
+  ProjectExplorer.Project.EditorSettings
+  
+   UTF-8
+  
+ 
+ 
+  ProjectExplorer.Project.Target.0
+  
+   QML Runtime
+   QmlProjectManager.QmlTarget
+   -1
+   0
+   0
+   
+    QML Runtime
+    QmlProjectManager.QmlRunConfiguration
+    127.0.0.1
+    3768
+    positioners.qml
+    
+    
+   
+   1
+  
+ 
+ 
+  ProjectExplorer.Project.TargetCount
+  1
+ 
+ 
+  ProjectExplorer.Project.Updater.FileVersion
+  4
+ 
+
diff --git a/examples/declarative/progressbar/content/ProgressBar.qml b/examples/declarative/progressbar/content/ProgressBar.qml
deleted file mode 100644
index bc36df5..0000000
--- a/examples/declarative/progressbar/content/ProgressBar.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: progressbar
-
-    property int minimum: 0
-    property int maximum: 100
-    property int value: 0
-    property alias color: gradient1.color
-    property alias secondColor: gradient2.color
-
-    width: 250; height: 23
-    clip: true
-
-    BorderImage {
-        source: "background.png"
-        width: parent.width; height: parent.height
-        border { left: 4; top: 4; right: 4; bottom: 4 }
-    }
-
-    Rectangle {
-        id: highlight
-
-        property int widthDest: ((progressbar.width * (value - minimum)) / (maximum - minimum) - 6)
-
-        width: highlight.widthDest
-        Behavior on width { SmoothedAnimation { velocity: 1200 } }
-
-        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 3; topMargin: 3; bottomMargin: 3 }
-        radius: 1
-        gradient: Gradient {
-            GradientStop { id: gradient1; position: 0.0 }
-            GradientStop { id: gradient2; position: 1.0 }
-        }
-
-    }
-    Text {
-        anchors { right: highlight.right; rightMargin: 6; verticalCenter: parent.verticalCenter }
-        color: "white"
-        font.bold: true
-        text: Math.floor((value - minimum) / (maximum - minimum) * 100) + '%'
-    }
-}
diff --git a/examples/declarative/progressbar/content/background.png b/examples/declarative/progressbar/content/background.png
deleted file mode 100644
index 9044226..0000000
Binary files a/examples/declarative/progressbar/content/background.png and /dev/null differ
diff --git a/examples/declarative/progressbar/progressbar.qmlproject b/examples/declarative/progressbar/progressbar.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/progressbar/progressbar.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/progressbar/progressbars.qml b/examples/declarative/progressbar/progressbars.qml
deleted file mode 100644
index 55fd682..0000000
--- a/examples/declarative/progressbar/progressbars.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    id: main
-
-    width: 600; height: 405
-    color: "#edecec"
-
-    Flickable {
-        anchors.fill: parent
-        contentHeight: column.height + 20
-
-        Column {
-            id: column
-            x: 10; y: 10
-            spacing: 10
-
-            Repeater {
-                model: 25
-
-                ProgressBar {
-                    property int r: Math.floor(Math.random() * 5000 + 1000)
-                    width: main.width - 20
-
-                    NumberAnimation on value { duration: r; from: 0; to: 100; loops: Animation.Infinite }
-                    ColorAnimation on color { duration: r; from: "lightsteelblue"; to: "thistle"; loops: Animation.Infinite }
-                    ColorAnimation on secondColor { duration: r; from: "steelblue"; to: "#CD96CD"; loops: Animation.Infinite }
-                }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/proxyviewer/main.cpp b/examples/declarative/proxyviewer/main.cpp
deleted file mode 100644
index b82d2c9..0000000
--- a/examples/declarative/proxyviewer/main.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-
-/*
-   This example illustrates using a QNetworkAccessManagerFactory to
-   create a QNetworkAccessManager with a proxy.
-
-   Usage:
-     proxyviewer [-host  -port ] [file]
-*/
-
-static QString proxyHost;
-static int proxyPort = 0;
-
-class MyNetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
-{
-public:
-    virtual QNetworkAccessManager *create(QObject *parent);
-};
-
-QNetworkAccessManager *MyNetworkAccessManagerFactory::create(QObject *parent)
-{
-    QNetworkAccessManager *nam = new QNetworkAccessManager(parent);
-    if (!proxyHost.isEmpty()) {
-        qDebug() << "Created QNetworkAccessManager using proxy" << (proxyHost + ":" + QString::number(proxyPort));
-        QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy, proxyHost, proxyPort);
-        nam->setProxy(proxy);
-    }
-
-    return nam;
-}
-
-int main(int argc, char ** argv)
-{
-    QUrl source("qrc:view.qml");
-
-    QApplication app(argc, argv);
-
-    for (int i = 1; i < argc; ++i) {
-        QString arg(argv[i]);
-        if (arg == "-host" && i < argc-1) {
-            proxyHost = argv[++i];
-        } else if (arg == "-port" && i < argc-1) {
-            arg = argv[++i];
-            proxyPort = arg.toInt();
-        } else if (arg[0] != '-') {
-            source = QUrl::fromLocalFile(arg);
-        } else {
-            qWarning() << "Usage: proxyviewer [-host  -port ] [file]";
-            exit(1);
-        }
-    }
-
-    QDeclarativeView view;
-    view.engine()->setNetworkAccessManagerFactory(new MyNetworkAccessManagerFactory);
-
-    view.setSource(source);
-    view.show();
-
-    return app.exec();
-}
-
diff --git a/examples/declarative/proxyviewer/proxyviewer.pro b/examples/declarative/proxyviewer/proxyviewer.pro
deleted file mode 100644
index b6bfa7f..0000000
--- a/examples/declarative/proxyviewer/proxyviewer.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET = proxyviewer
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative network
-
-# Input
-SOURCES += main.cpp 
-RESOURCES += proxyviewer.qrc
diff --git a/examples/declarative/proxyviewer/proxyviewer.qrc b/examples/declarative/proxyviewer/proxyviewer.qrc
deleted file mode 100644
index 17e9301..0000000
--- a/examples/declarative/proxyviewer/proxyviewer.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    view.qml
-
-
diff --git a/examples/declarative/proxyviewer/view.qml b/examples/declarative/proxyviewer/view.qml
deleted file mode 100644
index 7f1bdef..0000000
--- a/examples/declarative/proxyviewer/view.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.7
-
-Image {
-    width: 100
-    height: 100
-    source: "http://qt.nokia.com/logo.png"
-}
diff --git a/examples/declarative/proxywidgets/ProxyWidgets/qmldir b/examples/declarative/proxywidgets/ProxyWidgets/qmldir
deleted file mode 100644
index e55267c..0000000
--- a/examples/declarative/proxywidgets/ProxyWidgets/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin proxywidgetsplugin
diff --git a/examples/declarative/proxywidgets/README b/examples/declarative/proxywidgets/README
deleted file mode 100644
index f50fa22..0000000
--- a/examples/declarative/proxywidgets/README
+++ /dev/null
@@ -1,4 +0,0 @@
-To run:
-
-  make install
-  qml proxywidgets.qml
diff --git a/examples/declarative/proxywidgets/proxywidgets.cpp b/examples/declarative/proxywidgets/proxywidgets.cpp
deleted file mode 100644
index 067eb2c..0000000
--- a/examples/declarative/proxywidgets/proxywidgets.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the 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.
-**
-** 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 
-#include 
-#include 
-#include 
-#include 
-
-class MyPushButton : public QGraphicsProxyWidget
-{
-    Q_OBJECT
-    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
-
-public:
-    MyPushButton(QGraphicsItem* parent = 0)
-        : QGraphicsProxyWidget(parent)
-    {
-        widget = new QPushButton("MyPushButton");
-        widget->setAttribute(Qt::WA_NoSystemBackground);
-        setWidget(widget);
-
-        QObject::connect(widget, SIGNAL(clicked(bool)), this, SIGNAL(clicked(bool)));
-    }
-
-    QString text() const
-    {
-        return widget->text();
-    }
-
-    void setText(const QString& text)
-    {
-        if (text != widget->text()) {
-            widget->setText(text);
-            emit textChanged();
-        }
-    }
-
-Q_SIGNALS:
-    void clicked(bool);
-    void textChanged();
-
-private:
-    QPushButton *widget;
-};
-
-class ProxyWidgetsPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-public:
-    void registerTypes(const char *uri)
-    {
-        qmlRegisterType(uri, 1, 0, "MyPushButton");
-    }
-};
-
-#include "proxywidgets.moc"
-
-Q_EXPORT_PLUGIN2(proxywidgetsplugin, ProxyWidgetsPlugin);
diff --git a/examples/declarative/proxywidgets/proxywidgets.pro b/examples/declarative/proxywidgets/proxywidgets.pro
deleted file mode 100644
index cb07d80..0000000
--- a/examples/declarative/proxywidgets/proxywidgets.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = lib
-DESTDIR = ProxyWidgets
-TARGET  = proxywidgetsplugin
-CONFIG += qt plugin
-QT += declarative
-
-SOURCES += proxywidgets.cpp
-
-sources.files += proxywidgets.pro proxywidgets.cpp proxywidgets.qml
-
-sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
-
-target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
-
-INSTALLS += sources target
-
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-
-symbian:{
-    TARGET.EPOCALLOWDLLDATA = 1
-}
\ No newline at end of file
diff --git a/examples/declarative/proxywidgets/proxywidgets.qml b/examples/declarative/proxywidgets/proxywidgets.qml
deleted file mode 100644
index 88de37f..0000000
--- a/examples/declarative/proxywidgets/proxywidgets.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import Qt 4.7
-import "ProxyWidgets" 1.0
-
-Rectangle {
-    id: window
-
-    property int margin: 30
-
-    width: 640; height: 480
-    color: palette.window
-
-    SystemPalette { id: palette }
-
-    MyPushButton {
-        id: button1
-        x: margin; y: margin
-        text: "Right"
-        transformOriginPoint: Qt.point(width / 2, height / 2)
-
-        onClicked: window.state = "right"
-    }
-
-    MyPushButton {
-        id: button2
-        x: margin; y: margin + 30
-        text: "Bottom"
-        transformOriginPoint: Qt.point(width / 2, height / 2)
-
-        onClicked: window.state = "bottom"
-    }
-
-    MyPushButton {
-        id: button3
-        x: margin; y: margin + 60
-        text: "Quit"
-        transformOriginPoint: Qt.point(width / 2, height / 2)
-
-        onClicked: Qt.quit()
-    }
-
-    states: [
-        State {
-            name: "right"
-            PropertyChanges { target: button1; x: window.width - width - margin; text: "Left"; onClicked: window.state = "" }
-            PropertyChanges { target: button2; x: window.width - width - margin }
-            PropertyChanges { target: button3; x: window.width - width - margin }
-            PropertyChanges { target: window; color: Qt.darker(palette.window) }
-        },
-        State {
-            name: "bottom"
-            PropertyChanges { target: button1; y: window.height - height - margin; rotation: 180 }
-            PropertyChanges {
-                target: button2
-                x: button1.x + button1.width + 10; y: window.height - height - margin
-                rotation: 180
-                text: "Top"
-                onClicked: window.state = ""
-            }
-            PropertyChanges { target: button3; x: button2.x + button2.width + 10; y: window.height - height - margin;  rotation: 180 }
-            PropertyChanges { target: window; color: Qt.lighter(palette.window) }
-        }
-    ]
-
-    transitions: Transition {
-        ParallelAnimation {
-            NumberAnimation { properties: "x,y,rotation"; duration: 600; easing.type: Easing.OutQuad }
-            ColorAnimation { target: window; duration: 600 }
-        }
-    }
-}
diff --git a/examples/declarative/proxywidgets/proxywidgets.qmlproject b/examples/declarative/proxywidgets/proxywidgets.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/proxywidgets/proxywidgets.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml
deleted file mode 100644
index c628a20..0000000
--- a/examples/declarative/scrollbar/ScrollBar.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: scrollBar
-
-    // The properties that define the scrollbar's state.
-    // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
-    // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
-    // of the height of the view.
-    // orientation can be either Qt.Vertical or Qt.Horizontal
-    property real position
-    property real pageSize
-    property variant orientation : Qt.Vertical
-
-    // A light, semi-transparent background
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
-        color: "white"
-        opacity: 0.3
-    }
-    // Size the bar to the required size, depending upon the orientation.
-    Rectangle {
-        x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
-        y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
-        width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
-        height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
-        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
-        color: "black"
-        opacity: 0.7
-    }
-}
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
deleted file mode 100644
index 6b12d85..0000000
--- a/examples/declarative/scrollbar/display.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 640
-    height: 480
-
-    // Create a flickable to view a large image.
-    Flickable {
-        id: view
-        anchors.fill: parent
-        contentWidth: picture.width
-        contentHeight: picture.height
-
-        Image {
-            id: picture
-            source: "pics/niagara_falls.jpg"
-            asynchronous: true
-        }
-
-        // Only show the scrollbars when the view is moving.
-        states: State {
-            name: "ShowBars"
-            when: view.movingVertically || view.movingHorizontally
-            PropertyChanges { target: verticalScrollBar; opacity: 1 }
-            PropertyChanges { target: horizontalScrollBar; opacity: 1 }
-        }
-
-        transitions: Transition {
-            from: "*"; to: "*"
-            NumberAnimation { properties: "opacity"; duration: 400 }
-        }
-    }
-
-    // Attach scrollbars to the right and bottom edges of the view.
-    ScrollBar {
-        id: verticalScrollBar
-        width: 12; height: view.height-12
-        anchors.right: view.right
-        opacity: 0
-        orientation: Qt.Vertical
-        position: view.visibleArea.yPosition
-        pageSize: view.visibleArea.heightRatio
-    }
-
-    ScrollBar {
-        id: horizontalScrollBar
-        width: view.width-12; height: 12
-        anchors.bottom: view.bottom
-        opacity: 0
-        orientation: Qt.Horizontal
-        position: view.visibleArea.xPosition
-        pageSize: view.visibleArea.widthRatio
-    }
-}
diff --git a/examples/declarative/scrollbar/pics/niagara_falls.jpg b/examples/declarative/scrollbar/pics/niagara_falls.jpg
deleted file mode 100644
index 618d808..0000000
Binary files a/examples/declarative/scrollbar/pics/niagara_falls.jpg and /dev/null differ
diff --git a/examples/declarative/scrollbar/scrollbar.qmlproject b/examples/declarative/scrollbar/scrollbar.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/scrollbar/scrollbar.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/searchbox/SearchBox.qml b/examples/declarative/searchbox/SearchBox.qml
deleted file mode 100644
index aae7ee9..0000000
--- a/examples/declarative/searchbox/SearchBox.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-import Qt 4.7
-
-FocusScope {
-    id: focusScope
-    width: 250; height: 28
-
-    BorderImage {
-        source: "images/lineedit-bg.png"
-        width: parent.width; height: parent.height
-        border { left: 4; top: 4; right: 4; bottom: 4 }
-    }
-
-    BorderImage {
-        source: "images/lineedit-bg-focus.png"
-        width: parent.width; height: parent.height
-        border { left: 4; top: 4; right: 4; bottom: 4 }
-        visible: parent.wantsFocus ? true : false
-    }
-
-    Text {
-        id: typeSomething
-        anchors.fill: parent; anchors.leftMargin: 8
-        verticalAlignment: Text.AlignVCenter
-        text: "Type something..."
-        color: "gray"
-        font.italic: true
-    }
-
-    MouseArea { anchors.fill: parent; onClicked: focusScope.focus = true }
-
-    TextInput {
-        id: textInput
-        anchors { left: parent.left; leftMargin: 8; verticalCenter: parent.verticalCenter }
-        focus: true
-    }
-
-    Image {
-        id: clear
-        anchors { right: parent.right; rightMargin: 8; verticalCenter: parent.verticalCenter }
-        source: "images/edit-clear-locationbar-rtl.png"
-        opacity: 0
-
-        MouseArea { 
-            anchors.fill: parent
-            onClicked: { textInput.text = ''; focusScope.focus = true }
-        }
-    }
-
-    states: State {
-        name: "hasText"; when: textInput.text != ''
-        PropertyChanges { target: typeSomething; opacity: 0 }
-        PropertyChanges { target: clear; opacity: 1 }
-    }
-
-    transitions: [
-        Transition {
-            from: ""; to: "hasText"
-            NumberAnimation { exclude: typeSomething; properties: "opacity" }
-        },
-        Transition {
-            from: "hasText"; to: ""
-            NumberAnimation { properties: "opacity" }
-        }
-    ]
-}
diff --git a/examples/declarative/searchbox/images/edit-clear-locationbar-rtl.png b/examples/declarative/searchbox/images/edit-clear-locationbar-rtl.png
deleted file mode 100644
index 91eb270..0000000
Binary files a/examples/declarative/searchbox/images/edit-clear-locationbar-rtl.png and /dev/null differ
diff --git a/examples/declarative/searchbox/images/lineedit-bg-focus.png b/examples/declarative/searchbox/images/lineedit-bg-focus.png
deleted file mode 100644
index bbfac38..0000000
Binary files a/examples/declarative/searchbox/images/lineedit-bg-focus.png and /dev/null differ
diff --git a/examples/declarative/searchbox/images/lineedit-bg.png b/examples/declarative/searchbox/images/lineedit-bg.png
deleted file mode 100644
index 9044226..0000000
Binary files a/examples/declarative/searchbox/images/lineedit-bg.png and /dev/null differ
diff --git a/examples/declarative/searchbox/main.qml b/examples/declarative/searchbox/main.qml
deleted file mode 100644
index 9f73473..0000000
--- a/examples/declarative/searchbox/main.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 500; height: 250
-    color: "#edecec"
-
-    Column {
-        anchors { horizontalCenter: parent.horizontalCenter; verticalCenter: parent.verticalCenter }
-        spacing: 10
-
-        SearchBox { id: search1; KeyNavigation.tab: search2; KeyNavigation.backtab: search3; focus: true }
-        SearchBox { id: search2; KeyNavigation.tab: search3; KeyNavigation.backtab: search1 }
-        SearchBox { id: search3; KeyNavigation.tab: search1; KeyNavigation.backtab: search2 }
-    }
-}
diff --git a/examples/declarative/searchbox/searchbox.qmlproject b/examples/declarative/searchbox/searchbox.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/searchbox/searchbox.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/slideswitch/content/Switch.qml b/examples/declarative/slideswitch/content/Switch.qml
deleted file mode 100644
index 526a171..0000000
--- a/examples/declarative/slideswitch/content/Switch.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-//![0]
-import Qt 4.7
-
-Item {
-    id: toggleswitch
-    width: background.width; height: background.height
-
-//![1]
-    property bool on: false
-//![1]
-
-//![2]
-    function toggle() {
-        if (toggleswitch.state == "on")
-            toggleswitch.state = "off";
-        else toggleswitch.state = "on";
-    }
-//![2]
-
-//![3]
-    function dorelease() {
-        if (knob.x == 1) {
-            if (toggleswitch.state == "off") return;
-        }
-        if (knob.x == 78) {
-            if (toggleswitch.state == "on") return;
-        }
-        toggle();
-    }
-//![3]
-
-//![4]
-    Image {
-        id: background
-        source: "background.svg"
-        MouseArea { anchors.fill: parent; onClicked: toggle() }
-    }
-//![4]
-
-//![5]
-    Image {
-        id: knob
-        x: 1; y: 2
-        source: "knob.svg"
-
-        MouseArea {
-            anchors.fill: parent
-            drag.target: knob; drag.axis: Drag.XAxis; drag.minimumX: 1; drag.maximumX: 78
-            onClicked: toggle()
-            onReleased: dorelease()
-        }
-    }
-//![5]
-
-//![6]
-    states: [
-        State {
-            name: "on"
-            PropertyChanges { target: knob; x: 78 }
-            PropertyChanges { target: toggleswitch; on: true }
-        },
-        State {
-            name: "off"
-            PropertyChanges { target: knob; x: 1 }
-            PropertyChanges { target: toggleswitch; on: false }
-        }
-    ]
-//![6]
-
-//![7]
-    transitions: Transition {
-        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad; duration: 200 }
-    }
-//![7]
-}
-//![0]
diff --git a/examples/declarative/slideswitch/content/background.svg b/examples/declarative/slideswitch/content/background.svg
deleted file mode 100644
index f920d3e..0000000
--- a/examples/declarative/slideswitch/content/background.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-]>
-
-
-
-
-	
-	
-
-
-
-	
-	
-
-
-
diff --git a/examples/declarative/slideswitch/content/knob.svg b/examples/declarative/slideswitch/content/knob.svg
deleted file mode 100644
index fb69337..0000000
--- a/examples/declarative/slideswitch/content/knob.svg
+++ /dev/null
@@ -1,867 +0,0 @@
-
-
-image/svg+xml
-
-
-
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-
\ No newline at end of file
diff --git a/examples/declarative/slideswitch/slideswitch.qml b/examples/declarative/slideswitch/slideswitch.qml
deleted file mode 100644
index 51c3c77..0000000
--- a/examples/declarative/slideswitch/slideswitch.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    color: "white"
-    width: 400; height: 250
-
-//![0]
-    Switch { anchors.centerIn: parent; on: false }
-//![0]
-}
diff --git a/examples/declarative/slideswitch/slideswitch.qmlproject b/examples/declarative/slideswitch/slideswitch.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/slideswitch/slideswitch.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/spinner/content/Spinner.qml b/examples/declarative/spinner/content/Spinner.qml
deleted file mode 100644
index 8145a28..0000000
--- a/examples/declarative/spinner/content/Spinner.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.7
-
-Image {
-    property alias model: view.model
-    property alias delegate: view.delegate
-    property alias currentIndex: view.currentIndex
-    property real itemHeight: 30
-    source: "spinner-bg.png"
-    clip: true
-    PathView {
-        id: view
-        anchors.fill: parent
-        pathItemCount: height/itemHeight
-        preferredHighlightBegin: 0.5
-        preferredHighlightEnd: 0.5
-        highlight: Image { source: "spinner-select.png"; width: view.width; height: itemHeight+4 }
-        dragMargin: view.width/2
-        path: Path {
-            startX: view.width/2; startY: -itemHeight/2
-            PathLine { x: view.width/2; y: view.pathItemCount*itemHeight + itemHeight }
-        }
-    }
-    Keys.onDownPressed: view.incrementCurrentIndex()
-    Keys.onUpPressed: view.decrementCurrentIndex()
-}
diff --git a/examples/declarative/spinner/content/spinner-bg.png b/examples/declarative/spinner/content/spinner-bg.png
deleted file mode 100644
index b3556f1..0000000
Binary files a/examples/declarative/spinner/content/spinner-bg.png and /dev/null differ
diff --git a/examples/declarative/spinner/content/spinner-select.png b/examples/declarative/spinner/content/spinner-select.png
deleted file mode 100644
index 95a17a1..0000000
Binary files a/examples/declarative/spinner/content/spinner-select.png and /dev/null differ
diff --git a/examples/declarative/spinner/main.qml b/examples/declarative/spinner/main.qml
deleted file mode 100644
index 6be567a..0000000
--- a/examples/declarative/spinner/main.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
-    width: 240; height: 320
-    Column {
-        y: 20; x: 20; spacing: 20
-        Spinner {
-            id: spinner
-            width: 200; height: 240
-            focus: true
-            model: 20
-            itemHeight: 30
-            delegate: Text { font.pixelSize: 25; text: index; height: 30 }
-        }
-        Text { text: "Current item index: " + spinner.currentIndex }
-    }
-}
diff --git a/examples/declarative/spinner/spinner.qmlproject b/examples/declarative/spinner/spinner.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/spinner/spinner.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/sql/hello.qml b/examples/declarative/sql/hello.qml
deleted file mode 100644
index 8b021b7..0000000
--- a/examples/declarative/sql/hello.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-import Qt 4.7
-
-Text {
-    text: "?"
-
-    function findGreetings() {
-        var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
-
-        db.transaction(
-            function(tx) {
-                // Create the database if it doesn't already exist
-                tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
-
-                // Add (another) greeting row
-                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
-
-                // Show all added greetings
-                var rs = tx.executeSql('SELECT * FROM Greeting');
-
-                var r = ""
-                for(var i = 0; i < rs.rows.length; i++) {
-                    r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n"
-                }
-                text = r
-            }
-        )
-    }
-
-    Component.onCompleted: findGreetings()
-}
-
diff --git a/examples/declarative/sql/sql.qmlproject b/examples/declarative/sql/sql.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/sql/sql.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/sqllocalstorage/hello.qml b/examples/declarative/sqllocalstorage/hello.qml
new file mode 100644
index 0000000..8b021b7
--- /dev/null
+++ b/examples/declarative/sqllocalstorage/hello.qml
@@ -0,0 +1,31 @@
+import Qt 4.7
+
+Text {
+    text: "?"
+
+    function findGreetings() {
+        var db = openDatabaseSync("QDeclarativeExampleDB", "1.0", "The Example QML SQL!", 1000000);
+
+        db.transaction(
+            function(tx) {
+                // Create the database if it doesn't already exist
+                tx.executeSql('CREATE TABLE IF NOT EXISTS Greeting(salutation TEXT, salutee TEXT)');
+
+                // Add (another) greeting row
+                tx.executeSql('INSERT INTO Greeting VALUES(?, ?)', [ 'hello', 'world' ]);
+
+                // Show all added greetings
+                var rs = tx.executeSql('SELECT * FROM Greeting');
+
+                var r = ""
+                for(var i = 0; i < rs.rows.length; i++) {
+                    r += rs.rows.item(i).salutation + ", " + rs.rows.item(i).salutee + "\n"
+                }
+                text = r
+            }
+        )
+    }
+
+    Component.onCompleted: findGreetings()
+}
+
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject b/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/states/states.qml b/examples/declarative/states/states.qml
deleted file mode 100644
index 4429e78..0000000
--- a/examples/declarative/states/states.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-    width: 640; height: 480
-    color: "#343434"
-
-    Image { 
-        id: userIcon
-        x: topLeftRect.x; y: topLeftRect.y
-        source: "user.png"
-    }
-
-    Rectangle {
-        id: topLeftRect
-
-        anchors { left: parent.left; top: parent.top; leftMargin: 10; topMargin: 20 }
-        width: 64; height: 64
-        color: "Transparent"; border.color: "Gray"; radius: 6
-
-        // Clicking in here sets the state to the default state, returning the image to
-        // its initial position
-        MouseArea { anchors.fill: parent; onClicked: page.state = '' }
-    }
-
-    Rectangle {
-        id: middleRightRect
-
-        anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 20 }
-        width: 64; height: 64
-        color: "Transparent"; border.color: "Gray"; radius: 6
-
-        // Clicking in here sets the state to 'middleRight'
-        MouseArea { anchors.fill: parent; onClicked: page.state = 'middleRight' }
-    }
-
-    Rectangle {
-        id: bottomLeftRect
-
-        anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 20 }
-        width: 64; height: 64
-        color: "Transparent"; border.color: "Gray"; radius: 6
-
-        // Clicking in here sets the state to 'bottomLeft'
-        MouseArea { anchors.fill: parent; onClicked: page.state = 'bottomLeft' }
-    }
-
-    states: [
-        // In state 'middleRight', move the image to middleRightRect
-        State {
-            name: "middleRight"
-            PropertyChanges { target: userIcon; x: middleRightRect.x; y: middleRightRect.y }
-        },
-
-        // In state 'bottomLeft', move the image to bottomLeftRect
-        State {
-            name: "bottomLeft"
-            PropertyChanges { target: userIcon; x: bottomLeftRect.x; y: bottomLeftRect.y  }
-        }
-    ]
-}
diff --git a/examples/declarative/states/states.qmlproject b/examples/declarative/states/states.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/states/states.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
deleted file mode 100644
index ccc7060..0000000
--- a/examples/declarative/states/transitions.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-import Qt 4.7
-
-/*
-    This is exactly the same as states.qml, except that we have appended
-    a set of transitions to apply animations when the item changes 
-    between each state.
-*/
-
-Rectangle {
-    id: page
-    width: 640; height: 480
-    color: "#343434"
-
-    Image { 
-        id: userIcon
-        x: topLeftRect.x; y: topLeftRect.y
-        source: "user.png"
-    }
-
-    Rectangle {
-        id: topLeftRect
-
-        anchors { left: parent.left; top: parent.top; leftMargin: 10; topMargin: 20 }
-        width: 64; height: 64
-        color: "Transparent"; border.color: "Gray"; radius: 6
-
-        // Clicking in here sets the state to the default state, returning the image to
-        // its initial position
-        MouseArea { anchors.fill: parent; onClicked: page.state = '' }
-    }
-
-    Rectangle {
-        id: middleRightRect
-
-        anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 20 }
-        width: 64; height: 64
-        color: "Transparent"; border.color: "Gray"; radius: 6
-
-        // Clicking in here sets the state to 'middleRight'
-        MouseArea { anchors.fill: parent; onClicked: page.state = 'middleRight' }
-    }
-
-    Rectangle {
-        id: bottomLeftRect
-
-        anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 20 }
-        width: 64; height: 64
-        color: "Transparent"; border.color: "Gray"; radius: 6
-
-        // Clicking in here sets the state to 'bottomLeft'
-        MouseArea { anchors.fill: parent; onClicked: page.state = 'bottomLeft' }
-    }
-
-    states: [
-        // In state 'middleRight', move the image to middleRightRect
-        State {
-            name: "middleRight"
-            PropertyChanges { target: userIcon; x: middleRightRect.x; y: middleRightRect.y }
-        },
-
-        // In state 'bottomLeft', move the image to bottomLeftRect
-        State {
-            name: "bottomLeft"
-            PropertyChanges { target: userIcon; x: bottomLeftRect.x; y: bottomLeftRect.y  }
-        }
-    ]
-
-    // Transitions define how the properties change when the item moves between each state
-    transitions: [
-
-        // When transitioning to 'middleRight' move x,y over a duration of 1 second,
-        // with OutBounce easing function.
-        Transition {
-            from: "*"; to: "middleRight"
-            NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce; duration: 1000 }
-        },
-
-        // When transitioning to 'bottomLeft' move x,y over a duration of 2 seconds,
-        // with InOutQuad easing function.
-        Transition {
-            from: "*"; to: "bottomLeft"
-            NumberAnimation { properties: "x,y"; easing.type: Easing.InOutQuad; duration: 2000 }
-        },
-
-        // For any other state changes move x,y linearly over duration of 200ms.
-        Transition {
-            NumberAnimation { properties: "x,y"; duration: 200 }
-        }
-    ]
-}
diff --git a/examples/declarative/states/user.png b/examples/declarative/states/user.png
deleted file mode 100644
index dd7d7a2..0000000
Binary files a/examples/declarative/states/user.png and /dev/null differ
diff --git a/examples/declarative/stringlistmodel/main.cpp b/examples/declarative/stringlistmodel/main.cpp
deleted file mode 100644
index abbffa7..0000000
--- a/examples/declarative/stringlistmodel/main.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not 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 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-
-/*
-   This example illustrates exposing a QStringList as a
-   model in QML
-*/
-
-int main(int argc, char ** argv)
-{
-    QApplication app(argc, argv);
-
-    QDeclarativeView view;
-
-    QStringList dataList;
-    dataList.append("Item 1");
-    dataList.append("Item 2");
-    dataList.append("Item 3");
-    dataList.append("Item 4");
-
-    QDeclarativeContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
-
-    view.setSource(QUrl("qrc:view.qml"));
-    view.show();
-
-    return app.exec();
-}
-
diff --git a/examples/declarative/stringlistmodel/stringlistmodel.pro b/examples/declarative/stringlistmodel/stringlistmodel.pro
deleted file mode 100644
index 23dc481..0000000
--- a/examples/declarative/stringlistmodel/stringlistmodel.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET = stringlistmodel
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-# Input
-SOURCES += main.cpp 
-RESOURCES += stringlistmodel.qrc
diff --git a/examples/declarative/stringlistmodel/stringlistmodel.qrc b/examples/declarative/stringlistmodel/stringlistmodel.qrc
deleted file mode 100644
index 17e9301..0000000
--- a/examples/declarative/stringlistmodel/stringlistmodel.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-    view.qml
-
-
diff --git a/examples/declarative/stringlistmodel/view.qml b/examples/declarative/stringlistmodel/view.qml
deleted file mode 100644
index 41c03d9..0000000
--- a/examples/declarative/stringlistmodel/view.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.7
-
-ListView {
-    width: 100
-    height: 100
-    anchors.fill: parent
-    model: myModel
-    delegate: Component {
-        Rectangle {
-            height: 25
-            width: 100
-            Text { text: modelData }
-        }
-    }
-}
diff --git a/examples/declarative/tabwidget/TabWidget.qml b/examples/declarative/tabwidget/TabWidget.qml
deleted file mode 100644
index 26d25b4..0000000
--- a/examples/declarative/tabwidget/TabWidget.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: tabWidget
-
-    property int current: 0
-    default property alias content: stack.children
-
-    onCurrentChanged: setOpacities()
-    Component.onCompleted: setOpacities()
-
-    function setOpacities()
-    {
-        for (var i = 0; i < stack.children.length; ++i) {
-            stack.children[i].opacity = i == current ? 1 : 0
-        }
-    }
-
-    Row {
-        id: header
-        Repeater {
-            delegate: Rectangle {
-                width: tabWidget.width / stack.children.length; height: 36
-
-                Rectangle {
-                    width: parent.width; height: 1
-                    anchors { bottom: parent.bottom; bottomMargin: 1 }
-                    color: "#acb2c2"
-                }
-                BorderImage {
-                    anchors { fill: parent; leftMargin: 2; topMargin: 5; rightMargin: 1 }
-                    border { left: 7; right: 7 }
-                    source: "tab.png"
-                    visible: tabWidget.current == index
-                }
-                Text {
-                    horizontalAlignment: Qt.AlignHCenter; verticalAlignment: Qt.AlignVCenter
-                    anchors.fill: parent
-                    text: stack.children[index].title
-                    elide: Text.ElideRight
-                    font.bold: tabWidget.current == index
-                }
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: tabWidget.current = index
-                }
-            }
-            model: stack.children.length
-        }
-    }
-
-    Item {
-        id: stack
-        width: tabWidget.width
-        anchors.top: header.bottom; anchors.bottom: tabWidget.bottom
-    }
-}
diff --git a/examples/declarative/tabwidget/tab.png b/examples/declarative/tabwidget/tab.png
deleted file mode 100644
index ad80216..0000000
Binary files a/examples/declarative/tabwidget/tab.png and /dev/null differ
diff --git a/examples/declarative/tabwidget/tabs.qml b/examples/declarative/tabwidget/tabs.qml
deleted file mode 100644
index fba203c..0000000
--- a/examples/declarative/tabwidget/tabs.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import Qt 4.7
-
-TabWidget {
-    id: tabs
-    width: 640; height: 480
-
-    Rectangle {
-        property string title: "Red"
-        anchors.fill: parent
-        color: "#e3e3e3"
-
-        Rectangle {
-            anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 }
-            color: "#ff7f7f"
-            Text {
-                width: parent.width - 20
-                anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
-                text: "Roses are red"
-                font.pixelSize: 20
-                wrapMode: Text.WordWrap
-            }
-        }
-    }
-
-    Rectangle {
-        property string title: "Green"
-        anchors.fill: parent
-        color: "#e3e3e3"
-
-        Rectangle {
-            anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 }
-            color: "#7fff7f"
-            Text {
-                width: parent.width - 20
-                anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
-                text: "Flower stems are green"
-                font.pixelSize: 20
-                wrapMode: Text.WordWrap
-            }
-        }
-    }
-
-    Rectangle {
-        property string title: "Blue"
-        anchors.fill: parent; color: "#e3e3e3"
-
-        Rectangle {
-            anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 }
-            color: "#7f7fff"
-            Text {
-                width: parent.width - 20
-                anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
-                text: "Violets are blue"
-                font.pixelSize: 20
-                wrapMode: Text.WordWrap
-            }
-        }
-    }
-}
diff --git a/examples/declarative/tabwidget/tabwidget.qmlproject b/examples/declarative/tabwidget/tabwidget.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/tabwidget/tabwidget.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/text/fonts/availableFonts.qml b/examples/declarative/text/fonts/availableFonts.qml
new file mode 100644
index 0000000..defa4ce
--- /dev/null
+++ b/examples/declarative/text/fonts/availableFonts.qml
@@ -0,0 +1,17 @@
+import Qt 4.7
+
+Rectangle {
+    width: 480; height: 640; color: "steelblue"
+
+    ListView {
+        anchors.fill: parent; model: Qt.fontFamilies()
+
+        delegate: Item {
+            height: 40; width: ListView.view.width
+            Text {
+                anchors.centerIn: parent
+                text: modelData; font.family: modelData; font.pixelSize: 24; color: "white"
+            }
+        }
+    }
+}
diff --git a/examples/declarative/text/fonts/banner.qml b/examples/declarative/text/fonts/banner.qml
new file mode 100644
index 0000000..353354a
--- /dev/null
+++ b/examples/declarative/text/fonts/banner.qml
@@ -0,0 +1,21 @@
+import Qt 4.7
+
+Rectangle {
+    id: screen
+
+    property int pixelSize: screen.height * 1.25
+    property color textColor: "lightsteelblue"
+    property string text: "Hello world! "
+
+    width: 640; height: 320
+    color: "steelblue"
+
+    Row {
+        y: -screen.height / 4.5
+
+        NumberAnimation on x { from: 0; to: -text.width; duration: 6000; loops: Animation.Infinite }
+        Text { id: text; font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
+        Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
+        Text { font.pixelSize: screen.pixelSize; color: screen.textColor; text: screen.text }
+    }
+}
diff --git a/examples/declarative/text/fonts/fonts.qml b/examples/declarative/text/fonts/fonts.qml
new file mode 100644
index 0000000..f3eac48
--- /dev/null
+++ b/examples/declarative/text/fonts/fonts.qml
@@ -0,0 +1,64 @@
+import Qt 4.7
+
+Rectangle {
+    property string myText: "The quick brown fox jumps over the lazy dog."
+
+    width: 800; height: 480
+    color: "steelblue"
+
+    FontLoader { id: fixedFont; name: "Courier" }
+    FontLoader { id: localFont; source: "fonts/tarzeau_ocr_a.ttf" }
+    FontLoader { id: webFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" }
+
+    Column {
+        anchors { fill: parent; leftMargin: 10; rightMargin: 10 }
+        spacing: 15
+
+        Text {
+            text: myText
+            color: "lightsteelblue"
+            width: parent.width
+            elide: Text.ElideRight
+            font.family: "Times"; font.pointSize: 42
+        }
+        Text {
+            text: myText
+            color: "lightsteelblue"
+            width: parent.width
+            elide: Text.ElideLeft
+            font { family: "Times"; pointSize: 42; capitalization: Font.AllUppercase }
+        }
+        Text {
+            text: myText
+            color: "lightsteelblue"
+            width: parent.width
+            elide: Text.ElideMiddle
+            font { family: fixedFont.name; pointSize: 42; weight: Font.Bold; capitalization: Font.AllLowercase }
+        }
+        Text {
+            text: myText
+            color: "lightsteelblue"
+            width: parent.width
+            elide: Text.ElideRight
+            font { family: fixedFont.name; pointSize: 42; italic: true; capitalization: Font.SmallCaps }
+        }
+        Text {
+            text: myText
+            color: "lightsteelblue"
+            width: parent.width
+            elide: Text.ElideLeft
+            font { family: localFont.name; pointSize: 42; capitalization: Font.Capitalize }
+        }
+        Text {
+            text: {
+                if (webFont.status == FontLoader.Ready) myText
+                else if (webFont.status == FontLoader.Loading) "Loading..."
+                else if (webFont.status == FontLoader.Error) "Error loading font"
+            }
+            color: "lightsteelblue"
+            width: parent.width
+            elide: Text.ElideMiddle
+            font.family: webFont.name; font.pointSize: 42
+        }
+    }
+}
diff --git a/examples/declarative/text/fonts/fonts.qmlproject b/examples/declarative/text/fonts/fonts.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/text/fonts/fonts.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf b/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf
new file mode 100644
index 0000000..cf93f96
Binary files /dev/null and b/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf differ
diff --git a/examples/declarative/text/fonts/hello.qml b/examples/declarative/text/fonts/hello.qml
new file mode 100644
index 0000000..0d6f4cd
--- /dev/null
+++ b/examples/declarative/text/fonts/hello.qml
@@ -0,0 +1,38 @@
+import Qt 4.7
+
+Rectangle {
+    id: screen
+
+    width: 800; height: 480
+    color: "black"
+
+    Item {
+        id: container
+        x: screen.width / 2; y: screen.height / 2
+
+        Text {
+            id: text
+            anchors.centerIn: parent
+            color: "white"
+            text: "Hello world!"
+            font.pixelSize: 60
+
+            SequentialAnimation on font.letterSpacing {
+                loops: Animation.Infinite;
+                NumberAnimation { from: 100; to: 300; easing.type: Easing.InQuad; duration: 3000 }
+                ScriptAction {
+                    script: {
+                        container.y = (screen.height / 4) + (Math.random() * screen.height / 2)
+                        container.x = (screen.width / 4) + (Math.random() * screen.width / 2)
+                    }
+                }
+            }
+
+            SequentialAnimation on opacity {
+                loops: Animation.Infinite;
+                NumberAnimation { from: 1; to: 0; duration: 2600 }
+                PauseAnimation { duration: 400 }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/text/text.qmlproject b/examples/declarative/text/text.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/text/text.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/threading/threadedlistmodel/dataloader.js b/examples/declarative/threading/threadedlistmodel/dataloader.js
new file mode 100644
index 0000000..d720f09
--- /dev/null
+++ b/examples/declarative/threading/threadedlistmodel/dataloader.js
@@ -0,0 +1,9 @@
+// ![0]
+WorkerScript.onMessage = function(msg) {
+    if (msg.action == 'appendCurrentTime') {
+        var data = {'time': new Date().toTimeString()};
+        msg.model.append(data);
+        msg.model.sync();   // updates the changes to the list
+    }
+}
+// ![0]
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/threading/threadedlistmodel/timedisplay.qml b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
new file mode 100644
index 0000000..bad7010
--- /dev/null
+++ b/examples/declarative/threading/threadedlistmodel/timedisplay.qml
@@ -0,0 +1,32 @@
+// ![0]
+import Qt 4.7
+
+ListView {
+    width: 200
+    height: 300
+
+    model: listModel
+    delegate: Component {
+        Text { text: time }
+    }
+
+    ListModel { id: listModel }
+
+    WorkerScript {
+        id: worker
+        source: "dataloader.js"
+    }
+
+    Timer {
+        id: timer
+        interval: 2000; repeat: true
+        running: true
+        triggeredOnStart: true
+
+        onTriggered: {
+            var msg = {'action': 'appendCurrentTime', 'model': listModel};
+            worker.sendMessage(msg);
+        }
+    }
+}
+// ![0]
diff --git a/examples/declarative/threading/threading.qmlproject b/examples/declarative/threading/threading.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/threading/threading.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/threading/workerscript/workerscript.js b/examples/declarative/threading/workerscript/workerscript.js
new file mode 100644
index 0000000..f76471f
--- /dev/null
+++ b/examples/declarative/threading/workerscript/workerscript.js
@@ -0,0 +1,15 @@
+var lastx = 0;
+var lasty = 0;
+
+WorkerScript.onMessage = function(message) {
+    var ydiff = message.y - lasty;
+    var xdiff = message.x - lastx;
+
+    var total = Math.sqrt(ydiff * ydiff + xdiff * xdiff);
+
+    lastx = message.x;
+    lasty = message.y;
+
+    WorkerScript.sendMessage( {xmove: xdiff, ymove: ydiff, move: total} );
+}
+
diff --git a/examples/declarative/threading/workerscript/workerscript.qml b/examples/declarative/threading/workerscript/workerscript.qml
new file mode 100644
index 0000000..2294a81
--- /dev/null
+++ b/examples/declarative/threading/workerscript/workerscript.qml
@@ -0,0 +1,43 @@
+import Qt 4.7
+
+Rectangle {
+    width: 480; height: 320
+
+    WorkerScript {
+        id: myWorker
+        source: "workerscript.js"
+
+        onMessage: {
+            console.log("Moved " + messageObject.xmove + " along the X axis.");
+            console.log("Moved " + messageObject.ymove + " along the Y axis.");
+            console.log("Moved " + messageObject.move + " pixels.");
+        }
+    }
+
+    Rectangle {
+        width: 200; height: 200
+        anchors.left: parent.left; anchors.leftMargin: 20
+        color: "red"
+
+        MouseArea { 
+            anchors.fill: parent
+            onClicked: myWorker.sendMessage( { rectangle: "red", x: mouse.x, y: mouse.y } );
+        }
+    }
+
+    Rectangle {
+        width: 200; height: 200
+        anchors.right: parent.right; anchors.rightMargin: 20
+        color: "blue"
+
+        MouseArea { 
+            anchors.fill: parent
+            onClicked: myWorker.sendMessage( { rectangle: "blue", x: mouse.x, y: mouse.y } );
+        }
+    }
+
+    Text {
+        text: "Click a Rectangle!"
+        anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: 50 }
+    }
+}
diff --git a/examples/declarative/threading/workerscript/workerscript.qmlproject b/examples/declarative/threading/workerscript/workerscript.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/threading/workerscript/workerscript.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/tic-tac-toe/content/Button.qml b/examples/declarative/tic-tac-toe/content/Button.qml
deleted file mode 100644
index ecf18cd..0000000
--- a/examples/declarative/tic-tac-toe/content/Button.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: container
-
-    property string text: "Button"
-    property bool down: false
-    property string mainCol: "lightgray"
-    property string darkCol: "darkgray"
-    property string lightCol: "white"
-
-    width: buttonLabel.width + 20; height: buttonLabel.height + 6
-    border { width: 1; color: Qt.darker(mainCol) } 
-    radius: 8;
-    color: mainCol
-    smooth: true
-
-    gradient: Gradient {
-        GradientStop {
-            id: topGrad; position: 0.0
-            color: if (container.down) { darkCol } else { lightCol }
-        }
-        GradientStop { position: 1.0; color: mainCol }
-    }
-
-    signal clicked
-
-    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
-
-    Text {
-        id: buttonLabel
-
-        anchors.centerIn: container
-        text: container.text;
-        font.pixelSize: 14
-    }
-}
diff --git a/examples/declarative/tic-tac-toe/content/TicTac.qml b/examples/declarative/tic-tac-toe/content/TicTac.qml
deleted file mode 100644
index d247943..0000000
--- a/examples/declarative/tic-tac-toe/content/TicTac.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.7
-
-Item {
-    signal clicked
-
-    states: [
-        State { name: "X"; PropertyChanges { target: image; source: "pics/x.png" } },
-        State { name: "O"; PropertyChanges { target: image; source: "pics/o.png" } }
-    ]
-
-    Image {
-        id: image
-        anchors.centerIn: parent
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: parent.clicked()
-    }
-}
diff --git a/examples/declarative/tic-tac-toe/content/pics/board.png b/examples/declarative/tic-tac-toe/content/pics/board.png
deleted file mode 100644
index 7e5b7ba..0000000
Binary files a/examples/declarative/tic-tac-toe/content/pics/board.png and /dev/null differ
diff --git a/examples/declarative/tic-tac-toe/content/pics/o.png b/examples/declarative/tic-tac-toe/content/pics/o.png
deleted file mode 100644
index abc7ee0..0000000
Binary files a/examples/declarative/tic-tac-toe/content/pics/o.png and /dev/null differ
diff --git a/examples/declarative/tic-tac-toe/content/pics/x.png b/examples/declarative/tic-tac-toe/content/pics/x.png
deleted file mode 100644
index ddc65c8..0000000
Binary files a/examples/declarative/tic-tac-toe/content/pics/x.png and /dev/null differ
diff --git a/examples/declarative/tic-tac-toe/content/tic-tac-toe.js b/examples/declarative/tic-tac-toe/content/tic-tac-toe.js
deleted file mode 100644
index f8d6d9f..0000000
--- a/examples/declarative/tic-tac-toe/content/tic-tac-toe.js
+++ /dev/null
@@ -1,145 +0,0 @@
-function winner(board)
-{
-    for (var i=0; i<3; ++i) {
-        if (board.children[i].state!=""
-            && board.children[i].state==board.children[i+3].state
-            && board.children[i].state==board.children[i+6].state)
-            return true
-
-        if (board.children[i*3].state!=""
-            && board.children[i*3].state==board.children[i*3+1].state
-            && board.children[i*3].state==board.children[i*3+2].state)
-            return true
-    }
-
-    if (board.children[0].state!=""
-        && board.children[0].state==board.children[4].state!=""
-        && board.children[0].state==board.children[8].state!="")
-        return true
-
-    if (board.children[2].state!=""
-        && board.children[2].state==board.children[4].state!=""
-        && board.children[2].state==board.children[6].state!="")
-        return true
-
-    return false
-}
-
-function restart()
-{
-    // No moves left - start again
-    for (var i=0; i<9; ++i)
-        board.children[i].state = ""
-}
-
-function makeMove(pos,player)
-{
-    board.children[pos].state = player
-    if (winner(board)) {
-        win(player + " wins")
-        return true
-    } else {
-        return false
-    }
-}
-
-function computerTurn()
-{
-    var r = Math.random();
-    if(r < game.difficulty){
-        smartAI();
-    }else{
-        randAI();
-    }
-}
-
-function smartAI()
-{
-    function boardCopy(a){
-        var ret = new Object;
-        ret.children = new Array(9);
-        for(var i = 0; i<9; i++){
-            ret.children[i] = new Object;
-            ret.children[i].state = a.children[i].state;
-        }
-        return ret;
-    }
-    for(var i=0; i<9; i++){
-        var simpleBoard = boardCopy(board);
-        if (board.children[i].state == "") {
-            simpleBoard.children[i].state = "O";
-            if(winner(simpleBoard)){
-                makeMove(i,"O")
-                return
-            }
-        }
-    }
-    for(var i=0; i<9; i++){
-        var simpleBoard = boardCopy(board);
-        if (board.children[i].state == "") {
-            simpleBoard.children[i].state = "X";
-            if(winner(simpleBoard)){
-                makeMove(i,"O")
-                return
-            }
-        }
-    }
-    function thwart(a,b,c){//If they are at a, try b or c
-        if (board.children[a].state == "X") {
-            if (board.children[b].state == "") {
-                makeMove(b,"O")
-                return true
-            }else if (board.children[c].state == "") {
-                makeMove(c,"O")
-                return true
-            }
-        }
-        return false;
-    }
-    if(thwart(4,0,2)) return;
-    if(thwart(0,4,3)) return;
-    if(thwart(2,4,1)) return;
-    if(thwart(6,4,7)) return;
-    if(thwart(8,4,5)) return;
-    if(thwart(1,4,2)) return;
-    if(thwart(3,4,0)) return;
-    if(thwart(5,4,8)) return;
-    if(thwart(7,4,6)) return;
-    for(var i =0; i<9; i++){//Backup
-        if (board.children[i].state == "") {
-            makeMove(i,"O")
-            return
-        }
-    }
-    restart();
-}
-
-function randAI()
-{
-    var open = 0;
-    for (var i=0; i<9; ++i)
-        if (board.children[i].state == "") {
-            open += 1;
-        }
-    if(open == 0){
-        restart();
-        return;
-    }
-    var openA = new Array(open);//JS doesn't have lists I can append to (i think)
-    var acc = 0;
-    for (var i=0; i<9; ++i)
-        if (board.children[i].state == "") {
-            openA[acc] = i;
-            acc += 1;
-        }
-    var choice = openA[Math.floor(Math.random() * open)];
-    makeMove(choice, "O");
-}
-
-function win(s)
-{
-    msg.text = s
-    msg.opacity = 1
-    endtimer.running = true
-}
-
diff --git a/examples/declarative/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/tic-tac-toe/tic-tac-toe.qml
deleted file mode 100644
index dd13052..0000000
--- a/examples/declarative/tic-tac-toe/tic-tac-toe.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-import Qt 4.7
-import "content"
-import "content/tic-tac-toe.js" as Logic
-
-Item {
-    id: game
-
-    property bool show: false
-    property real difficulty: 1.0   //chance it will actually think
-
-    width: 440
-    height: 480
-    anchors.fill: parent
-
-    Image {
-        id: boardimage
-        anchors { verticalCenter: parent.verticalCenter; horizontalCenter: parent.horizontalCenter }
-        source: "content/pics/board.png"
-    }
-
-    Grid {
-        id: board
-        anchors.fill: boardimage
-        columns: 3
-
-        Repeater {
-            model: 9
-            TicTac {
-                width: board.width/3
-                height: board.height/3
-                onClicked: {
-                    if (!endtimer.running) {
-                        if (!Logic.makeMove(index,"X"))
-                            Logic.computerTurn()
-                    }
-                }
-            }
-        }
-
-        Timer {
-            id: endtimer
-            interval: 1600
-            onTriggered: { msg.opacity = 0; Logic.restart() }
-        }
-    }
-
-    Row {
-        spacing: 4
-        anchors { top: board.bottom; horizontalCenter: board.horizontalCenter }
-
-        Button {
-            text: "Hard"
-            onClicked: game.difficulty = 1.0;
-            down: game.difficulty == 1.0
-        }
-        Button {
-            text: "Moderate"
-            onClicked: game.difficulty = 0.8;
-            down: game.difficulty == 0.8
-        }
-        Button {
-            text: "Easy"
-            onClicked: game.difficulty = 0.2;
-            down: game.difficulty == 0.2
-        }
-    }
-
-    Text {
-        id: msg
-
-        anchors.centerIn: parent
-        opacity: 0
-        color: "blue"
-        style: Text.Outline; styleColor: "white"
-        font.pixelSize: 50; font.bold: true
-    }
-}
diff --git a/examples/declarative/tic-tac-toe/tic-tac-toe.qmlproject b/examples/declarative/tic-tac-toe/tic-tac-toe.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/tic-tac-toe/tic-tac-toe.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures.qml b/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
new file mode 100644
index 0000000..cb190ea
--- /dev/null
+++ b/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
@@ -0,0 +1,36 @@
+import Qt 4.7
+import Qt.labs.gestures 1.0
+
+// Only works on platforms with Touch support.
+
+Rectangle {
+    id: rect
+    width: 320
+    height: 180
+
+    Text {
+        anchors.centerIn: parent
+        text: "Tap / TapAndHold / Pan / Pinch / Swipe\nOnly works on platforms with Touch support."
+        horizontalAlignment: Text.Center
+    }
+
+    GestureArea {
+        anchors.fill: parent
+        focus: true
+
+        // Only some of the many gesture properties are shown. See Gesture documentation.
+
+        onTap:
+            console.log("tap pos = (",gesture.position.x,",",gesture.position.y,")")
+        onTapAndHold:
+            console.log("tap and hold pos = (",gesture.position.x,",",gesture.position.y,")")
+        onPan:
+            console.log("pan delta = (",gesture.delta.x,",",gesture.delta.y,") acceleration = ",gesture.acceleration)
+        onPinch:
+            console.log("pinch center = (",gesture.centerPoint.x,",",gesture.centerPoint.y,") rotation =",gesture.rotationAngle," scale =",gesture.scaleFactor)
+        onSwipe:
+            console.log("swipe angle=",gesture.swipeAngle)
+        onGesture:
+            console.log("gesture hot spot = (",gesture.hotSpot.x,",",gesture.hotSpot.y,")")
+    }
+}
diff --git a/examples/declarative/touchinteraction/gestures/gestures.qmlproject b/examples/declarative/touchinteraction/gestures/gestures.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/touchinteraction/gestures/gestures.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/touchinteraction/mousearea/mouse.qml b/examples/declarative/touchinteraction/mousearea/mouse.qml
new file mode 100644
index 0000000..06134b7
--- /dev/null
+++ b/examples/declarative/touchinteraction/mousearea/mouse.qml
@@ -0,0 +1,47 @@
+import Qt 4.7
+
+Rectangle {
+    width: 200; height: 200
+
+    Rectangle {
+        width: 50; height: 50
+        color: "red"
+
+        Text { text: "Click"; anchors.centerIn: parent }
+
+        MouseArea {
+            anchors.fill: parent
+            hoverEnabled: true
+            acceptedButtons: Qt.LeftButton | Qt.RightButton
+
+            onPressed: console.log('press (x: ' + mouse.x + ' y: ' + mouse.y + ' button: ' + (mouse.button == Qt.RightButton ? 'right' : 'left') + ' Shift: ' + (mouse.modifiers & Qt.ShiftModifier ? 'true' : 'false') + ')') 
+            onReleased: console.log('release (x: ' + mouse.x + ' y: ' + mouse.y + ' isClick: ' + mouse.isClick + ' wasHeld: ' + mouse.wasHeld + ')') 
+            onClicked: console.log('click (x: ' + mouse.x + ' y: ' + mouse.y + ' wasHeld: ' + mouse.wasHeld + ')')
+            onDoubleClicked: console.log('double click (x: ' + mouse.x + ' y: ' + mouse.y + ')')
+            onPressAndHold: console.log('press and hold')
+            onEntered: console.log('entered ' + pressed)
+            onExited: console.log('exited ' + pressed)
+        }
+    }
+
+    Rectangle {
+        y: 100; width: 50; height: 50
+        color: "blue"
+
+        Text { text: "Drag"; anchors.centerIn: parent }
+
+        MouseArea {
+            anchors.fill: parent
+            drag.target: parent
+            drag.axis: Drag.XAxis
+            drag.minimumX: 0
+            drag.maximumX: 150
+
+            onPressed: console.log('press')
+            onReleased: console.log('release (isClick: ' + mouse.isClick + ') (wasHeld: ' + mouse.wasHeld + ')')
+            onClicked: console.log('click' + '(wasHeld: ' + mouse.wasHeld + ')')
+            onDoubleClicked: console.log('double click')
+            onPressAndHold: console.log('press and hold')
+        }
+    }
+}
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject b/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/touchinteraction/touchinteraction.qmlproject b/examples/declarative/touchinteraction/touchinteraction.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/touchinteraction/touchinteraction.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/clocks/clocks.qml b/examples/declarative/toys/clocks/clocks.qml
new file mode 100644
index 0000000..22cf820
--- /dev/null
+++ b/examples/declarative/toys/clocks/clocks.qml
@@ -0,0 +1,14 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    width: 640; height: 240
+    color: "#646464"
+
+    Row {
+        anchors.centerIn: parent
+        Clock { city: "New York"; shift: -4 }
+        Clock { city: "Mumbai"; shift: 5.5 }
+        Clock { city: "Tokyo"; shift: 9 }
+    }
+}
diff --git a/examples/declarative/toys/clocks/clocks.qmlproject b/examples/declarative/toys/clocks/clocks.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/clocks/clocks.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/clocks/content/Clock.qml b/examples/declarative/toys/clocks/content/Clock.qml
new file mode 100644
index 0000000..3426e6a
--- /dev/null
+++ b/examples/declarative/toys/clocks/content/Clock.qml
@@ -0,0 +1,83 @@
+import Qt 4.7
+
+Item {
+    id: clock
+    width: 200; height: 230
+
+    property alias city: cityLabel.text
+    property variant hours
+    property variant minutes
+    property variant seconds
+    property variant shift : 0
+    property bool night: false
+
+    function timeChanged() {
+        var date = new Date;
+        hours = shift ? date.getUTCHours() + Math.floor(clock.shift) : date.getHours()
+        night = ( hours < 7 || hours > 19 )
+        minutes = shift ? date.getUTCMinutes() + ((clock.shift % 1) * 60) : date.getMinutes()
+        seconds = date.getUTCSeconds();
+    }
+
+    Timer {
+        interval: 100; running: true; repeat: true; triggeredOnStart: true
+        onTriggered: clock.timeChanged()
+    }
+
+    Image { id: background; source: "clock.png"; visible: clock.night == false }
+    Image { source: "clock-night.png"; visible: clock.night == true }
+
+    Image {
+        x: 92.5; y: 27
+        source: "hour.png"
+        smooth: true
+        transform: Rotation {
+            id: hourRotation
+            origin.x: 7.5; origin.y: 73; angle: 0
+            SpringFollow on angle {
+                spring: 2; damping: 0.2; modulus: 360
+                to: (clock.hours * 30) + (clock.minutes * 0.5)
+            }
+        }
+    }
+
+    Image {
+        x: 93.5; y: 17
+        source: "minute.png"
+        smooth: true
+        transform: Rotation {
+            id: minuteRotation
+            origin.x: 6.5; origin.y: 83; angle: 0
+            SpringFollow on angle {
+                spring: 2; damping: 0.2; modulus: 360
+                to: clock.minutes * 6
+            }
+        }
+    }
+
+    Image {
+        x: 97.5; y: 20
+        source: "second.png"
+        smooth: true
+        transform: Rotation {
+            id: secondRotation
+            origin.x: 2.5; origin.y: 80; angle: 0
+            SpringFollow on angle {
+                spring: 5; damping: 0.25; modulus: 360
+                to: clock.seconds * 6
+            }
+        }
+    }
+
+    Image {
+        anchors.centerIn: background; source: "center.png"
+    }
+
+    Text {
+        id: cityLabel
+        y: 200; anchors.horizontalCenter: parent.horizontalCenter
+        color: "white"
+        font.bold: true; font.pixelSize: 14
+        style: Text.Raised; styleColor: "black"
+    }
+}
diff --git a/examples/declarative/toys/clocks/content/background.png b/examples/declarative/toys/clocks/content/background.png
new file mode 100644
index 0000000..a885950
Binary files /dev/null and b/examples/declarative/toys/clocks/content/background.png differ
diff --git a/examples/declarative/toys/clocks/content/center.png b/examples/declarative/toys/clocks/content/center.png
new file mode 100755
index 0000000..7fbd802
Binary files /dev/null and b/examples/declarative/toys/clocks/content/center.png differ
diff --git a/examples/declarative/toys/clocks/content/clock-night.png b/examples/declarative/toys/clocks/content/clock-night.png
new file mode 100755
index 0000000..cc7151a
Binary files /dev/null and b/examples/declarative/toys/clocks/content/clock-night.png differ
diff --git a/examples/declarative/toys/clocks/content/clock.png b/examples/declarative/toys/clocks/content/clock.png
new file mode 100755
index 0000000..462edac
Binary files /dev/null and b/examples/declarative/toys/clocks/content/clock.png differ
diff --git a/examples/declarative/toys/clocks/content/hour.png b/examples/declarative/toys/clocks/content/hour.png
new file mode 100755
index 0000000..f8061a1
Binary files /dev/null and b/examples/declarative/toys/clocks/content/hour.png differ
diff --git a/examples/declarative/toys/clocks/content/minute.png b/examples/declarative/toys/clocks/content/minute.png
new file mode 100755
index 0000000..1297ec7
Binary files /dev/null and b/examples/declarative/toys/clocks/content/minute.png differ
diff --git a/examples/declarative/toys/clocks/content/second.png b/examples/declarative/toys/clocks/content/second.png
new file mode 100755
index 0000000..4aa9fb5
Binary files /dev/null and b/examples/declarative/toys/clocks/content/second.png differ
diff --git a/examples/declarative/toys/dial/content/Dial.qml b/examples/declarative/toys/dial/content/Dial.qml
new file mode 100644
index 0000000..f9ab3e3
--- /dev/null
+++ b/examples/declarative/toys/dial/content/Dial.qml
@@ -0,0 +1,37 @@
+import Qt 4.7
+
+Item {
+    id: root
+    property real value : 0
+
+    width: 210; height: 210
+
+    Image { source: "background.png" }
+
+    Image {
+        x: 93
+        y: 35
+        source: "needle_shadow.png"
+        transform: Rotation {
+            origin.x: 11; origin.y: 67
+            angle: needleRotation.angle
+        }
+    }
+    Image {
+        id: needle
+        x: 95; y: 33
+        smooth: true
+        source: "needle.png"
+        transform: Rotation {
+            id: needleRotation
+            origin.x: 7; origin.y: 65
+            angle: -130
+            SpringFollow on angle {
+                spring: 1.4
+                damping: .15
+                to: Math.min(Math.max(-130, root.value*2.6 - 130), 133)
+            }
+        }
+    }
+    Image { x: 21; y: 18; source: "overlay.png" }
+}
diff --git a/examples/declarative/toys/dial/content/background.png b/examples/declarative/toys/dial/content/background.png
new file mode 100644
index 0000000..75d555d
Binary files /dev/null and b/examples/declarative/toys/dial/content/background.png differ
diff --git a/examples/declarative/toys/dial/content/needle.png b/examples/declarative/toys/dial/content/needle.png
new file mode 100644
index 0000000..2d19f75
Binary files /dev/null and b/examples/declarative/toys/dial/content/needle.png differ
diff --git a/examples/declarative/toys/dial/content/needle_shadow.png b/examples/declarative/toys/dial/content/needle_shadow.png
new file mode 100644
index 0000000..8d8a928
Binary files /dev/null and b/examples/declarative/toys/dial/content/needle_shadow.png differ
diff --git a/examples/declarative/toys/dial/content/overlay.png b/examples/declarative/toys/dial/content/overlay.png
new file mode 100644
index 0000000..3860a7b
Binary files /dev/null and b/examples/declarative/toys/dial/content/overlay.png differ
diff --git a/examples/declarative/toys/dial/dial-example.qml b/examples/declarative/toys/dial/dial-example.qml
new file mode 100644
index 0000000..2e102b0
--- /dev/null
+++ b/examples/declarative/toys/dial/dial-example.qml
@@ -0,0 +1,44 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    color: "#545454"
+    width: 300; height: 300
+
+    // Dial with a slider to adjust it
+    Dial {
+        id: dial
+        anchors.centerIn: parent
+        value: slider.x * 100 / (container.width - 34)
+    }
+
+    Rectangle {
+        id: container
+        anchors { bottom: parent.bottom; left: parent.left; right: parent.right; leftMargin: 20; rightMargin: 20; bottomMargin: 10 }
+        height: 16
+
+        radius: 8
+        opacity: 0.7
+        smooth: true
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "gray" }
+            GradientStop { position: 1.0; color: "white" }
+        }
+
+        Rectangle {
+            id: slider
+            x: 1; y: 1; width: 30; height: 14
+            radius: 6
+            smooth: true
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: "#424242" }
+                GradientStop { position: 1.0; color: "black" }
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                drag.target: parent; drag.axis: Drag.XAxis; drag.minimumX: 2; drag.maximumX: container.width - 32
+            }
+        }
+    }
+}
diff --git a/examples/declarative/toys/dial/dial.qmlproject b/examples/declarative/toys/dial/dial.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/dial/dial.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/dynamic/dynamic.qml b/examples/declarative/toys/dynamic/dynamic.qml
new file mode 100644
index 0000000..52c7c1e
--- /dev/null
+++ b/examples/declarative/toys/dynamic/dynamic.qml
@@ -0,0 +1,176 @@
+import Qt 4.7
+import Qt.labs.particles 1.0
+import "qml"
+
+Item {
+    id: window
+
+    property int activeSuns: 0
+
+    //This is a desktop-sized example
+    width: 1024; height: 512
+    
+    //This is the message box that pops up when there's an error
+    Rectangle {
+        id: dialog
+
+        opacity: 0
+        anchors.centerIn: parent
+        width: dialogText.width + 6; height: dialogText.height + 6
+        border.color: 'black'
+        color: 'lightsteelblue'
+        z: 65535 //Arbitrary number chosen to be above all the items, including the scaled perspective ones.
+
+        function show(str){
+            dialogText.text = str;
+            dialogAnim.start();
+        }
+
+        Text {
+            id: dialogText
+            x: 3; y: 3
+            font.pixelSize: 14
+        }
+
+        SequentialAnimation {
+            id: dialogAnim
+            NumberAnimation { target: dialog; property:"opacity"; to: 1; duration: 1000 }
+            PauseAnimation { duration: 5000 }
+            NumberAnimation { target: dialog; property:"opacity"; to: 0; duration: 1000 }
+        }
+    }
+
+    // sky
+    Rectangle {
+        id: sky
+        anchors { left: parent.left; top: parent.top; right: toolbox.right; bottom: parent.verticalCenter }
+        gradient: Gradient {
+            GradientStop { id: gradientStopA; position: 0.0; color: "#0E1533" }
+            GradientStop { id: gradientStopB; position: 1.0; color: "#437284" }
+        }
+    }
+
+    // stars (when there's no sun)
+    Particles {
+        id: stars
+        x: 0; y: 0; width: parent.width; height: parent.height / 2
+        source: "images/star.png"
+        angleDeviation: 360
+        velocity: 0; velocityDeviation: 0
+        count: parent.width / 10
+        fadeInDuration: 2800
+        opacity: 1
+    }
+
+    // ground
+    Rectangle {
+        id: ground
+        z: 2    // just above the sun so that the sun can set behind it
+        anchors { left: parent.left; top: parent.verticalCenter; right: toolbox.left; bottom: parent.bottom }
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "ForestGreen" }
+            GradientStop { position: 1.0; color: "DarkGreen" }
+        }
+    }
+
+    SystemPalette { id: activePalette }
+
+    // right-hand panel
+    Rectangle {
+        id: toolbox
+
+        width: 480
+        color: activePalette.window
+        anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
+
+        Column {
+            anchors.centerIn: parent
+            spacing: 8
+
+            Text { text: "Drag an item into the scene." }
+
+            Rectangle {
+                width: childrenRect.width + 10; height: childrenRect.height + 10
+                border.color: "black"
+
+                Row {
+                    anchors.centerIn: parent
+                    spacing: 8
+
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "Sun.qml"
+                        image: "../images/sun.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "GenericSceneItem.qml"
+                        image: "../images/moon.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "PerspectiveItem.qml"
+                        image: "../images/tree_s.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "PerspectiveItem.qml"
+                        image: "../images/rabbit_brown.png"
+                    }
+                    PaletteItem {
+                        anchors.verticalCenter: parent.verticalCenter
+                        componentFile: "PerspectiveItem.qml"
+                        image: "../images/rabbit_bw.png"
+                    }
+                }
+            }
+
+            Text { text: "Active Suns: " + activeSuns }
+
+            Rectangle { width: parent.width; height: 1; color: "black" }
+
+            Text { text: "Arbitrary QML:" }
+
+            Rectangle {
+                width: 460; height: 240
+
+                TextEdit {
+                    id: qmlText
+                    anchors.fill: parent; anchors.margins: 5
+                    readOnly: false
+                    focusOnPress: true
+                    font.pixelSize: 14
+
+                    text: "import Qt 4.7\nImage {\n    id: smile\n    x: 500 * Math.random()\n    y: 200 * Math.random() \n    source: 'images/face-smile.png'\n\n    NumberAnimation on opacity { \n        to: 0; duration: 1500\n    }\n\n    Component.onCompleted: smile.destroy(1500);\n}"
+                }
+            }
+
+            Button {
+                text: "Create"
+                onClicked: {
+                    try { 
+                        Qt.createQmlObject(qmlText.text, window, 'CustomObject');
+                    } catch(err) {
+                        dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message);
+                    }
+                }
+            }
+        }
+    }
+
+    //Day state, for when a sun is added to the scene
+    states: State {
+        name: "Day"
+        when: window.activeSuns > 0
+
+        PropertyChanges { target: gradientStopA; color: "DeepSkyBlue" }
+        PropertyChanges { target: gradientStopB; color: "SkyBlue" }
+        PropertyChanges { target: stars; opacity: 0 }
+    }
+
+    transitions: Transition {
+        PropertyAnimation { duration: 3000 }
+        ColorAnimation { duration: 3000 }
+    }
+
+}
diff --git a/examples/declarative/toys/dynamic/dynamic.qmlproject b/examples/declarative/toys/dynamic/dynamic.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/dynamic/dynamic.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/dynamic/images/NOTE b/examples/declarative/toys/dynamic/images/NOTE
new file mode 100644
index 0000000..fcd87f9
--- /dev/null
+++ b/examples/declarative/toys/dynamic/images/NOTE
@@ -0,0 +1 @@
+Images (except star.png) are from the KDE project.
diff --git a/examples/declarative/toys/dynamic/images/face-smile.png b/examples/declarative/toys/dynamic/images/face-smile.png
new file mode 100644
index 0000000..3d66d72
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/face-smile.png differ
diff --git a/examples/declarative/toys/dynamic/images/moon.png b/examples/declarative/toys/dynamic/images/moon.png
new file mode 100644
index 0000000..1c0d606
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/moon.png differ
diff --git a/examples/declarative/toys/dynamic/images/rabbit_brown.png b/examples/declarative/toys/dynamic/images/rabbit_brown.png
new file mode 100644
index 0000000..ebfdeed
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/rabbit_brown.png differ
diff --git a/examples/declarative/toys/dynamic/images/rabbit_bw.png b/examples/declarative/toys/dynamic/images/rabbit_bw.png
new file mode 100644
index 0000000..7bff9b9
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/rabbit_bw.png differ
diff --git a/examples/declarative/toys/dynamic/images/star.png b/examples/declarative/toys/dynamic/images/star.png
new file mode 100644
index 0000000..27ef924
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/star.png differ
diff --git a/examples/declarative/toys/dynamic/images/sun.png b/examples/declarative/toys/dynamic/images/sun.png
new file mode 100644
index 0000000..7713ca5
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/sun.png differ
diff --git a/examples/declarative/toys/dynamic/images/tree_s.png b/examples/declarative/toys/dynamic/images/tree_s.png
new file mode 100644
index 0000000..6eac35a
Binary files /dev/null and b/examples/declarative/toys/dynamic/images/tree_s.png differ
diff --git a/examples/declarative/toys/dynamic/qml/Button.qml b/examples/declarative/toys/dynamic/qml/Button.qml
new file mode 100644
index 0000000..963a850
--- /dev/null
+++ b/examples/declarative/toys/dynamic/qml/Button.qml
@@ -0,0 +1,40 @@
+import Qt 4.7
+
+Rectangle {
+    id: container
+
+    property variant text
+    signal clicked
+
+    height: text.height + 10; width: text.width + 20
+    border.width: 1
+    radius: 4
+    smooth: true
+
+    gradient: Gradient {
+        GradientStop {
+            position: 0.0
+            color: !mouseArea.pressed ? activePalette.light : activePalette.button
+        }
+        GradientStop {
+            position: 1.0
+            color: !mouseArea.pressed ? activePalette.button : activePalette.dark
+        }
+    }
+
+    SystemPalette { id: activePalette }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: container.clicked()
+    }
+
+    Text {
+        id: text
+        anchors.centerIn:parent
+        font.pointSize: 10
+        text: parent.text
+        color: activePalette.buttonText
+    }
+}
diff --git a/examples/declarative/toys/dynamic/qml/PaletteItem.qml b/examples/declarative/toys/dynamic/qml/PaletteItem.qml
new file mode 100644
index 0000000..dcb5cc3
--- /dev/null
+++ b/examples/declarative/toys/dynamic/qml/PaletteItem.qml
@@ -0,0 +1,19 @@
+import Qt 4.7
+import "itemCreation.js" as Code
+
+Image {
+    id: paletteItem
+
+    property string componentFile
+    property string image
+
+    source: image
+
+    MouseArea { 
+        anchors.fill: parent
+
+        onPressed: Code.startDrag(mouse);
+        onPositionChanged: Code.continueDrag(mouse);
+        onReleased: Code.endDrag(mouse);
+    }
+}
diff --git a/examples/declarative/toys/dynamic/qml/PerspectiveItem.qml b/examples/declarative/toys/dynamic/qml/PerspectiveItem.qml
new file mode 100644
index 0000000..c04d3dc
--- /dev/null
+++ b/examples/declarative/toys/dynamic/qml/PerspectiveItem.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+
+Image {
+    id: rootItem
+
+    property bool created: false
+    property string image 
+
+    property double scaledBottom: y + (height + height*scale) / 2 
+    property bool onLand: scaledBottom > window.height / 2
+
+    source: image
+    opacity: onLand ? 1 : 0.25
+    scale: Math.max((y + height - 250) * 0.01, 0.3)
+    smooth: true
+
+    onCreatedChanged: {
+        if (created && !onLand)
+            rootItem.destroy();
+        else
+            z = scaledBottom;
+    }
+
+    onYChanged: z = scaledBottom;
+}
diff --git a/examples/declarative/toys/dynamic/qml/Sun.qml b/examples/declarative/toys/dynamic/qml/Sun.qml
new file mode 100644
index 0000000..43dcb9a
--- /dev/null
+++ b/examples/declarative/toys/dynamic/qml/Sun.qml
@@ -0,0 +1,38 @@
+import Qt 4.7
+
+Image {
+    id: sun
+
+    property bool created: false
+    property string image: "../images/sun.png"
+
+    source: image
+
+    // once item is created, start moving offscreen
+    NumberAnimation on y {
+        to: window.height / 2
+        running: created
+        onRunningChanged: {
+            if (running)
+                duration = (window.height - sun.y) * 10;
+            else
+                state = "OffScreen"
+        }
+    }
+
+    states: State {
+        name: "OffScreen"
+        StateChangeScript {
+            script: { sun.created = false; sun.destroy() }
+        }
+    }
+
+    onCreatedChanged: {
+        if (created) {
+            sun.z = 1;    // above the sky but below the ground layer 
+            window.activeSuns++;
+        } else {
+            window.activeSuns--;
+        }
+    }
+}
diff --git a/examples/declarative/toys/dynamic/qml/itemCreation.js b/examples/declarative/toys/dynamic/qml/itemCreation.js
new file mode 100644
index 0000000..59750f3
--- /dev/null
+++ b/examples/declarative/toys/dynamic/qml/itemCreation.js
@@ -0,0 +1,65 @@
+var itemComponent = null;
+var draggedItem = null;
+var startingMouse;
+var posnInWindow;
+
+function startDrag(mouse)
+{
+    posnInWindow = paletteItem.mapToItem(null, 0, 0);
+    startingMouse = { x: mouse.x, y: mouse.y }
+    loadComponent();
+}
+
+//Creation is split into two functions due to an asynchronous wait while
+//possible external files are loaded.
+
+function loadComponent() {
+    if (itemComponent != null) { // component has been previously loaded
+        createItem();
+        return;
+    }
+
+    itemComponent = Qt.createComponent(paletteItem.componentFile);
+    if (itemComponent.status == Component.Loading)  //Depending on the content, it can be ready or error immediately
+        component.statusChanged.connect(createItem);
+    else    
+        createItem();
+}
+
+function createItem() {
+    if (itemComponent.status == Component.Ready && draggedItem == null) {
+        draggedItem = itemComponent.createObject(window);
+        draggedItem.image = paletteItem.image;
+        draggedItem.x = posnInWindow.x;
+        draggedItem.y = posnInWindow.y;
+        draggedItem.z = 3;  // make sure created item is above the ground layer
+    } else if (itemComponent.status == Component.Error) {
+        draggedItem = null;
+        console.log("error creating component");
+        console.log(component.errorsString());
+    }
+}
+
+function continueDrag(mouse)
+{
+    if (draggedItem == null)
+        return;
+
+    draggedItem.x = mouse.x + posnInWindow.x - startingMouse.x;
+    draggedItem.y = mouse.y + posnInWindow.y - startingMouse.y;
+}
+
+function endDrag(mouse)
+{
+    if (draggedItem == null)
+        return;
+
+    if (draggedItem.x + draggedItem.width > toolbox.x) { //Don't drop it in the toolbox
+        draggedItem.destroy();
+        draggedItem = null;
+    } else {
+        draggedItem.created = true;
+        draggedItem = null;
+    }
+}
+
diff --git a/examples/declarative/toys/tic-tac-toe/content/Button.qml b/examples/declarative/toys/tic-tac-toe/content/Button.qml
new file mode 100644
index 0000000..ecf18cd
--- /dev/null
+++ b/examples/declarative/toys/tic-tac-toe/content/Button.qml
@@ -0,0 +1,37 @@
+import Qt 4.7
+
+Rectangle {
+    id: container
+
+    property string text: "Button"
+    property bool down: false
+    property string mainCol: "lightgray"
+    property string darkCol: "darkgray"
+    property string lightCol: "white"
+
+    width: buttonLabel.width + 20; height: buttonLabel.height + 6
+    border { width: 1; color: Qt.darker(mainCol) } 
+    radius: 8;
+    color: mainCol
+    smooth: true
+
+    gradient: Gradient {
+        GradientStop {
+            id: topGrad; position: 0.0
+            color: if (container.down) { darkCol } else { lightCol }
+        }
+        GradientStop { position: 1.0; color: mainCol }
+    }
+
+    signal clicked
+
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+
+    Text {
+        id: buttonLabel
+
+        anchors.centerIn: container
+        text: container.text;
+        font.pixelSize: 14
+    }
+}
diff --git a/examples/declarative/toys/tic-tac-toe/content/TicTac.qml b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
new file mode 100644
index 0000000..d247943
--- /dev/null
+++ b/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
@@ -0,0 +1,20 @@
+import Qt 4.7
+
+Item {
+    signal clicked
+
+    states: [
+        State { name: "X"; PropertyChanges { target: image; source: "pics/x.png" } },
+        State { name: "O"; PropertyChanges { target: image; source: "pics/o.png" } }
+    ]
+
+    Image {
+        id: image
+        anchors.centerIn: parent
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: parent.clicked()
+    }
+}
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/board.png b/examples/declarative/toys/tic-tac-toe/content/pics/board.png
new file mode 100644
index 0000000..7e5b7ba
Binary files /dev/null and b/examples/declarative/toys/tic-tac-toe/content/pics/board.png differ
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/o.png b/examples/declarative/toys/tic-tac-toe/content/pics/o.png
new file mode 100644
index 0000000..abc7ee0
Binary files /dev/null and b/examples/declarative/toys/tic-tac-toe/content/pics/o.png differ
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/x.png b/examples/declarative/toys/tic-tac-toe/content/pics/x.png
new file mode 100644
index 0000000..ddc65c8
Binary files /dev/null and b/examples/declarative/toys/tic-tac-toe/content/pics/x.png differ
diff --git a/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js b/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
new file mode 100644
index 0000000..f8d6d9f
--- /dev/null
+++ b/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
@@ -0,0 +1,145 @@
+function winner(board)
+{
+    for (var i=0; i<3; ++i) {
+        if (board.children[i].state!=""
+            && board.children[i].state==board.children[i+3].state
+            && board.children[i].state==board.children[i+6].state)
+            return true
+
+        if (board.children[i*3].state!=""
+            && board.children[i*3].state==board.children[i*3+1].state
+            && board.children[i*3].state==board.children[i*3+2].state)
+            return true
+    }
+
+    if (board.children[0].state!=""
+        && board.children[0].state==board.children[4].state!=""
+        && board.children[0].state==board.children[8].state!="")
+        return true
+
+    if (board.children[2].state!=""
+        && board.children[2].state==board.children[4].state!=""
+        && board.children[2].state==board.children[6].state!="")
+        return true
+
+    return false
+}
+
+function restart()
+{
+    // No moves left - start again
+    for (var i=0; i<9; ++i)
+        board.children[i].state = ""
+}
+
+function makeMove(pos,player)
+{
+    board.children[pos].state = player
+    if (winner(board)) {
+        win(player + " wins")
+        return true
+    } else {
+        return false
+    }
+}
+
+function computerTurn()
+{
+    var r = Math.random();
+    if(r < game.difficulty){
+        smartAI();
+    }else{
+        randAI();
+    }
+}
+
+function smartAI()
+{
+    function boardCopy(a){
+        var ret = new Object;
+        ret.children = new Array(9);
+        for(var i = 0; i<9; i++){
+            ret.children[i] = new Object;
+            ret.children[i].state = a.children[i].state;
+        }
+        return ret;
+    }
+    for(var i=0; i<9; i++){
+        var simpleBoard = boardCopy(board);
+        if (board.children[i].state == "") {
+            simpleBoard.children[i].state = "O";
+            if(winner(simpleBoard)){
+                makeMove(i,"O")
+                return
+            }
+        }
+    }
+    for(var i=0; i<9; i++){
+        var simpleBoard = boardCopy(board);
+        if (board.children[i].state == "") {
+            simpleBoard.children[i].state = "X";
+            if(winner(simpleBoard)){
+                makeMove(i,"O")
+                return
+            }
+        }
+    }
+    function thwart(a,b,c){//If they are at a, try b or c
+        if (board.children[a].state == "X") {
+            if (board.children[b].state == "") {
+                makeMove(b,"O")
+                return true
+            }else if (board.children[c].state == "") {
+                makeMove(c,"O")
+                return true
+            }
+        }
+        return false;
+    }
+    if(thwart(4,0,2)) return;
+    if(thwart(0,4,3)) return;
+    if(thwart(2,4,1)) return;
+    if(thwart(6,4,7)) return;
+    if(thwart(8,4,5)) return;
+    if(thwart(1,4,2)) return;
+    if(thwart(3,4,0)) return;
+    if(thwart(5,4,8)) return;
+    if(thwart(7,4,6)) return;
+    for(var i =0; i<9; i++){//Backup
+        if (board.children[i].state == "") {
+            makeMove(i,"O")
+            return
+        }
+    }
+    restart();
+}
+
+function randAI()
+{
+    var open = 0;
+    for (var i=0; i<9; ++i)
+        if (board.children[i].state == "") {
+            open += 1;
+        }
+    if(open == 0){
+        restart();
+        return;
+    }
+    var openA = new Array(open);//JS doesn't have lists I can append to (i think)
+    var acc = 0;
+    for (var i=0; i<9; ++i)
+        if (board.children[i].state == "") {
+            openA[acc] = i;
+            acc += 1;
+        }
+    var choice = openA[Math.floor(Math.random() * open)];
+    makeMove(choice, "O");
+}
+
+function win(s)
+{
+    msg.text = s
+    msg.opacity = 1
+    endtimer.running = true
+}
+
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
new file mode 100644
index 0000000..dd13052
--- /dev/null
+++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
@@ -0,0 +1,77 @@
+import Qt 4.7
+import "content"
+import "content/tic-tac-toe.js" as Logic
+
+Item {
+    id: game
+
+    property bool show: false
+    property real difficulty: 1.0   //chance it will actually think
+
+    width: 440
+    height: 480
+    anchors.fill: parent
+
+    Image {
+        id: boardimage
+        anchors { verticalCenter: parent.verticalCenter; horizontalCenter: parent.horizontalCenter }
+        source: "content/pics/board.png"
+    }
+
+    Grid {
+        id: board
+        anchors.fill: boardimage
+        columns: 3
+
+        Repeater {
+            model: 9
+            TicTac {
+                width: board.width/3
+                height: board.height/3
+                onClicked: {
+                    if (!endtimer.running) {
+                        if (!Logic.makeMove(index,"X"))
+                            Logic.computerTurn()
+                    }
+                }
+            }
+        }
+
+        Timer {
+            id: endtimer
+            interval: 1600
+            onTriggered: { msg.opacity = 0; Logic.restart() }
+        }
+    }
+
+    Row {
+        spacing: 4
+        anchors { top: board.bottom; horizontalCenter: board.horizontalCenter }
+
+        Button {
+            text: "Hard"
+            onClicked: game.difficulty = 1.0;
+            down: game.difficulty == 1.0
+        }
+        Button {
+            text: "Moderate"
+            onClicked: game.difficulty = 0.8;
+            down: game.difficulty == 0.8
+        }
+        Button {
+            text: "Easy"
+            onClicked: game.difficulty = 0.2;
+            down: game.difficulty == 0.2
+        }
+    }
+
+    Text {
+        id: msg
+
+        anchors.centerIn: parent
+        opacity: 0
+        color: "blue"
+        style: Text.Outline; styleColor: "white"
+        font.pixelSize: 50; font.bold: true
+    }
+}
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/toys.qmlproject b/examples/declarative/toys/toys.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/toys.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qml b/examples/declarative/toys/tvtennis/tvtennis.qml
new file mode 100644
index 0000000..c90d9c5
--- /dev/null
+++ b/examples/declarative/toys/tvtennis/tvtennis.qml
@@ -0,0 +1,71 @@
+import Qt 4.7
+
+Rectangle {
+    id: page
+    width: 640; height: 480
+    color: "Black"
+
+    // Make a ball to bounce
+    Rectangle {
+        id: ball
+
+        // Add a property for the target y coordinate
+        property int targetY : page.height - 10
+        property variant direction : "right"
+
+        x: 20; width: 20; height: 20; z: 1
+        color: "Lime"
+
+        // Move the ball to the right and back to the left repeatedly
+        SequentialAnimation on x {
+            loops: Animation.Infinite
+            NumberAnimation { to: page.width - 40; duration: 2000 }
+            PropertyAction { target: ball; property: "direction"; value: "left" }
+            NumberAnimation { to: 20; duration: 2000 }
+            PropertyAction { target: ball; property: "direction"; value: "right" }
+        }
+
+        // Make y follow the target y coordinate, with a velocity of 200
+        SpringFollow on y { to: ball.targetY; velocity: 200 }
+
+        // Detect the ball hitting the top or bottom of the view and bounce it
+        onYChanged: {
+            if (y <= 0) {
+                targetY = page.height - 20;
+            } else if (y >= page.height - 20) {
+                targetY = 0;
+            }
+        }
+    }
+
+    // Place bats to the left and right of the view, following the y
+    // coordinates of the ball.
+    Rectangle {
+        id: leftBat
+        color: "Lime"
+        x: 2; width: 20; height: 90
+        SpringFollow on y {
+            to: ball.y - 45; velocity: 300
+            enabled: ball.direction == 'left'
+        }
+    }
+    Rectangle {
+        id: rightBat
+        color: "Lime"
+        x: page.width - 22; width: 20; height: 90
+        SpringFollow on y {
+            to: ball.y-45; velocity: 300
+            enabled: ball.direction == 'right'
+        }
+    }
+
+    // The rest, to make it look realistic, if neither ever scores...
+    Rectangle { color: "Lime"; x: page.width/2-80; y: 0; width: 40; height: 60 }
+    Rectangle { color: "Black"; x: page.width/2-70; y: 10; width: 20; height: 40 }
+    Rectangle { color: "Lime"; x: page.width/2+40; y: 0; width: 40; height: 60 }
+    Rectangle { color: "Black"; x: page.width/2+50; y: 10; width: 20; height: 40 }
+    Repeater {
+        model: page.height / 20
+        Rectangle { color: "Lime"; x: page.width/2-5; y: index * 20; width: 10; height: 10 }
+    }
+}
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qmlproject b/examples/declarative/toys/tvtennis/tvtennis.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/tvtennis/tvtennis.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/toys/velocity/Day.qml b/examples/declarative/toys/velocity/Day.qml
new file mode 100644
index 0000000..350c1c4
--- /dev/null
+++ b/examples/declarative/toys/velocity/Day.qml
@@ -0,0 +1,101 @@
+import Qt 4.7
+
+Component {
+    Item {
+        property variant stickies
+
+        id: page
+        width: 840; height: 480
+
+        Image { source: "cork.jpg" }
+
+        Text {
+            text: name; x: 15; y: 8; height: 40; width: 370
+            font.pixelSize: 18; font.bold: true; color: "white"
+            style: Text.Outline; styleColor: "black"
+        }
+
+        Repeater {
+            model: notes
+            Item {
+                id: stickyPage
+
+                property int randomX: Math.random() * 500 + 100
+                property int randomY: Math.random() * 200 + 50
+
+                x: randomX; y: randomY
+
+                SpringFollow on rotation {
+                    to: -flickable.horizontalVelocity / 100
+                    spring: 2.0; damping: 0.15
+                }
+
+                Item {
+                    id: sticky
+                    scale: 0.7
+
+                    Image {
+                        id: stickyImage
+                        x: 8 + -width * 0.6 / 2; y: -20
+                        source: "note-yellow.png"
+                        scale: 0.6; transformOrigin: Item.TopLeft
+                        smooth: true
+                    }
+
+                    TextEdit {
+                        id: myText
+                        x: -104; y: 36; width: 215; height: 200
+                        smooth: true
+                        font.pixelSize: 24
+                        readOnly: false
+                        rotation: -8
+                        text: noteText
+                    }
+
+                    Item {
+                        x: stickyImage.x; y: -20
+                        width: stickyImage.width * stickyImage.scale
+                        height: stickyImage.height * stickyImage.scale
+
+                        MouseArea {
+                            id: mouse
+                            anchors.fill: parent
+                            drag.target: stickyPage
+                            drag.axis: Drag.XandYAxis
+                            drag.minimumY: 0
+                            drag.maximumY: page.height - 80
+                            drag.minimumX: 100
+                            drag.maximumX: page.width - 140
+                            onClicked: { myText.focus = true }
+                        }
+                    }
+                }
+
+                Image {
+                    x: -width / 2; y: -height * 0.5 / 2
+                    source: "tack.png"
+                    scale: 0.7; transformOrigin: Item.TopLeft
+                }
+
+                states: State {
+                    name: "pressed"
+                    when: mouse.pressed
+                    PropertyChanges { target: sticky; rotation: 8; scale: 1 }
+                    PropertyChanges { target: page; z: 8 }
+                }
+
+                transitions: Transition {
+                    NumberAnimation { properties: "rotation,scale"; duration: 200 }
+                }
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
diff --git a/examples/declarative/toys/velocity/cork.jpg b/examples/declarative/toys/velocity/cork.jpg
new file mode 100644
index 0000000..160bc00
Binary files /dev/null and b/examples/declarative/toys/velocity/cork.jpg differ
diff --git a/examples/declarative/toys/velocity/note-yellow.png b/examples/declarative/toys/velocity/note-yellow.png
new file mode 100644
index 0000000..8ddecc8
Binary files /dev/null and b/examples/declarative/toys/velocity/note-yellow.png differ
diff --git a/examples/declarative/toys/velocity/tack.png b/examples/declarative/toys/velocity/tack.png
new file mode 100644
index 0000000..cef2d1c
Binary files /dev/null and b/examples/declarative/toys/velocity/tack.png differ
diff --git a/examples/declarative/toys/velocity/velocity.qml b/examples/declarative/toys/velocity/velocity.qml
new file mode 100644
index 0000000..871bafc
--- /dev/null
+++ b/examples/declarative/toys/velocity/velocity.qml
@@ -0,0 +1,75 @@
+import Qt 4.7
+
+Rectangle {
+    width: 800; height: 480
+    color: "#464646"
+
+    ListModel {
+        id: list
+
+        ListElement {
+            name: "Sunday"
+            notes: [ 
+                ListElement { noteText: "Lunch" },
+                ListElement { noteText: "Birthday Party" }
+            ]
+        }
+        
+        ListElement {
+            name: "Monday"
+            notes: [
+                ListElement { noteText: "Pickup kids from\nschool\n4.30pm" },
+                ListElement { noteText: "Checkout Qt" }, ListElement { noteText: "Read email" }
+            ]
+        }
+
+        ListElement {
+            name: "Tuesday"
+            notes: [
+                ListElement { noteText: "Walk dog" },
+                ListElement { noteText: "Buy newspaper" }
+            ]
+        }
+
+        ListElement {
+            name: "Wednesday"
+            notes: [ ListElement { noteText: "Cook dinner" } ]
+        }
+
+        ListElement {
+            name: "Thursday"
+            notes: [
+                ListElement { noteText: "Meeting\n5.30pm" },
+                ListElement { noteText: "Weed garden" }
+            ]
+        }
+
+        ListElement {
+            name: "Friday"
+            notes: [
+                ListElement { noteText: "More work" },
+                ListElement { noteText: "Grocery shopping" }
+            ]
+        }
+
+        ListElement {
+            name: "Saturday"
+            notes: [
+                ListElement { noteText: "Drink" },
+                ListElement { noteText: "Download Qt\nPlay with QML" }
+            ]
+        }
+    }
+
+    ListView {
+        id: flickable
+
+        anchors.fill: parent
+        focus: true
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        orientation: ListView.Horizontal
+        snapMode: ListView.SnapOneItem
+        model: list
+        delegate: Day { }
+    }
+}
diff --git a/examples/declarative/toys/velocity/velocity.qmlproject b/examples/declarative/toys/velocity/velocity.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/toys/velocity/velocity.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/tutorials/extending/extending.pro b/examples/declarative/tutorials/extending/extending.pro
new file mode 100644
index 0000000..0c86fed
--- /dev/null
+++ b/examples/declarative/tutorials/extending/extending.pro
@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    chapter1-basics \
+    chapter2-methods \
+    chapter3-bindings \
+    chapter4-customPropertyTypes \
+    chapter5-plugins 
+
diff --git a/examples/declarative/tutorials/tutorials.pro b/examples/declarative/tutorials/tutorials.pro
new file mode 100644
index 0000000..0a82c1e
--- /dev/null
+++ b/examples/declarative/tutorials/tutorials.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    extending
+
diff --git a/examples/declarative/tvtennis/tvtennis.qml b/examples/declarative/tvtennis/tvtennis.qml
deleted file mode 100644
index c90d9c5..0000000
--- a/examples/declarative/tvtennis/tvtennis.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    id: page
-    width: 640; height: 480
-    color: "Black"
-
-    // Make a ball to bounce
-    Rectangle {
-        id: ball
-
-        // Add a property for the target y coordinate
-        property int targetY : page.height - 10
-        property variant direction : "right"
-
-        x: 20; width: 20; height: 20; z: 1
-        color: "Lime"
-
-        // Move the ball to the right and back to the left repeatedly
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { to: page.width - 40; duration: 2000 }
-            PropertyAction { target: ball; property: "direction"; value: "left" }
-            NumberAnimation { to: 20; duration: 2000 }
-            PropertyAction { target: ball; property: "direction"; value: "right" }
-        }
-
-        // Make y follow the target y coordinate, with a velocity of 200
-        SpringFollow on y { to: ball.targetY; velocity: 200 }
-
-        // Detect the ball hitting the top or bottom of the view and bounce it
-        onYChanged: {
-            if (y <= 0) {
-                targetY = page.height - 20;
-            } else if (y >= page.height - 20) {
-                targetY = 0;
-            }
-        }
-    }
-
-    // Place bats to the left and right of the view, following the y
-    // coordinates of the ball.
-    Rectangle {
-        id: leftBat
-        color: "Lime"
-        x: 2; width: 20; height: 90
-        SpringFollow on y {
-            to: ball.y - 45; velocity: 300
-            enabled: ball.direction == 'left'
-        }
-    }
-    Rectangle {
-        id: rightBat
-        color: "Lime"
-        x: page.width - 22; width: 20; height: 90
-        SpringFollow on y {
-            to: ball.y-45; velocity: 300
-            enabled: ball.direction == 'right'
-        }
-    }
-
-    // The rest, to make it look realistic, if neither ever scores...
-    Rectangle { color: "Lime"; x: page.width/2-80; y: 0; width: 40; height: 60 }
-    Rectangle { color: "Black"; x: page.width/2-70; y: 10; width: 20; height: 40 }
-    Rectangle { color: "Lime"; x: page.width/2+40; y: 0; width: 40; height: 60 }
-    Rectangle { color: "Black"; x: page.width/2+50; y: 10; width: 20; height: 40 }
-    Repeater {
-        model: page.height / 20
-        Rectangle { color: "Lime"; x: page.width/2-5; y: index * 20; width: 10; height: 10 }
-    }
-}
diff --git a/examples/declarative/tvtennis/tvtennis.qmlproject b/examples/declarative/tvtennis/tvtennis.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/tvtennis/tvtennis.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/flipable/content/5_heart.png b/examples/declarative/ui-components/flipable/content/5_heart.png
new file mode 100644
index 0000000..fb59d81
Binary files /dev/null and b/examples/declarative/ui-components/flipable/content/5_heart.png differ
diff --git a/examples/declarative/ui-components/flipable/content/9_club.png b/examples/declarative/ui-components/flipable/content/9_club.png
new file mode 100644
index 0000000..2545001
Binary files /dev/null and b/examples/declarative/ui-components/flipable/content/9_club.png differ
diff --git a/examples/declarative/ui-components/flipable/content/Card.qml b/examples/declarative/ui-components/flipable/content/Card.qml
new file mode 100644
index 0000000..2577d89
--- /dev/null
+++ b/examples/declarative/ui-components/flipable/content/Card.qml
@@ -0,0 +1,38 @@
+import Qt 4.7
+
+Flipable {
+    id: container
+
+    property alias image: frontImage.source
+    property bool flipped: true
+    property int xAxis: 0
+    property int yAxis: 0
+    property int angle: 0
+
+    width: front.width; height: front.height; state: "back"
+
+    front: Image { id: frontImage; smooth: true }
+    back: Image { source: "back.png"; smooth: true }
+
+    MouseArea { anchors.fill: parent; onClicked: container.flipped = !container.flipped }
+
+    transform: Rotation {
+        id: rotation; origin.x: container.width / 2; origin.y: container.height / 2
+        axis.x: container.xAxis; axis.y: container.yAxis; axis.z: 0
+    }
+
+    states: State {
+        name: "back"; when: container.flipped
+        PropertyChanges { target: rotation; angle: container.angle }
+    }
+
+    transitions: Transition {
+        ParallelAnimation {
+            NumberAnimation { target: rotation; properties: "angle"; duration: 600 }
+            SequentialAnimation {
+                NumberAnimation { target: container; property: "scale"; to: 0.75; duration: 300 }
+                NumberAnimation { target: container; property: "scale"; to: 1.0; duration: 300 }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/ui-components/flipable/content/back.png b/examples/declarative/ui-components/flipable/content/back.png
new file mode 100644
index 0000000..f715d74
Binary files /dev/null and b/examples/declarative/ui-components/flipable/content/back.png differ
diff --git a/examples/declarative/ui-components/flipable/flipable-example.qml b/examples/declarative/ui-components/flipable/flipable-example.qml
new file mode 100644
index 0000000..4e09569
--- /dev/null
+++ b/examples/declarative/ui-components/flipable/flipable-example.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: window
+    
+    width: 480; height: 320
+    color: "darkgreen"
+
+    Row {
+        anchors.centerIn: parent; spacing: 30
+        Card { image: "content/9_club.png"; angle: 180; yAxis: 1 }
+        Card { image: "content/5_heart.png"; angle: 540; xAxis: 1 }
+    }
+}
diff --git a/examples/declarative/ui-components/flipable/flipable.qmlproject b/examples/declarative/ui-components/flipable/flipable.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/flipable/flipable.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/progressbar/content/ProgressBar.qml b/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
new file mode 100644
index 0000000..bc36df5
--- /dev/null
+++ b/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
@@ -0,0 +1,43 @@
+import Qt 4.7
+
+Item {
+    id: progressbar
+
+    property int minimum: 0
+    property int maximum: 100
+    property int value: 0
+    property alias color: gradient1.color
+    property alias secondColor: gradient2.color
+
+    width: 250; height: 23
+    clip: true
+
+    BorderImage {
+        source: "background.png"
+        width: parent.width; height: parent.height
+        border { left: 4; top: 4; right: 4; bottom: 4 }
+    }
+
+    Rectangle {
+        id: highlight
+
+        property int widthDest: ((progressbar.width * (value - minimum)) / (maximum - minimum) - 6)
+
+        width: highlight.widthDest
+        Behavior on width { SmoothedAnimation { velocity: 1200 } }
+
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 3; topMargin: 3; bottomMargin: 3 }
+        radius: 1
+        gradient: Gradient {
+            GradientStop { id: gradient1; position: 0.0 }
+            GradientStop { id: gradient2; position: 1.0 }
+        }
+
+    }
+    Text {
+        anchors { right: highlight.right; rightMargin: 6; verticalCenter: parent.verticalCenter }
+        color: "white"
+        font.bold: true
+        text: Math.floor((value - minimum) / (maximum - minimum) * 100) + '%'
+    }
+}
diff --git a/examples/declarative/ui-components/progressbar/content/background.png b/examples/declarative/ui-components/progressbar/content/background.png
new file mode 100644
index 0000000..9044226
Binary files /dev/null and b/examples/declarative/ui-components/progressbar/content/background.png differ
diff --git a/examples/declarative/ui-components/progressbar/progressbar.qmlproject b/examples/declarative/ui-components/progressbar/progressbar.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/progressbar/progressbar.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/progressbar/progressbars.qml b/examples/declarative/ui-components/progressbar/progressbars.qml
new file mode 100644
index 0000000..55fd682
--- /dev/null
+++ b/examples/declarative/ui-components/progressbar/progressbars.qml
@@ -0,0 +1,33 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: main
+
+    width: 600; height: 405
+    color: "#edecec"
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: column.height + 20
+
+        Column {
+            id: column
+            x: 10; y: 10
+            spacing: 10
+
+            Repeater {
+                model: 25
+
+                ProgressBar {
+                    property int r: Math.floor(Math.random() * 5000 + 1000)
+                    width: main.width - 20
+
+                    NumberAnimation on value { duration: r; from: 0; to: 100; loops: Animation.Infinite }
+                    ColorAnimation on color { duration: r; from: "lightsteelblue"; to: "thistle"; loops: Animation.Infinite }
+                    ColorAnimation on secondColor { duration: r; from: "steelblue"; to: "#CD96CD"; loops: Animation.Infinite }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/ui-components/scrollbar/ScrollBar.qml b/examples/declarative/ui-components/scrollbar/ScrollBar.qml
new file mode 100644
index 0000000..c628a20
--- /dev/null
+++ b/examples/declarative/ui-components/scrollbar/ScrollBar.qml
@@ -0,0 +1,33 @@
+import Qt 4.7
+
+Item {
+    id: scrollBar
+
+    // The properties that define the scrollbar's state.
+    // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
+    // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
+    // of the height of the view.
+    // orientation can be either Qt.Vertical or Qt.Horizontal
+    property real position
+    property real pageSize
+    property variant orientation : Qt.Vertical
+
+    // A light, semi-transparent background
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
+        color: "white"
+        opacity: 0.3
+    }
+    // Size the bar to the required size, depending upon the orientation.
+    Rectangle {
+        x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
+        y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
+        width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
+        height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
+        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
+        color: "black"
+        opacity: 0.7
+    }
+}
diff --git a/examples/declarative/ui-components/scrollbar/display.qml b/examples/declarative/ui-components/scrollbar/display.qml
new file mode 100644
index 0000000..6b12d85
--- /dev/null
+++ b/examples/declarative/ui-components/scrollbar/display.qml
@@ -0,0 +1,54 @@
+import Qt 4.7
+
+Rectangle {
+    width: 640
+    height: 480
+
+    // Create a flickable to view a large image.
+    Flickable {
+        id: view
+        anchors.fill: parent
+        contentWidth: picture.width
+        contentHeight: picture.height
+
+        Image {
+            id: picture
+            source: "pics/niagara_falls.jpg"
+            asynchronous: true
+        }
+
+        // Only show the scrollbars when the view is moving.
+        states: State {
+            name: "ShowBars"
+            when: view.movingVertically || view.movingHorizontally
+            PropertyChanges { target: verticalScrollBar; opacity: 1 }
+            PropertyChanges { target: horizontalScrollBar; opacity: 1 }
+        }
+
+        transitions: Transition {
+            from: "*"; to: "*"
+            NumberAnimation { properties: "opacity"; duration: 400 }
+        }
+    }
+
+    // Attach scrollbars to the right and bottom edges of the view.
+    ScrollBar {
+        id: verticalScrollBar
+        width: 12; height: view.height-12
+        anchors.right: view.right
+        opacity: 0
+        orientation: Qt.Vertical
+        position: view.visibleArea.yPosition
+        pageSize: view.visibleArea.heightRatio
+    }
+
+    ScrollBar {
+        id: horizontalScrollBar
+        width: view.width-12; height: 12
+        anchors.bottom: view.bottom
+        opacity: 0
+        orientation: Qt.Horizontal
+        position: view.visibleArea.xPosition
+        pageSize: view.visibleArea.widthRatio
+    }
+}
diff --git a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg b/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg
new file mode 100644
index 0000000..618d808
Binary files /dev/null and b/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg differ
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject b/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/searchbox/SearchBox.qml b/examples/declarative/ui-components/searchbox/SearchBox.qml
new file mode 100644
index 0000000..aae7ee9
--- /dev/null
+++ b/examples/declarative/ui-components/searchbox/SearchBox.qml
@@ -0,0 +1,65 @@
+import Qt 4.7
+
+FocusScope {
+    id: focusScope
+    width: 250; height: 28
+
+    BorderImage {
+        source: "images/lineedit-bg.png"
+        width: parent.width; height: parent.height
+        border { left: 4; top: 4; right: 4; bottom: 4 }
+    }
+
+    BorderImage {
+        source: "images/lineedit-bg-focus.png"
+        width: parent.width; height: parent.height
+        border { left: 4; top: 4; right: 4; bottom: 4 }
+        visible: parent.wantsFocus ? true : false
+    }
+
+    Text {
+        id: typeSomething
+        anchors.fill: parent; anchors.leftMargin: 8
+        verticalAlignment: Text.AlignVCenter
+        text: "Type something..."
+        color: "gray"
+        font.italic: true
+    }
+
+    MouseArea { anchors.fill: parent; onClicked: focusScope.focus = true }
+
+    TextInput {
+        id: textInput
+        anchors { left: parent.left; leftMargin: 8; verticalCenter: parent.verticalCenter }
+        focus: true
+    }
+
+    Image {
+        id: clear
+        anchors { right: parent.right; rightMargin: 8; verticalCenter: parent.verticalCenter }
+        source: "images/edit-clear-locationbar-rtl.png"
+        opacity: 0
+
+        MouseArea { 
+            anchors.fill: parent
+            onClicked: { textInput.text = ''; focusScope.focus = true }
+        }
+    }
+
+    states: State {
+        name: "hasText"; when: textInput.text != ''
+        PropertyChanges { target: typeSomething; opacity: 0 }
+        PropertyChanges { target: clear; opacity: 1 }
+    }
+
+    transitions: [
+        Transition {
+            from: ""; to: "hasText"
+            NumberAnimation { exclude: typeSomething; properties: "opacity" }
+        },
+        Transition {
+            from: "hasText"; to: ""
+            NumberAnimation { properties: "opacity" }
+        }
+    ]
+}
diff --git a/examples/declarative/ui-components/searchbox/images/edit-clear-locationbar-rtl.png b/examples/declarative/ui-components/searchbox/images/edit-clear-locationbar-rtl.png
new file mode 100644
index 0000000..91eb270
Binary files /dev/null and b/examples/declarative/ui-components/searchbox/images/edit-clear-locationbar-rtl.png differ
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png b/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png
new file mode 100644
index 0000000..bbfac38
Binary files /dev/null and b/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png differ
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png b/examples/declarative/ui-components/searchbox/images/lineedit-bg.png
new file mode 100644
index 0000000..9044226
Binary files /dev/null and b/examples/declarative/ui-components/searchbox/images/lineedit-bg.png differ
diff --git a/examples/declarative/ui-components/searchbox/main.qml b/examples/declarative/ui-components/searchbox/main.qml
new file mode 100644
index 0000000..9f73473
--- /dev/null
+++ b/examples/declarative/ui-components/searchbox/main.qml
@@ -0,0 +1,15 @@
+import Qt 4.7
+
+Rectangle {
+    width: 500; height: 250
+    color: "#edecec"
+
+    Column {
+        anchors { horizontalCenter: parent.horizontalCenter; verticalCenter: parent.verticalCenter }
+        spacing: 10
+
+        SearchBox { id: search1; KeyNavigation.tab: search2; KeyNavigation.backtab: search3; focus: true }
+        SearchBox { id: search2; KeyNavigation.tab: search3; KeyNavigation.backtab: search1 }
+        SearchBox { id: search3; KeyNavigation.tab: search1; KeyNavigation.backtab: search2 }
+    }
+}
diff --git a/examples/declarative/ui-components/searchbox/searchbox.qmlproject b/examples/declarative/ui-components/searchbox/searchbox.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/searchbox/searchbox.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/slideswitch/content/Switch.qml b/examples/declarative/ui-components/slideswitch/content/Switch.qml
new file mode 100644
index 0000000..526a171
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/content/Switch.qml
@@ -0,0 +1,76 @@
+//![0]
+import Qt 4.7
+
+Item {
+    id: toggleswitch
+    width: background.width; height: background.height
+
+//![1]
+    property bool on: false
+//![1]
+
+//![2]
+    function toggle() {
+        if (toggleswitch.state == "on")
+            toggleswitch.state = "off";
+        else toggleswitch.state = "on";
+    }
+//![2]
+
+//![3]
+    function dorelease() {
+        if (knob.x == 1) {
+            if (toggleswitch.state == "off") return;
+        }
+        if (knob.x == 78) {
+            if (toggleswitch.state == "on") return;
+        }
+        toggle();
+    }
+//![3]
+
+//![4]
+    Image {
+        id: background
+        source: "background.svg"
+        MouseArea { anchors.fill: parent; onClicked: toggle() }
+    }
+//![4]
+
+//![5]
+    Image {
+        id: knob
+        x: 1; y: 2
+        source: "knob.svg"
+
+        MouseArea {
+            anchors.fill: parent
+            drag.target: knob; drag.axis: Drag.XAxis; drag.minimumX: 1; drag.maximumX: 78
+            onClicked: toggle()
+            onReleased: dorelease()
+        }
+    }
+//![5]
+
+//![6]
+    states: [
+        State {
+            name: "on"
+            PropertyChanges { target: knob; x: 78 }
+            PropertyChanges { target: toggleswitch; on: true }
+        },
+        State {
+            name: "off"
+            PropertyChanges { target: knob; x: 1 }
+            PropertyChanges { target: toggleswitch; on: false }
+        }
+    ]
+//![6]
+
+//![7]
+    transitions: Transition {
+        NumberAnimation { properties: "x"; easing.type: Easing.InOutQuad; duration: 200 }
+    }
+//![7]
+}
+//![0]
diff --git a/examples/declarative/ui-components/slideswitch/content/background.svg b/examples/declarative/ui-components/slideswitch/content/background.svg
new file mode 100644
index 0000000..f920d3e
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/content/background.svg
@@ -0,0 +1,23 @@
+
+
+
+]>
+
+
+
+
+	
+	
+
+
+
+	
+	
+
+
+
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.svg b/examples/declarative/ui-components/slideswitch/content/knob.svg
new file mode 100644
index 0000000..fb69337
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/content/knob.svg
@@ -0,0 +1,867 @@
+
+
+image/svg+xml
+
+
+
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
\ No newline at end of file
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qml b/examples/declarative/ui-components/slideswitch/slideswitch.qml
new file mode 100644
index 0000000..51c3c77
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.qml
@@ -0,0 +1,11 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    color: "white"
+    width: 400; height: 250
+
+//![0]
+    Switch { anchors.centerIn: parent; on: false }
+//![0]
+}
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject b/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/spinner/content/Spinner.qml b/examples/declarative/ui-components/spinner/content/Spinner.qml
new file mode 100644
index 0000000..8145a28
--- /dev/null
+++ b/examples/declarative/ui-components/spinner/content/Spinner.qml
@@ -0,0 +1,25 @@
+import Qt 4.7
+
+Image {
+    property alias model: view.model
+    property alias delegate: view.delegate
+    property alias currentIndex: view.currentIndex
+    property real itemHeight: 30
+    source: "spinner-bg.png"
+    clip: true
+    PathView {
+        id: view
+        anchors.fill: parent
+        pathItemCount: height/itemHeight
+        preferredHighlightBegin: 0.5
+        preferredHighlightEnd: 0.5
+        highlight: Image { source: "spinner-select.png"; width: view.width; height: itemHeight+4 }
+        dragMargin: view.width/2
+        path: Path {
+            startX: view.width/2; startY: -itemHeight/2
+            PathLine { x: view.width/2; y: view.pathItemCount*itemHeight + itemHeight }
+        }
+    }
+    Keys.onDownPressed: view.incrementCurrentIndex()
+    Keys.onUpPressed: view.decrementCurrentIndex()
+}
diff --git a/examples/declarative/ui-components/spinner/content/spinner-bg.png b/examples/declarative/ui-components/spinner/content/spinner-bg.png
new file mode 100644
index 0000000..b3556f1
Binary files /dev/null and b/examples/declarative/ui-components/spinner/content/spinner-bg.png differ
diff --git a/examples/declarative/ui-components/spinner/content/spinner-select.png b/examples/declarative/ui-components/spinner/content/spinner-select.png
new file mode 100644
index 0000000..95a17a1
Binary files /dev/null and b/examples/declarative/ui-components/spinner/content/spinner-select.png differ
diff --git a/examples/declarative/ui-components/spinner/main.qml b/examples/declarative/ui-components/spinner/main.qml
new file mode 100644
index 0000000..6be567a
--- /dev/null
+++ b/examples/declarative/ui-components/spinner/main.qml
@@ -0,0 +1,18 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    width: 240; height: 320
+    Column {
+        y: 20; x: 20; spacing: 20
+        Spinner {
+            id: spinner
+            width: 200; height: 240
+            focus: true
+            model: 20
+            itemHeight: 30
+            delegate: Text { font.pixelSize: 25; text: index; height: 30 }
+        }
+        Text { text: "Current item index: " + spinner.currentIndex }
+    }
+}
diff --git a/examples/declarative/ui-components/spinner/spinner.qmlproject b/examples/declarative/ui-components/spinner/spinner.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/spinner/spinner.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/tabwidget/TabWidget.qml b/examples/declarative/ui-components/tabwidget/TabWidget.qml
new file mode 100644
index 0000000..26d25b4
--- /dev/null
+++ b/examples/declarative/ui-components/tabwidget/TabWidget.qml
@@ -0,0 +1,57 @@
+import Qt 4.7
+
+Item {
+    id: tabWidget
+
+    property int current: 0
+    default property alias content: stack.children
+
+    onCurrentChanged: setOpacities()
+    Component.onCompleted: setOpacities()
+
+    function setOpacities()
+    {
+        for (var i = 0; i < stack.children.length; ++i) {
+            stack.children[i].opacity = i == current ? 1 : 0
+        }
+    }
+
+    Row {
+        id: header
+        Repeater {
+            delegate: Rectangle {
+                width: tabWidget.width / stack.children.length; height: 36
+
+                Rectangle {
+                    width: parent.width; height: 1
+                    anchors { bottom: parent.bottom; bottomMargin: 1 }
+                    color: "#acb2c2"
+                }
+                BorderImage {
+                    anchors { fill: parent; leftMargin: 2; topMargin: 5; rightMargin: 1 }
+                    border { left: 7; right: 7 }
+                    source: "tab.png"
+                    visible: tabWidget.current == index
+                }
+                Text {
+                    horizontalAlignment: Qt.AlignHCenter; verticalAlignment: Qt.AlignVCenter
+                    anchors.fill: parent
+                    text: stack.children[index].title
+                    elide: Text.ElideRight
+                    font.bold: tabWidget.current == index
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: tabWidget.current = index
+                }
+            }
+            model: stack.children.length
+        }
+    }
+
+    Item {
+        id: stack
+        width: tabWidget.width
+        anchors.top: header.bottom; anchors.bottom: tabWidget.bottom
+    }
+}
diff --git a/examples/declarative/ui-components/tabwidget/tab.png b/examples/declarative/ui-components/tabwidget/tab.png
new file mode 100644
index 0000000..ad80216
Binary files /dev/null and b/examples/declarative/ui-components/tabwidget/tab.png differ
diff --git a/examples/declarative/ui-components/tabwidget/tabs.qml b/examples/declarative/ui-components/tabwidget/tabs.qml
new file mode 100644
index 0000000..fba203c
--- /dev/null
+++ b/examples/declarative/ui-components/tabwidget/tabs.qml
@@ -0,0 +1,59 @@
+import Qt 4.7
+
+TabWidget {
+    id: tabs
+    width: 640; height: 480
+
+    Rectangle {
+        property string title: "Red"
+        anchors.fill: parent
+        color: "#e3e3e3"
+
+        Rectangle {
+            anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 }
+            color: "#ff7f7f"
+            Text {
+                width: parent.width - 20
+                anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
+                text: "Roses are red"
+                font.pixelSize: 20
+                wrapMode: Text.WordWrap
+            }
+        }
+    }
+
+    Rectangle {
+        property string title: "Green"
+        anchors.fill: parent
+        color: "#e3e3e3"
+
+        Rectangle {
+            anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 }
+            color: "#7fff7f"
+            Text {
+                width: parent.width - 20
+                anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
+                text: "Flower stems are green"
+                font.pixelSize: 20
+                wrapMode: Text.WordWrap
+            }
+        }
+    }
+
+    Rectangle {
+        property string title: "Blue"
+        anchors.fill: parent; color: "#e3e3e3"
+
+        Rectangle {
+            anchors { fill: parent; topMargin: 20; leftMargin: 20; rightMargin: 20; bottomMargin: 20 }
+            color: "#7f7fff"
+            Text {
+                width: parent.width - 20
+                anchors.centerIn: parent; horizontalAlignment: Qt.AlignHCenter
+                text: "Violets are blue"
+                font.pixelSize: 20
+                wrapMode: Text.WordWrap
+            }
+        }
+    }
+}
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject b/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/ui-components/ui-components.qmlproject b/examples/declarative/ui-components/ui-components.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/ui-components/ui-components.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
deleted file mode 100644
index 350c1c4..0000000
--- a/examples/declarative/velocity/Day.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-import Qt 4.7
-
-Component {
-    Item {
-        property variant stickies
-
-        id: page
-        width: 840; height: 480
-
-        Image { source: "cork.jpg" }
-
-        Text {
-            text: name; x: 15; y: 8; height: 40; width: 370
-            font.pixelSize: 18; font.bold: true; color: "white"
-            style: Text.Outline; styleColor: "black"
-        }
-
-        Repeater {
-            model: notes
-            Item {
-                id: stickyPage
-
-                property int randomX: Math.random() * 500 + 100
-                property int randomY: Math.random() * 200 + 50
-
-                x: randomX; y: randomY
-
-                SpringFollow on rotation {
-                    to: -flickable.horizontalVelocity / 100
-                    spring: 2.0; damping: 0.15
-                }
-
-                Item {
-                    id: sticky
-                    scale: 0.7
-
-                    Image {
-                        id: stickyImage
-                        x: 8 + -width * 0.6 / 2; y: -20
-                        source: "note-yellow.png"
-                        scale: 0.6; transformOrigin: Item.TopLeft
-                        smooth: true
-                    }
-
-                    TextEdit {
-                        id: myText
-                        x: -104; y: 36; width: 215; height: 200
-                        smooth: true
-                        font.pixelSize: 24
-                        readOnly: false
-                        rotation: -8
-                        text: noteText
-                    }
-
-                    Item {
-                        x: stickyImage.x; y: -20
-                        width: stickyImage.width * stickyImage.scale
-                        height: stickyImage.height * stickyImage.scale
-
-                        MouseArea {
-                            id: mouse
-                            anchors.fill: parent
-                            drag.target: stickyPage
-                            drag.axis: Drag.XandYAxis
-                            drag.minimumY: 0
-                            drag.maximumY: page.height - 80
-                            drag.minimumX: 100
-                            drag.maximumX: page.width - 140
-                            onClicked: { myText.focus = true }
-                        }
-                    }
-                }
-
-                Image {
-                    x: -width / 2; y: -height * 0.5 / 2
-                    source: "tack.png"
-                    scale: 0.7; transformOrigin: Item.TopLeft
-                }
-
-                states: State {
-                    name: "pressed"
-                    when: mouse.pressed
-                    PropertyChanges { target: sticky; rotation: 8; scale: 1 }
-                    PropertyChanges { target: page; z: 8 }
-                }
-
-                transitions: Transition {
-                    NumberAnimation { properties: "rotation,scale"; duration: 200 }
-                }
-            }
-        }
-    }
-}
-
-
-
-
-
-
-
-
diff --git a/examples/declarative/velocity/cork.jpg b/examples/declarative/velocity/cork.jpg
deleted file mode 100644
index 160bc00..0000000
Binary files a/examples/declarative/velocity/cork.jpg and /dev/null differ
diff --git a/examples/declarative/velocity/note-yellow.png b/examples/declarative/velocity/note-yellow.png
deleted file mode 100644
index 8ddecc8..0000000
Binary files a/examples/declarative/velocity/note-yellow.png and /dev/null differ
diff --git a/examples/declarative/velocity/tack.png b/examples/declarative/velocity/tack.png
deleted file mode 100644
index cef2d1c..0000000
Binary files a/examples/declarative/velocity/tack.png and /dev/null differ
diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml
deleted file mode 100644
index 871bafc..0000000
--- a/examples/declarative/velocity/velocity.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 800; height: 480
-    color: "#464646"
-
-    ListModel {
-        id: list
-
-        ListElement {
-            name: "Sunday"
-            notes: [ 
-                ListElement { noteText: "Lunch" },
-                ListElement { noteText: "Birthday Party" }
-            ]
-        }
-        
-        ListElement {
-            name: "Monday"
-            notes: [
-                ListElement { noteText: "Pickup kids from\nschool\n4.30pm" },
-                ListElement { noteText: "Checkout Qt" }, ListElement { noteText: "Read email" }
-            ]
-        }
-
-        ListElement {
-            name: "Tuesday"
-            notes: [
-                ListElement { noteText: "Walk dog" },
-                ListElement { noteText: "Buy newspaper" }
-            ]
-        }
-
-        ListElement {
-            name: "Wednesday"
-            notes: [ ListElement { noteText: "Cook dinner" } ]
-        }
-
-        ListElement {
-            name: "Thursday"
-            notes: [
-                ListElement { noteText: "Meeting\n5.30pm" },
-                ListElement { noteText: "Weed garden" }
-            ]
-        }
-
-        ListElement {
-            name: "Friday"
-            notes: [
-                ListElement { noteText: "More work" },
-                ListElement { noteText: "Grocery shopping" }
-            ]
-        }
-
-        ListElement {
-            name: "Saturday"
-            notes: [
-                ListElement { noteText: "Drink" },
-                ListElement { noteText: "Download Qt\nPlay with QML" }
-            ]
-        }
-    }
-
-    ListView {
-        id: flickable
-
-        anchors.fill: parent
-        focus: true
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        orientation: ListView.Horizontal
-        snapMode: ListView.SnapOneItem
-        model: list
-        delegate: Day { }
-    }
-}
diff --git a/examples/declarative/velocity/velocity.qmlproject b/examples/declarative/velocity/velocity.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/velocity/velocity.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/webview/alerts.html b/examples/declarative/webview/alerts.html
deleted file mode 100644
index 82caddf..0000000
--- a/examples/declarative/webview/alerts.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
      This is a web page. It fires an alert when clicked.
-
-
diff --git a/examples/declarative/webview/alerts.qml b/examples/declarative/webview/alerts.qml
deleted file mode 100644
index 7684c3e..0000000
--- a/examples/declarative/webview/alerts.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-WebView {
-    id: webView
-    width: 120
-    height: 150
-    url: "alerts.html"
-
-    onAlert: popup.show(message)
-
-    Rectangle {
-        id: popup
-
-        color: "red"
-        border.color: "black"; border.width: 2
-        radius: 4
-
-        y: parent.height // off "screen"
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: label.width+5
-        height: label.height+5
-
-        opacity: 0
-
-        function show(t) {
-            label.text = t
-            popup.state = "visible"
-            timer.start()
-        }
-        states: State {
-            name: "visible"
-            PropertyChanges { target: popup; opacity: 1 }
-            PropertyChanges { target: popup; y: (webView.height-popup.height)/2 }
-        }
-
-        transitions: [
-            Transition { from: ""; PropertyAnimation { properties: "opacity,y"; duration: 65 } },
-            Transition { from: "visible"; PropertyAnimation { properties: "opacity,y"; duration: 500 } }
-        ]
-
-        Timer {
-            id: timer
-            interval: 1000
-            onTriggered: popup.state = ""
-        }
-
-        Text {
-            id: label
-            anchors.centerIn: parent
-            color: "white"
-            font.pixelSize: 20
-            width: webView.width*0.75
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-        }
-    }
-}
diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml
deleted file mode 100644
index 9632883..0000000
--- a/examples/declarative/webview/autosize.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
-Rectangle {
-    id: rect
-    width: 200
-    height: layout.height
-
-    Column {
-        id: layout
-        spacing: 2
-        WebView {
-            html: "No width defined."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width
-            html: "The width is full."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The width is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The preferredWidth is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The_preferredWidth_is_half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The_width_is_half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-    }
-}
diff --git a/examples/declarative/webview/content/FieldText.qml b/examples/declarative/webview/content/FieldText.qml
deleted file mode 100644
index d1d003f..0000000
--- a/examples/declarative/webview/content/FieldText.qml
+++ /dev/null
@@ -1,157 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: fieldText
-    height: 30
-    property string text: ""
-    property string label: ""
-    property bool mouseGrabbed: false
-    signal confirmed
-    signal cancelled
-    signal startEdit
-
-    function edit() {
-        if (!mouseGrabbed) {
-            fieldText.startEdit();
-            fieldText.state='editing';
-            mouseGrabbed=true;
-        }
-    }
-
-    function confirm() {
-        fieldText.state='';
-        fieldText.text = textEdit.text;
-        mouseGrabbed=false;
-        fieldText.confirmed();
-    }
-
-    function reset() {
-        textEdit.text = fieldText.text;
-        fieldText.state='';
-        mouseGrabbed=false;
-        fieldText.cancelled();
-    }
-
-    Image {
-        id: cancelIcon
-        width: 22
-        height: 22
-        anchors.right: parent.right
-        anchors.rightMargin: 4
-        anchors.verticalCenter: parent.verticalCenter
-        source: "pics/cancel.png"
-        opacity: 0
-    }
-
-    Image {
-        id: confirmIcon
-        width: 22
-        height: 22
-        anchors.left: parent.left
-        anchors.leftMargin: 4
-        anchors.verticalCenter: parent.verticalCenter
-        source: "pics/ok.png"
-        opacity: 0
-    }
-
-    TextInput {
-        id: textEdit
-        text: fieldText.text
-        focus: false
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.verticalCenter: parent.verticalCenter
-        color: "black"
-        font.bold: true
-        readOnly: true
-        onAccepted: confirm()
-        Keys.onEscapePressed: reset()
-    }
-
-    Text {
-        id: textLabel
-        x: 5
-        width: parent.width-10
-        anchors.verticalCenter: parent.verticalCenter
-        horizontalAlignment: Text.AlignHCenter
-        color: fieldText.state == "editing" ? "#505050" : "#AAAAAA"
-        font.italic: true
-        font.bold: true
-        text: label
-        opacity: textEdit.text == '' ? 1 : 0
-        Behavior on opacity {
-            NumberAnimation {
-                property: "opacity"
-                duration: 250
-            }
-        }
-    }
-
-    MouseArea {
-        anchors.fill: cancelIcon
-        onClicked: { reset() }
-    }
-
-    MouseArea {
-        anchors.fill: confirmIcon
-        onClicked: { confirm() }
-    }
-
-    MouseArea {
-        id: editRegion
-        anchors.fill: textEdit
-        onClicked: { edit() }
-    }
-
-    states: [
-    State {
-        name: "editing"
-        PropertyChanges {
-            target: confirmIcon
-            opacity: 1
-        }
-        PropertyChanges {
-            target: cancelIcon
-            opacity: 1
-        }
-        PropertyChanges {
-            target: textEdit
-            color: "black"
-            readOnly: false
-            focus: true
-            selectionStart: 0
-            selectionEnd: -1
-        }
-        PropertyChanges {
-            target: editRegion
-            opacity: 0
-        }
-        PropertyChanges {
-            target: textEdit.anchors
-            leftMargin: 34
-        }
-        PropertyChanges {
-            target: textEdit.anchors
-            rightMargin: 34
-        }
-    }
-    ]
-
-    transitions: [
-    Transition {
-        from: ""
-        to: "*"
-        reversible: true
-        NumberAnimation {
-            properties: "opacity,leftMargin,rightMargin"
-            duration: 200
-        }
-        ColorAnimation {
-            property: "color"
-            duration: 150
-        }
-    }
-    ]
-}
diff --git a/examples/declarative/webview/content/Mapping/Map.qml b/examples/declarative/webview/content/Mapping/Map.qml
deleted file mode 100644
index 5d3ba81..0000000
--- a/examples/declarative/webview/content/Mapping/Map.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-Item {
-    id: page
-    property real latitude: -34.397
-    property real longitude: 150.644
-    property string address: ""
-    property alias status: js.status
-    WebView {
-        id: map
-        anchors.fill: parent
-        url: "map.html"
-        javaScriptWindowObjects: QtObject {
-            id: js
-            WebView.windowObjectName: "qml"
-            property real lat: page.latitude
-            property real lng: page.longitude
-            property string address: page.address
-            property string status: "Loading"
-            onAddressChanged: { if (map.url != "" && map.progress==1) map.evaluateJavaScript("goToAddress()") }
-        }
-        pressGrabTime: 0
-        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
-    }
-}
diff --git a/examples/declarative/webview/content/Mapping/map.html b/examples/declarative/webview/content/Mapping/map.html
deleted file mode 100755
index a8726fd..0000000
--- a/examples/declarative/webview/content/Mapping/map.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-  
      
-
-
diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml
deleted file mode 100644
index dba48d4..0000000
--- a/examples/declarative/webview/content/SpinSquare.qml
+++ /dev/null
@@ -1,25 +0,0 @@
-import Qt 4.7
-
-Item {
-    property variant period : 250
-    property variant color : "black"
-    id: root
-
-    Item {
-        x: root.width/2
-        y: root.height/2
-        Rectangle {
-            color: root.color
-            x: -width/2
-            y: -height/2
-            width: root.width
-            height: width
-        }
-        NumberAnimation on rotation {
-            from: 0
-            to: 360
-            loops: Animation.Infinite
-            duration: root.period
-        }
-    }
-}
diff --git a/examples/declarative/webview/content/pics/cancel.png b/examples/declarative/webview/content/pics/cancel.png
deleted file mode 100644
index ecc9533..0000000
Binary files a/examples/declarative/webview/content/pics/cancel.png and /dev/null differ
diff --git a/examples/declarative/webview/content/pics/ok.png b/examples/declarative/webview/content/pics/ok.png
deleted file mode 100644
index 5795f04..0000000
Binary files a/examples/declarative/webview/content/pics/ok.png and /dev/null differ
diff --git a/examples/declarative/webview/googleMaps.qml b/examples/declarative/webview/googleMaps.qml
deleted file mode 100644
index 5506012..0000000
--- a/examples/declarative/webview/googleMaps.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-// This example demonstrates how Web services such as Google Maps can be
-// abstracted as QML types. Here we have a "Mapping" module with a "Map"
-// type. The Map type has an address property. Setting that property moves
-// the map. The underlying implementation uses WebView and the Google Maps
-// API, but users from QML don't need to understand the implementation in
-// order to create a Map.
-
-import Qt 4.7
-import org.webkit 1.0
-import "content/Mapping"
-
-Map {
-    id: map
-    width: 300
-    height: 300
-    address: "Paris"
-
-    Rectangle {
-        x: 70
-        width: input.width + 20
-        height: input.height + 4
-        anchors.bottom: parent.bottom; anchors.bottomMargin: 5
-        radius: 5
-        opacity: map.status == "Ready" ? 1 : 0
-
-        TextInput {
-            id: input
-            text: map.address
-            anchors.centerIn: parent
-            Keys.onReturnPressed: map.address = input.text
-        }
-    }
-
-    Text {
-        id: loading
-        anchors.centerIn: parent
-        text: map.status == "Error" ? "Error" : "Loading"
-        opacity: map.status == "Ready" ? 0 : 1
-        font.pixelSize: 30
-
-        Behavior on opacity { NumberAnimation{} }
-    }
-}
diff --git a/examples/declarative/webview/inline-html.qml b/examples/declarative/webview/inline-html.qml
deleted file mode 100644
index eec7fc6..0000000
--- a/examples/declarative/webview/inline-html.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-// Inline HTML with loose formatting can be
-// set on the html property.
-WebView {
-    html:"\
-        \
-        \
-            
      OneTwoThree\
-            
      1X1X\
-            
      20X0\
-            
      3X1X\
-        
      "
-}
diff --git a/examples/declarative/webview/newwindows.html b/examples/declarative/webview/newwindows.html
deleted file mode 100644
index f169599..0000000
--- a/examples/declarative/webview/newwindows.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
      Multiple windows...
      
-
-Popup!
diff --git a/examples/declarative/webview/newwindows.qml b/examples/declarative/webview/newwindows.qml
deleted file mode 100644
index 2e4a72e..0000000
--- a/examples/declarative/webview/newwindows.qml
+++ /dev/null
@@ -1,31 +0,0 @@
-// Demonstrates opening new WebViews from HTML
-//
-// Note that to open windows from JavaScript, you will need to
-// allow it on WebView with settings.javascriptCanOpenWindows: true
-
-import Qt 4.7
-import org.webkit 1.0
-
-Grid {
-    columns: 3
-    id: pages
-    height: 300; width: 600
-
-    Component {
-        id: webViewPage
-        Rectangle {
-            width: webView.width
-            height: webView.height
-            border.color: "gray"
-
-            WebView {
-                id: webView
-                newWindowComponent: webViewPage
-                newWindowParent: pages
-                url: "newwindows.html"
-            }
-        }
-    }
-
-    Loader { sourceComponent: webViewPage }
-}
diff --git a/examples/declarative/webview/transparent.qml b/examples/declarative/webview/transparent.qml
deleted file mode 100644
index e4efc31..0000000
--- a/examples/declarative/webview/transparent.qml
+++ /dev/null
@@ -1,15 +0,0 @@
-import Qt 4.7
-import org.webkit 1.0
-
-// The WebView background is transparent
-// if the HTML does not specify a background
-Rectangle {
-    color: "green"
-    width: web.width
-    height: web.height
-
-    WebView {
-        id: web
-        html: "Hello World!"
-    }
-}
diff --git a/examples/declarative/webview/webview.qmlproject b/examples/declarative/webview/webview.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/webview/webview.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/workerscript/workerscript.js b/examples/declarative/workerscript/workerscript.js
deleted file mode 100644
index f76471f..0000000
--- a/examples/declarative/workerscript/workerscript.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var lastx = 0;
-var lasty = 0;
-
-WorkerScript.onMessage = function(message) {
-    var ydiff = message.y - lasty;
-    var xdiff = message.x - lastx;
-
-    var total = Math.sqrt(ydiff * ydiff + xdiff * xdiff);
-
-    lastx = message.x;
-    lasty = message.y;
-
-    WorkerScript.sendMessage( {xmove: xdiff, ymove: ydiff, move: total} );
-}
-
diff --git a/examples/declarative/workerscript/workerscript.qml b/examples/declarative/workerscript/workerscript.qml
deleted file mode 100644
index 2294a81..0000000
--- a/examples/declarative/workerscript/workerscript.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 480; height: 320
-
-    WorkerScript {
-        id: myWorker
-        source: "workerscript.js"
-
-        onMessage: {
-            console.log("Moved " + messageObject.xmove + " along the X axis.");
-            console.log("Moved " + messageObject.ymove + " along the Y axis.");
-            console.log("Moved " + messageObject.move + " pixels.");
-        }
-    }
-
-    Rectangle {
-        width: 200; height: 200
-        anchors.left: parent.left; anchors.leftMargin: 20
-        color: "red"
-
-        MouseArea { 
-            anchors.fill: parent
-            onClicked: myWorker.sendMessage( { rectangle: "red", x: mouse.x, y: mouse.y } );
-        }
-    }
-
-    Rectangle {
-        width: 200; height: 200
-        anchors.right: parent.right; anchors.rightMargin: 20
-        color: "blue"
-
-        MouseArea { 
-            anchors.fill: parent
-            onClicked: myWorker.sendMessage( { rectangle: "blue", x: mouse.x, y: mouse.y } );
-        }
-    }
-
-    Text {
-        text: "Click a Rectangle!"
-        anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: 50 }
-    }
-}
diff --git a/examples/declarative/workerscript/workerscript.qmlproject b/examples/declarative/workerscript/workerscript.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/workerscript/workerscript.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/xml/xml.qmlproject b/examples/declarative/xml/xml.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/xml/xml.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/xml/xmldata/daringfireball.qml b/examples/declarative/xml/xmldata/daringfireball.qml
new file mode 100644
index 0000000..480b13c
--- /dev/null
+++ b/examples/declarative/xml/xmldata/daringfireball.qml
@@ -0,0 +1,47 @@
+import Qt 4.7
+
+Rectangle {
+    width: 600; height: 600
+
+    XmlListModel {
+        id: feedModel
+        source: "http://daringfireball.net/index.xml"
+        query: "/feed/entry"
+        namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom';"
+        XmlRole { name: "title"; query: "title/string()" }
+        XmlRole { name: "tagline"; query: "author/name/string()" }
+        XmlRole { name: "content"; query: "content/string()" }
+    }
+
+    Component {
+        id: feedDelegate
+        Item {
+            height: childrenRect.height + 20
+            Text {
+                id: titleText
+                x: 10
+                text: title; font.bold: true
+            }
+            Text {
+                anchors { left: titleText.right; leftMargin: 10 }
+                text: 'by ' + tagline
+                font.italic: true
+            }
+            Text {
+                x: 10
+                width: 580
+                anchors.top: titleText.bottom
+                text: content
+                wrapMode: Text.WordWrap
+
+                onLinkActivated: { console.log('link clicked: ' + link) }
+            }
+        }
+    }
+
+    ListView {
+        anchors.fill: parent
+        model: feedModel
+        delegate: feedDelegate
+    }
+}
diff --git a/examples/declarative/xml/xmldata/xmldata.qmlproject b/examples/declarative/xml/xmldata/xmldata.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/xml/xmldata/xmldata.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/xml/xmldata/yahoonews.qml b/examples/declarative/xml/xmldata/yahoonews.qml
new file mode 100644
index 0000000..5bab463
--- /dev/null
+++ b/examples/declarative/xml/xmldata/yahoonews.qml
@@ -0,0 +1,83 @@
+import Qt 4.7
+
+Rectangle {
+    width: 600; height: 600
+
+    gradient: Gradient {
+        GradientStop { position: 0; color: "black" }
+        GradientStop { position: 1.0; color: "#AAAAAA" }
+    }
+
+    XmlListModel {
+        id: feedModel
+        source: "http://rss.news.yahoo.com/rss/oceania"
+        query: "/rss/channel/item"
+        XmlRole { name: "title"; query: "title/string()" }
+        XmlRole { name: "link"; query: "link/string()" }
+        XmlRole { name: "description"; query: "description/string()" }
+    }
+
+    Component {
+        id: feedDelegate
+
+        Item {
+            id: delegate
+            height: wrapper.height + 10
+
+            MouseArea {
+                anchors.fill: wrapper
+                onPressed: delegate.ListView.view.currentIndex = index;
+                onClicked: if (wrapper.state == 'Details') wrapper.state = ''; else wrapper.state = 'Details';
+            }
+
+            Rectangle {
+                id: wrapper
+
+                width: 580; y: 5; height: titleText.height + 10
+                color: "#F0F0F0"
+                radius: 5
+                
+                Text {
+                    id: titleText
+                    x: 10; y: 5
+                    text: '' + title + ''
+                    font { bold: true; family: "Helvetica"; pointSize: 14 }
+
+                    onLinkActivated: { console.log('link clicked: ' + link) }
+                }
+
+                Text {
+                    id: descriptionText
+                    x: 10; width: 560
+                    anchors.top: titleText.bottom; anchors.topMargin: 5
+                    text: description
+                    wrapMode: Text.WordWrap
+                    font.family: "Helvetica"
+                    opacity: 0
+                }
+
+                states: State {
+                    name: "Details"
+                    PropertyChanges { target: wrapper; height: childrenRect.height + 10 }
+                    PropertyChanges { target: descriptionText; opacity: 1 }
+                }
+
+                transitions: Transition {
+                    from: "*"; to: "Details"; reversible: true
+                    SequentialAnimation {
+                        NumberAnimation { duration: 200; properties: "height"; easing.type: Easing.OutQuad }
+                        NumberAnimation { duration: 200; properties: "opacity" }
+                    }
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: list
+        x: 10; y: 10
+        width: parent.width - 20; height: parent.height - 20
+        model: feedModel
+        delegate: feedDelegate
+    }
+}
diff --git a/examples/declarative/xml/xmlhttprequest/test.qml b/examples/declarative/xml/xmlhttprequest/test.qml
new file mode 100644
index 0000000..c7e7e6d
--- /dev/null
+++ b/examples/declarative/xml/xmlhttprequest/test.qml
@@ -0,0 +1,36 @@
+import Qt 4.7
+
+Rectangle {
+    width: 800; height: 600
+
+    MouseArea {
+        anchors.fill: parent
+
+        onClicked: { 
+            var doc = new XMLHttpRequest();
+            doc.onreadystatechange = function() {
+                if (doc.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
+                    console.log("Headers -->");
+                    console.log(doc.getAllResponseHeaders ());
+                    console.log("Last modified -->");
+                    console.log(doc.getResponseHeader ("Last-Modified"));
+                }
+                else if (doc.readyState == XMLHttpRequest.DONE) {
+
+                    var a = doc.responseXML.documentElement;
+                    for (var ii = 0; ii < a.childNodes.length; ++ii) {
+                        console.log(a.childNodes[ii].nodeName);
+                    }
+                    console.log("Headers -->");
+                    console.log(doc.getAllResponseHeaders ());
+                    console.log("Last modified -->");
+                    console.log(doc.getResponseHeader ("Last-Modified"));
+
+                }
+            }
+
+            doc.open("GET", "test.xml");
+            doc.send();
+        }
+    }
+}
diff --git a/examples/declarative/xml/xmlhttprequest/test.xml b/examples/declarative/xml/xmlhttprequest/test.xml
new file mode 100644
index 0000000..8b7f1e1
--- /dev/null
+++ b/examples/declarative/xml/xmlhttprequest/test.xml
@@ -0,0 +1,5 @@
+
+    
+    
+
+
diff --git a/examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject b/examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml
deleted file mode 100644
index 480b13c..0000000
--- a/examples/declarative/xmldata/daringfireball.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 600; height: 600
-
-    XmlListModel {
-        id: feedModel
-        source: "http://daringfireball.net/index.xml"
-        query: "/feed/entry"
-        namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom';"
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "tagline"; query: "author/name/string()" }
-        XmlRole { name: "content"; query: "content/string()" }
-    }
-
-    Component {
-        id: feedDelegate
-        Item {
-            height: childrenRect.height + 20
-            Text {
-                id: titleText
-                x: 10
-                text: title; font.bold: true
-            }
-            Text {
-                anchors { left: titleText.right; leftMargin: 10 }
-                text: 'by ' + tagline
-                font.italic: true
-            }
-            Text {
-                x: 10
-                width: 580
-                anchors.top: titleText.bottom
-                text: content
-                wrapMode: Text.WordWrap
-
-                onLinkActivated: { console.log('link clicked: ' + link) }
-            }
-        }
-    }
-
-    ListView {
-        anchors.fill: parent
-        model: feedModel
-        delegate: feedDelegate
-    }
-}
diff --git a/examples/declarative/xmldata/xmldata.qmlproject b/examples/declarative/xmldata/xmldata.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/xmldata/xmldata.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
deleted file mode 100644
index 5bab463..0000000
--- a/examples/declarative/xmldata/yahoonews.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 600; height: 600
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: "black" }
-        GradientStop { position: 1.0; color: "#AAAAAA" }
-    }
-
-    XmlListModel {
-        id: feedModel
-        source: "http://rss.news.yahoo.com/rss/oceania"
-        query: "/rss/channel/item"
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "link"; query: "link/string()" }
-        XmlRole { name: "description"; query: "description/string()" }
-    }
-
-    Component {
-        id: feedDelegate
-
-        Item {
-            id: delegate
-            height: wrapper.height + 10
-
-            MouseArea {
-                anchors.fill: wrapper
-                onPressed: delegate.ListView.view.currentIndex = index;
-                onClicked: if (wrapper.state == 'Details') wrapper.state = ''; else wrapper.state = 'Details';
-            }
-
-            Rectangle {
-                id: wrapper
-
-                width: 580; y: 5; height: titleText.height + 10
-                color: "#F0F0F0"
-                radius: 5
-                
-                Text {
-                    id: titleText
-                    x: 10; y: 5
-                    text: '' + title + ''
-                    font { bold: true; family: "Helvetica"; pointSize: 14 }
-
-                    onLinkActivated: { console.log('link clicked: ' + link) }
-                }
-
-                Text {
-                    id: descriptionText
-                    x: 10; width: 560
-                    anchors.top: titleText.bottom; anchors.topMargin: 5
-                    text: description
-                    wrapMode: Text.WordWrap
-                    font.family: "Helvetica"
-                    opacity: 0
-                }
-
-                states: State {
-                    name: "Details"
-                    PropertyChanges { target: wrapper; height: childrenRect.height + 10 }
-                    PropertyChanges { target: descriptionText; opacity: 1 }
-                }
-
-                transitions: Transition {
-                    from: "*"; to: "Details"; reversible: true
-                    SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing.type: Easing.OutQuad }
-                        NumberAnimation { duration: 200; properties: "opacity" }
-                    }
-                }
-            }
-        }
-    }
-
-    ListView {
-        id: list
-        x: 10; y: 10
-        width: parent.width - 20; height: parent.height - 20
-        model: feedModel
-        delegate: feedDelegate
-    }
-}
diff --git a/examples/declarative/xmlhttprequest/test.qml b/examples/declarative/xmlhttprequest/test.qml
deleted file mode 100644
index c7e7e6d..0000000
--- a/examples/declarative/xmlhttprequest/test.qml
+++ /dev/null
@@ -1,36 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 800; height: 600
-
-    MouseArea {
-        anchors.fill: parent
-
-        onClicked: { 
-            var doc = new XMLHttpRequest();
-            doc.onreadystatechange = function() {
-                if (doc.readyState == XMLHttpRequest.HEADERS_RECEIVED) {
-                    console.log("Headers -->");
-                    console.log(doc.getAllResponseHeaders ());
-                    console.log("Last modified -->");
-                    console.log(doc.getResponseHeader ("Last-Modified"));
-                }
-                else if (doc.readyState == XMLHttpRequest.DONE) {
-
-                    var a = doc.responseXML.documentElement;
-                    for (var ii = 0; ii < a.childNodes.length; ++ii) {
-                        console.log(a.childNodes[ii].nodeName);
-                    }
-                    console.log("Headers -->");
-                    console.log(doc.getAllResponseHeaders ());
-                    console.log("Last modified -->");
-                    console.log(doc.getResponseHeader ("Last-Modified"));
-
-                }
-            }
-
-            doc.open("GET", "test.xml");
-            doc.send();
-        }
-    }
-}
diff --git a/examples/declarative/xmlhttprequest/test.xml b/examples/declarative/xmlhttprequest/test.xml
deleted file mode 100644
index 8b7f1e1..0000000
--- a/examples/declarative/xmlhttprequest/test.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-    
-    
-
-
diff --git a/examples/declarative/xmlhttprequest/xmlhttprequest.qmlproject b/examples/declarative/xmlhttprequest/xmlhttprequest.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/xmlhttprequest/xmlhttprequest.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 018bd55..229e15b 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -70,11 +70,11 @@ QT_BEGIN_NAMESPACE
     \endlist
 
     Examples:
-    \snippet snippets/declarative/border-image.qml 0
+    \snippet snippets/declarative/borderimage.qml 0
 
     \image BorderImage.png
 
-    The \l{declarative/border-image}{BorderImage example} shows how a BorderImage can be used to simulate a shadow effect on a
+    The \l{declarative/imageelements/borderimage}{BorderImage example} shows how a BorderImage can be used to simulate a shadow effect on a
     rectangular item.
  */
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index a03a51d..3c0f5a2 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -418,7 +418,7 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
     \dots 4
     \snippet doc/src/snippets/declarative/flickableScrollbar.qml 1
 
-    \sa {declarative/scrollbar}{scrollbar example}
+    \sa {declarative/ui-components/scrollbar}{scrollbar example}
 */
 
 QDeclarativeFlickable::QDeclarativeFlickable(QDeclarativeItem *parent)
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 46e9ce3..b71bb7e 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1908,7 +1908,7 @@ void QDeclarativeListView::setCacheBuffer(int b)
     pet.  The section expression is the size property.  If \c ListView.section and
     \c ListView.prevSection differ, the item will display a section header.
 
-    \snippet examples/declarative/listview/sections.qml 0
+    \snippet examples/declarative/modelviews/listview/sections.qml 0
 
     \image ListViewSections.png
 */
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 2c89abd..79f8a17 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -562,9 +562,9 @@ QNetworkAccessManager *QDeclarativeEngine::networkAccessManager() const
 
   This example creates a provider with id \e colors:
 
-  \snippet examples/declarative/imageprovider/imageprovider.cpp 0
+  \snippet examples/declarative/cppextensions/imageprovider/imageprovider.cpp 0
 
-  \snippet examples/declarative/imageprovider/imageprovider-example.qml 0
+  \snippet examples/declarative/cppextensions/imageprovider/imageprovider-example.qml 0
 
   \sa removeImageProvider()
 */
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.cpp b/src/declarative/qml/qdeclarativeextensionplugin.cpp
index 2c15385..c2e8300 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.cpp
+++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
     See \l {Tutorial: Writing QML extensions with C++} for details on creating
     QML extensions, including how to build a plugin with with QDeclarativeExtensionPlugin.
-    For a simple overview, see the \l{declarative/plugins}{plugins} example.
+    For a simple overview, see the \l{declarative/cppextensions/plugins}{plugins} example.
     
     Also see \l {How to Create Qt Plugins} for general Qt plugin documentation.
 
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index a8e1be8..6223548 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -207,11 +207,11 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
     Here is an example that uses WorkerScript to periodically append the
     current time to a list model:
 
-    \snippet examples/declarative/listmodel-threaded/timedisplay.qml 0
+    \snippet examples/declarative/threading/threadedlistmodel/timedisplay.qml 0
 
     The included file, \tt dataloader.js, looks like this:
 
-    \snippet examples/declarative/listmodel-threaded/dataloader.js 0
+    \snippet examples/declarative/threading/threadedlistmodel/dataloader.js 0
 
     The application's \tt Timer object periodically sends a message to the
     worker script by calling \tt WorkerScript::sendMessage(). When this message
diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp
index 20e9907..9617b86 100644
--- a/src/declarative/util/qdeclarativepackage.cpp
+++ b/src/declarative/util/qdeclarativepackage.cpp
@@ -62,13 +62,13 @@ QT_BEGIN_NAMESPACE
     delegate it should appear in.  This allows an item to move
     between views.
 
-    \snippet examples/declarative/package/Delegate.qml 0
+    \snippet examples/declarative/modelviews/package/Delegate.qml 0
 
     These named items are used as the delegates by the two views who
     reference the special VisualDataModel.parts property to select
     a model which provides the chosen delegate.
 
-    \snippet examples/declarative/package/view.qml 0
+    \snippet examples/declarative/modelviews/package/view.qml 0
 
     \sa QtDeclarative
 */
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index f1a00989..4a374a5 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -536,7 +536,7 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty
Date: Mon, 17 May 2010 10:35:45 +1000
Subject: Add missing .pro

---
 .../declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro  | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
new file mode 100644
index 0000000..d92a6f4
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    graphicsLayouts \
+    layoutItem
-- 
cgit v0.12


From f6853d6f8521a057721a943929c96904cdb6f0c6 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Mon, 17 May 2010 11:17:27 +1000
Subject: Add \brief to TextInput

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

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index afbaaac..b00f724 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass TextInput QDeclarativeTextInput
   \since 4.7
-    The TextInput item allows you to add an editable line of text to a scene.
+    \brief The TextInput item allows you to add an editable line of text to a scene.
 
     TextInput can only display a single line of text, and can only display
     plain text. However it can provide addition input constraints on the text.
-- 
cgit v0.12


From 029f98ee0176b34279e7cc944cca17f027fe5a0a Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Mon, 17 May 2010 11:26:51 +1000
Subject: ListModel::get() shouldn't print warnings for invalid indices since
 it returns undefined items for these cases anywyay.

---
 src/declarative/util/qdeclarativelistmodel.cpp             |  5 +----
 .../qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp    | 14 ++++----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 6223548..9a5c9de 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -537,10 +537,7 @@ void QDeclarativeListModel::append(const QScriptValue& valuemap)
 */
 QScriptValue QDeclarativeListModel::get(int index) const
 {
-    // the internal flat/nested class takes care of return value for bad index
-    if (index >= count() || index < 0) 
-        qmlInfo(this) << tr("get: index %1 out of range").arg(index);
-
+    // the internal flat/nested class checks for bad index
     return m_flat ? m_flat->get(index) : m_nested->get(index);
 }
 
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index aed4781..26a12f0 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -184,8 +184,8 @@ void tst_qdeclarativelistmodel::dynamic_data()
 
     QTest::newRow("count") << "count" << 0 << "";
 
-    QTest::newRow("get1") << "{get(0)}" << 0 << ": QML ListModel: get: index 0 out of range";
-    QTest::newRow("get2") << "{get(-1)}" << 0 << ": QML ListModel: get: index -1 out of range";
+    QTest::newRow("get1") << "{get(0)}" << 0 << "";
+    QTest::newRow("get2") << "{get(-1)}" << 0 << "";
 
     QTest::newRow("append1") << "{append({'foo':123});count}" << 1 << "";
     QTest::newRow("append2") << "{append({'foo':123,'bar':456});count}" << 1 << "";
@@ -196,13 +196,13 @@ void tst_qdeclarativelistmodel::dynamic_data()
 
     QTest::newRow("clear1") << "{append({'foo':456});clear();count}" << 0 << "";
     QTest::newRow("clear2") << "{append({'foo':123});append({'foo':456});clear();count}" << 0 << "";
-    QTest::newRow("clear3") << "{append({'foo':123});clear();get(0).foo}" << 0 << ": QML ListModel: get: index 0 out of range";
+    QTest::newRow("clear3") << "{append({'foo':123});clear()}" << 0 << "";
 
     QTest::newRow("remove1") << "{append({'foo':123});remove(0);count}" << 0 << "";
     QTest::newRow("remove2a") << "{append({'foo':123});append({'foo':456});remove(0);count}" << 1 << "";
     QTest::newRow("remove2b") << "{append({'foo':123});append({'foo':456});remove(0);get(0).foo}" << 456 << "";
     QTest::newRow("remove2c") << "{append({'foo':123});append({'foo':456});remove(1);get(0).foo}" << 123 << "";
-    QTest::newRow("remove3") << "{append({'foo':123});remove(0);get(0).foo}" << 0 << ": QML ListModel: get: index 0 out of range";
+    QTest::newRow("remove3") << "{append({'foo':123});remove(0)}" << 0 << "";
     QTest::newRow("remove3a") << "{append({'foo':123});remove(-1);count}" << 1 << ": QML ListModel: remove: index -1 out of range";
     QTest::newRow("remove4a") << "{remove(0)}" << 0 << ": QML ListModel: remove: index 0 out of range";
     QTest::newRow("remove4b") << "{append({'foo':123});remove(0);remove(0);count}" << 0 << ": QML ListModel: remove: index 0 out of range";
@@ -328,12 +328,6 @@ void tst_qdeclarativelistmodel::dynamic_worker()
         if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
             QTest::ignoreMessage(QtWarningMsg, ": QML ListModel: Cannot add nested list values when modifying or after modification from a worker script");
 
-        if (QByteArray(QTest::currentDataTag()).startsWith("nested-append")) {
-            int callsToGet = script.count(QLatin1String(";get("));
-            for (int i=0; i: QML ListModel: get: index 0 out of range");
-        }
-
         QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", 
                 Q_ARG(QVariant, operations.mid(0, operations.length()-1))));
         waitForWorker(item);
-- 
cgit v0.12


From cef452a2792cc15705f677c9b9c689496eeb500f Mon Sep 17 00:00:00 2001
From: Martin Jones 
Date: Mon, 17 May 2010 13:14:18 +1000
Subject: Don't crash due to recursive positioning. Also extend positioner
 anchor check to include fill and centerIn.

Task-number: QTBUG-10731
---
 .../graphicsitems/qdeclarativepositioners.cpp      | 60 +++++++++++++---------
 .../graphicsitems/qdeclarativepositioners_p_p.h    |  5 +-
 .../tst_qdeclarativepositioners.cpp                | 27 +++++++++-
 3 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 93bff3e..8796e63 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -204,7 +204,11 @@ void QDeclarativeBasePositioner::prePositioning()
     if (!isComponentComplete())
         return;
 
+    if (d->doingPositioning)
+        return;
+
     d->queuedPositioning = false;
+    d->doingPositioning = true;
     //Need to order children by creation order modified by stacking order
     QList children = d->QGraphicsItemPrivate::children;
     qSort(children.begin(), children.end(), d->insertionOrder);
@@ -242,6 +246,7 @@ void QDeclarativeBasePositioner::prePositioning()
     doPositioning(&contentSize);
     if(d->addTransition || d->moveTransition)
         finishApplyTransitions();
+    d->doingPositioning = false;
     //Set implicit size to the size of its children
     setImplicitHeight(contentSize.height());
     setImplicitWidth(contentSize.width());
@@ -339,7 +344,8 @@ Column {
 
   Note that the positioner assumes that the x and y positions of its children
   will not change. If you manually change the x or y properties in script, bind
-  the x or y properties, or use anchors on a child of a positioner, then the
+  the x or y properties, use anchors on a child of a positioner, or have the
+  height of a child depend on the position of a child, then the
   positioner may exhibit strange behaviour.
 
 */
@@ -437,7 +443,7 @@ void QDeclarativeColumn::doPositioning(QSizeF *contentSize)
 
 void QDeclarativeColumn::reportConflictingAnchors()
 {
-    bool childsWithConflictingAnchors(false);
+    QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this));
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
@@ -446,15 +452,16 @@ void QDeclarativeColumn::reportConflictingAnchors()
                 QDeclarativeAnchors::Anchors usedAnchors = anchors->usedAnchors();
                 if (usedAnchors & QDeclarativeAnchors::TopAnchor ||
                     usedAnchors & QDeclarativeAnchors::BottomAnchor ||
-                    usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
-                    childsWithConflictingAnchors = true;
+                    usedAnchors & QDeclarativeAnchors::VCenterAnchor ||
+                    anchors->fill() || anchors->centerIn()) {
+                    d->anchorConflict = true;
                     break;
                 }
             }
         }
     }
-    if (childsWithConflictingAnchors) {
-        qmlInfo(this) << "Cannot specify top, bottom or verticalCenter anchors for items inside Column";
+    if (d->anchorConflict) {
+        qmlInfo(this) << "Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column";
     }
 }
 
@@ -486,7 +493,8 @@ Row {
 
   Note that the positioner assumes that the x and y positions of its children
   will not change. If you manually change the x or y properties in script, bind
-  the x or y properties, or use anchors on a child of a positioner, then the
+  the x or y properties, use anchors on a child of a positioner, or have the
+  width of a child depend on the position of a child, then the
   positioner may exhibit strange behaviour.
 
 */
@@ -574,7 +582,7 @@ void QDeclarativeRow::doPositioning(QSizeF *contentSize)
 
 void QDeclarativeRow::reportConflictingAnchors()
 {
-    bool childsWithConflictingAnchors(false);
+    QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this));
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
@@ -583,16 +591,16 @@ void QDeclarativeRow::reportConflictingAnchors()
                 QDeclarativeAnchors::Anchors usedAnchors = anchors->usedAnchors();
                 if (usedAnchors & QDeclarativeAnchors::LeftAnchor ||
                     usedAnchors & QDeclarativeAnchors::RightAnchor ||
-                    usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
-                    childsWithConflictingAnchors = true;
+                    usedAnchors & QDeclarativeAnchors::HCenterAnchor ||
+                    anchors->fill() || anchors->centerIn()) {
+                    d->anchorConflict = true;
                     break;
                 }
             }
         }
     }
-    if (childsWithConflictingAnchors) {
-        qmlInfo(this) << "Cannot specify left, right or horizontalCenter anchors for items inside Row";
-    }
+    if (d->anchorConflict)
+        qmlInfo(this) << "Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row";
 }
 
 /*!
@@ -638,7 +646,8 @@ Grid {
 
   Note that the positioner assumes that the x and y positions of its children
   will not change. If you manually change the x or y properties in script, bind
-  the x or y properties, or use anchors on a child of a positioner, then the
+  the x or y properties, use anchors on a child of a positioner, or have the
+  width or height of a child depend on the position of a child, then the
   positioner may exhibit strange behaviour.
 */
 /*!
@@ -866,20 +875,19 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
 
 void QDeclarativeGrid::reportConflictingAnchors()
 {
-    bool childsWithConflictingAnchors(false);
+    QDeclarativeBasePositionerPrivate *d = static_cast(QDeclarativeBasePositionerPrivate::get(this));
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
             QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors;
-            if (anchors && anchors->usedAnchors()) {
-                childsWithConflictingAnchors = true;
+            if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) {
+                d->anchorConflict = true;
                 break;
             }
         }
     }
-    if (childsWithConflictingAnchors) {
+    if (d->anchorConflict)
         qmlInfo(this) << "Cannot specify anchors for items inside Grid";
-    }
 }
 
 /*!
@@ -888,6 +896,11 @@ void QDeclarativeGrid::reportConflictingAnchors()
   \brief The Flow item lines up its children side by side, wrapping as necessary.
   \inherits Item
 
+  Note that the positioner assumes that the x and y positions of its children
+  will not change. If you manually change the x or y properties in script, bind
+  the x or y properties, use anchors on a child of a positioner, or have the
+  width or height of a child depend on the position of a child, then the
+  positioner may exhibit strange behaviour.
 
 */
 /*!
@@ -1026,20 +1039,19 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize)
 
 void QDeclarativeFlow::reportConflictingAnchors()
 {
-    bool childsWithConflictingAnchors(false);
+    Q_D(QDeclarativeFlow);
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (child.item) {
             QDeclarativeAnchors *anchors = QDeclarativeItemPrivate::get(child.item)->_anchors;
-            if (anchors && anchors->usedAnchors()) {
-                childsWithConflictingAnchors = true;
+            if (anchors && (anchors->usedAnchors() || anchors->fill() || anchors->centerIn())) {
+                d->anchorConflict = true;
                 break;
             }
         }
     }
-    if (childsWithConflictingAnchors) {
+    if (d->anchorConflict)
         qmlInfo(this) << "Cannot specify anchors for items inside Flow";
-    }
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
index 576f35b..04f0181 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
@@ -75,6 +75,7 @@ public:
     QDeclarativeBasePositionerPrivate()
         : spacing(0), type(QDeclarativeBasePositioner::None)
         , moveTransition(0), addTransition(0), queuedPositioning(false)
+        , doingPositioning(false), anchorConflict(false)
     {
     }
 
@@ -95,7 +96,9 @@ public:
 
     void watchChanges(QDeclarativeItem *other);
     void unwatchChanges(QDeclarativeItem* other);
-    bool queuedPositioning;
+    bool queuedPositioning : 1;
+    bool doingPositioning : 1;
+    bool anchorConflict : 1;
 
     virtual void itemSiblingOrderChanged(QDeclarativeItem* other)
     {
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 7a23773..e639014 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -687,7 +687,13 @@ void tst_QDeclarativePositioners::test_conflictinganchors()
     component.setData("import Qt 4.7\nColumn { Item { anchors.top: parent.top } }", QUrl::fromLocalFile(""));
     item = qobject_cast(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Column: Cannot specify top, bottom or verticalCenter anchors for items inside Column"));
+    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(""));
+    item = qobject_cast(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(""));
@@ -699,7 +705,13 @@ void tst_QDeclarativePositioners::test_conflictinganchors()
     component.setData("import Qt 4.7\nRow { Item { anchors.left: parent.left } }", QUrl::fromLocalFile(""));
     item = qobject_cast(component.create());
     QVERIFY(item);
-    QCOMPARE(warningMessage, QString("file::2:1: QML Row: Cannot specify left, right or horizontalCenter anchors for items inside Row"));
+    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(""));
+    item = qobject_cast(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(""));
@@ -714,10 +726,21 @@ void tst_QDeclarativePositioners::test_conflictinganchors()
     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(""));
+    item = qobject_cast(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(""));
     item = qobject_cast(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(""));
+    item = qobject_cast(component.create());
+    QVERIFY(item);
+    QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow"));
 }
 
 QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename)
-- 
cgit v0.12


From fd0b25da6997553bb95ea91bbdd509fa35711b9d Mon Sep 17 00:00:00 2001
From: Warwick Allison 
Date: Mon, 17 May 2010 13:36:35 +1000
Subject: Fix doc for status, add Image::onLoaded. statusChanged is NOT emitted
 for local files, nor should it be (they are loaded synchronously, so status
 is *initially* Ready). Add onLoaded signal that *is* emitted.

Reviewed-by: Michael Brasser
---
 .../graphicsitems/qdeclarativeloader.cpp           | 22 ++++++++++++++++++++--
 .../graphicsitems/qdeclarativeloader_p.h           |  3 +++
 .../qdeclarativeloader/tst_qdeclarativeloader.cpp  |  9 ++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 7edd53c..cbdfd87 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -321,6 +321,7 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
         emit q->statusChanged();
         emit q->progressChanged();
         emit q->itemChanged();
+        emit q->loaded();
     }
 }
 
@@ -341,10 +342,13 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
     of the following ways:
     \list
     \o Create a state, so that a state change occurs, e.g. State{name: 'loaded'; when: loader.status = Loader.Ready;}
-    \o Do something inside the onStatusChanged signal handler, e.g. Loader{id: loader; onStatusChanged: if(loader.status == Loader.Ready) console.log('Loaded');}
+    \o Do something inside the onLoaded signal handler, e.g. Loader{id: loader; onLoaded: console.log('Loaded');}
     \o Bind to the status variable somewhere, e.g. Text{text: if(loader.status!=Loader.Ready){'Not Loaded';}else{'Loaded';}}
     \endlist
     \sa progress
+
+    Note that if the source is a local file, the status will initially be Ready (or Error). While
+    there will be no onStatusChanged signal in that case, the onLoaded will still be invoked.
 */
 
 QDeclarativeLoader::Status QDeclarativeLoader::status() const
@@ -360,6 +364,21 @@ QDeclarativeLoader::Status QDeclarativeLoader::status() const
     return d->source.isEmpty() ? Null : Error;
 }
 
+void QDeclarativeLoader::componentComplete()
+{
+    if (status() == Ready)
+        emit loaded();
+}
+
+
+/*!
+    \qmlsignal Loader::onLoaded()
+
+    This handler is called when the \l status becomes Loader.Ready, or on successful
+    initial load.
+*/
+
+
 /*!
 \qmlproperty real Loader::progress
 
@@ -382,7 +401,6 @@ qreal QDeclarativeLoader::progress() const
     return 0.0;
 }
 
-
 void QDeclarativeLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
 {
     Q_Q(QDeclarativeLoader);
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
index 49dfa11..ec7ffe9 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -84,11 +84,14 @@ Q_SIGNALS:
     void sourceChanged();
     void statusChanged();
     void progressChanged();
+    void loaded();
 
 protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
     bool eventFilter(QObject *watched, QEvent *e);
+    void componentComplete();
+
 private:
     Q_DISABLE_COPY(QDeclarativeLoader)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeLoader)
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index b56ff13..59580ea 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -104,13 +104,14 @@ tst_QDeclarativeLoader::tst_QDeclarativeLoader()
 void tst_QDeclarativeLoader::url()
 {
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE(""));
+    component.setData(QByteArray("import Qt 4.7\nLoader { property int did_load: 0; onLoaded: did_load=123; source: \"Rect120x60.qml\" }"), TEST_FILE(""));
     QDeclarativeLoader *loader = qobject_cast(component.create());
     QVERIFY(loader != 0);
     QVERIFY(loader->item());
     QVERIFY(loader->source() == QUrl::fromLocalFile(SRCDIR "/data/Rect120x60.qml"));
     QCOMPARE(loader->progress(), 1.0);
     QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
+    QCOMPARE(loader->property("did_load").toInt(), 123);
     QCOMPARE(static_cast(loader)->children().count(), 1);
 
     delete loader;
@@ -427,7 +428,7 @@ void tst_QDeclarativeLoader::networkRequestUrl()
     server.serveDirectory(SRCDIR "/data");
 
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { source: \"http://127.0.0.1:14450/Rect120x60.qml\" }"), QUrl::fromLocalFile(SRCDIR "/dummy.qml"));
+    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"));
     if (component.isError())
         qDebug() << component.errors();
     QDeclarativeLoader *loader = qobject_cast(component.create());
@@ -437,6 +438,7 @@ void tst_QDeclarativeLoader::networkRequestUrl()
 
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
+    QCOMPARE(loader->property("did_load").toInt(), 123);
     QCOMPARE(static_cast(loader)->children().count(), 1);
 
     delete loader;
@@ -483,7 +485,7 @@ void tst_QDeclarativeLoader::failNetworkRequest()
     QTest::ignoreMessage(QtWarningMsg, ": Network error for URL http://127.0.0.1:14450/IDontExist.qml");
 
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import Qt 4.7\nLoader { source: \"http://127.0.0.1:14450/IDontExist.qml\" }"), QUrl::fromLocalFile("http://127.0.0.1:14450/dummy.qml"));
+    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"));
     QDeclarativeLoader *loader = qobject_cast(component.create());
     QVERIFY(loader != 0);
 
@@ -491,6 +493,7 @@ void tst_QDeclarativeLoader::failNetworkRequest()
 
     QVERIFY(loader->item() == 0);
     QCOMPARE(loader->progress(), 0.0);
+    QCOMPARE(loader->property("did_load").toInt(), 123);
     QCOMPARE(static_cast(loader)->children().count(), 0);
 
     delete loader;
-- 
cgit v0.12


From a0c9a0feebb571e339c0ea886996f543d2d8c752 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Mon, 17 May 2010 14:44:25 +1000
Subject: Add focus docs snippets

---
 doc/src/declarative/focus.qdoc               | 23 +----------------------
 doc/src/snippets/declarative/focusscopes.qml | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 doc/src/snippets/declarative/focusscopes.qml

diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index e5c1d32..e2b8bb6 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -291,28 +291,7 @@ print the name of the current list item.
 
 \table
 \row
-\o \code
-Rectangle {
-    color: "lightsteelblue"; width: 240; height: 320
-
-    ListView {
-        id: myView; anchors.fill: parent; focus: true
-        model: ListModel {
-            ListElement { name: "Bob" }
-            ListElement { name: "John" }
-            ListElement { name: "Michael" }
-        }
-        delegate: FocusScope {
-            width: contents.width; height: contents.height
-            Text {
-                focus: true
-                text: name
-                Keys.onReturnPressed: console.log(name)
-            }
-        }
-    }
-}
-\endcode
+\o \snippet doc/src/snippets/declarative/focusscopes.qml 0
 \o \image declarative-qmlfocus4.png
 \endtable
 
diff --git a/doc/src/snippets/declarative/focusscopes.qml b/doc/src/snippets/declarative/focusscopes.qml
new file mode 100644
index 0000000..686de29
--- /dev/null
+++ b/doc/src/snippets/declarative/focusscopes.qml
@@ -0,0 +1,27 @@
+import Qt 4.7
+
+//![0]
+Rectangle {
+     color: "lightsteelblue"; width: 240; height: 320
+
+     ListView {
+         anchors.fill: parent
+         focus: true
+
+         model: ListModel {
+             ListElement { name: "Bob" }
+             ListElement { name: "John" }
+             ListElement { name: "Michael" }
+         }
+
+         delegate: FocusScope {
+             width: childrenRect.width; height: childrenRect.height
+             TextInput {
+                 focus: true
+                 text: name
+                 Keys.onReturnPressed: console.log(name)
+             }
+         }
+     }
+ }
+//![0]
-- 
cgit v0.12


From 7a738662838763e4828c6ac8957a2823b095f566 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Mon, 17 May 2010 14:44:51 +1000
Subject: Focus should be applied to focus scopes all the way up the chain, not
 just to the closest focus scope parent.

---
 src/declarative/graphicsitems/qdeclarativetextedit.cpp  | 4 +---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 7f71dd2..45b79a7 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -906,10 +906,8 @@ void QDeclarativeTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
     if (d->focusOnPress){
         QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
         while(p) {
-            if(p->flags() & QGraphicsItem::ItemIsFocusScope){
+            if (p->flags() & QGraphicsItem::ItemIsFocusScope)
                 p->setFocus();
-                break;
-            }
             p = p->parentItem();
         }
         setFocus(true);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index db480b1..8aa7e99 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -889,10 +889,8 @@ void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
     if(d->focusOnPress){
         QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope?
         while(p) {
-            if(p->flags() & QGraphicsItem::ItemIsFocusScope){
+            if (p->flags() & QGraphicsItem::ItemIsFocusScope)
                 p->setFocus();
-                break;
-            }
             p = p->parentItem();
         }
         setFocus(true);
-- 
cgit v0.12


From 58c08b1195add26e2ff96844885ea9d6c124da30 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Mon, 17 May 2010 16:22:43 +1000
Subject: Check for acquireReg() failure

QTBUG-10696
---
 .../qml/qdeclarativecompiledbindings.cpp           | 27 ++++++++++++++++++++++
 .../qdeclarativeecmascript/data/qtbug_10696.qml    | 26 +++++++++++++++++++++
 .../tst_qdeclarativeecmascript.cpp                 |  9 ++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml

diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 05b7dc6..f55d330 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -1624,6 +1624,8 @@ bool QDeclarativeBindingCompilerPrivate::compile(QDeclarativeJS::AST::Node *node
             return false;
 
         int convertReg = acquireReg();
+        if (convertReg == -1)
+            return false;
 
         if (destination->type == QMetaType::QReal) {
             Instr convert;
@@ -2011,6 +2013,8 @@ bool QDeclarativeBindingCompilerPrivate::parseArith(QDeclarativeJS::AST::Node *n
     AST::BinaryExpression *expression = static_cast(node);
 
     type.reg = acquireReg();
+    if (type.reg == -1)
+        return false;
 
     Result lhs;
     Result rhs;
@@ -2062,6 +2066,8 @@ bool QDeclarativeBindingCompilerPrivate::numberArith(Result &type, const Result
             return false;
 
         lhsTmp = acquireReg();
+        if (lhsTmp == -1)
+            return false;
 
         Instr conv;
         conv.common.type = Instr::ConvertGenericToReal;
@@ -2075,6 +2081,8 @@ bool QDeclarativeBindingCompilerPrivate::numberArith(Result &type, const Result
             return false;
 
         rhsTmp = acquireReg();
+        if (rhsTmp == -1)
+            return false;
 
         Instr conv;
         conv.common.type = Instr::ConvertGenericToReal;
@@ -2123,6 +2131,8 @@ bool QDeclarativeBindingCompilerPrivate::stringArith(Result &type, const Result
             return false;
 
         lhsTmp = acquireReg(Instr::CleanupString);
+        if (lhsTmp == -1)
+            return false;
 
         Instr convert;
         convert.common.type = Instr::ConvertGenericToString;
@@ -2136,6 +2146,8 @@ bool QDeclarativeBindingCompilerPrivate::stringArith(Result &type, const Result
             return false;
 
         rhsTmp = acquireReg(Instr::CleanupString);
+        if (rhsTmp == -1)
+            return false;
 
         Instr convert;
         convert.common.type = Instr::ConvertGenericToString;
@@ -2145,6 +2157,9 @@ bool QDeclarativeBindingCompilerPrivate::stringArith(Result &type, const Result
     }
 
     type.reg = acquireReg(Instr::CleanupString);
+    if (type.reg == -1)
+        return false;
+
     type.type = QMetaType::QString;
 
     Instr add;
@@ -2185,6 +2200,9 @@ bool QDeclarativeBindingCompilerPrivate::parseLogic(QDeclarativeJS::AST::Node *n
     if (!parseExpression(expression->right, rhs)) return false;
 
     type.reg = acquireReg();
+    if (type.reg == -1)
+        return false;
+
     type.metaObject = 0;
     type.type = QVariant::Bool;
 
@@ -2310,6 +2328,8 @@ bool QDeclarativeBindingCompilerPrivate::parseConstant(QDeclarativeJS::AST::Node
     type.metaObject = 0;
     type.type = -1;
     type.reg = acquireReg();
+    if (type.reg == -1)
+        return false;
 
     if (node->kind == AST::Node::Kind_TrueLiteral) {
         type.type = QVariant::Bool;
@@ -2398,6 +2418,9 @@ bool QDeclarativeBindingCompilerPrivate::parseMethod(QDeclarativeJS::AST::Node *
     releaseReg(r1.reg);
 
     op.binaryop.output = acquireReg();
+    if (op.binaryop.output == -1)
+        return false;
+
     op.binaryop.src1 = r0.reg;
     op.binaryop.src2 = r1.reg;
     bytecode << op;
@@ -2473,6 +2496,8 @@ bool QDeclarativeBindingCompilerPrivate::fetch(Result &rv, const QMetaObject *mo
 
     if (rv.type == QMetaType::QString) {
         int tmp = acquireReg();
+        if (tmp == -1)
+            return false;
         Instr copy;
         copy.common.type = Instr::Copy;
         copy.copy.reg = tmp;
@@ -2549,6 +2574,8 @@ int QDeclarativeBindingCompilerPrivate::registerLiteralString(const QString &str
     data += strdata;
 
     int reg = acquireReg(Instr::CleanupString);
+    if (reg == -1)
+        return false;
 
     Instr string;
     string.common.type = Instr::String;
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml
new file mode 100644
index 0000000..cb5c4c9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml
@@ -0,0 +1,26 @@
+import Qt 4.7
+
+QtObject {
+    property string test: "aaaa"
+                          + "bbbb"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc"
+                          + "cccc";
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index b8faa7c..64e5b3f 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -149,6 +149,7 @@ private slots:
     void functionAssignment();
     void eval();
     void function();
+    void qtbug_10696();
 
     void include();
 
@@ -2472,6 +2473,14 @@ void tst_qdeclarativeecmascript::include()
     }
 }
 
+void tst_qdeclarativeecmascript::qtbug_10696()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("qtbug_10696.qml"));
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    delete o;
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
-- 
cgit v0.12


From 5227833d76ee072ab7497b790e8058fc79ea8826 Mon Sep 17 00:00:00 2001
From: Bea Lam 
Date: Mon, 17 May 2010 16:37:32 +1000
Subject: Fix examples autotest when compiled without webkit or xmlpatterns

---
 tests/auto/declarative/examples/tst_examples.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index 1044035..605345e 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -82,12 +82,12 @@ tst_examples::tst_examples()
     // Add directories you want excluded here
 
 #ifdef QT_NO_WEBKIT
-    excludedDirs << "examples/declarative/webview";
+    excludedDirs << "examples/declarative/modelviews/webview";
     excludedDirs << "demos/declarative/webbrowser";
 #endif
 
 #ifdef QT_NO_XMLPATTERNS
-    excludedDirs << "examples/declarative/xmldata";
+    excludedDirs << "examples/declarative/xml/xmldata";
     excludedDirs << "demos/declarative/twitter";
     excludedDirs << "demos/declarative/flickr";
     excludedDirs << "demos/declarative/photoviewer";
-- 
cgit v0.12


From 45fe1dd88afb7b82c5fb39bfc4c70bcf16e5c0ea Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Mon, 17 May 2010 16:47:02 +1000
Subject: Don't call pure virtual method in ~QDeclarativeAbstractBinding()

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

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 8043ea9..3e729c2 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -286,7 +286,7 @@ QDeclarativeAbstractBinding::QDeclarativeAbstractBinding()
 
 QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding()
 {
-    removeFromObject();
+    Q_ASSERT(m_prevBinding == 0);
     if (m_mePtr)
         *m_mePtr = 0;
 }
-- 
cgit v0.12


From ca4f1b71faf0113f5030902ee03a39c169847526 Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Mon, 17 May 2010 16:55:11 +1000
Subject: Restructure QDeclarativeAbstractBinding destructor

---
 src/declarative/qml/qdeclarativebinding.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 3e729c2..2e905b9 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -287,12 +287,14 @@ QDeclarativeAbstractBinding::QDeclarativeAbstractBinding()
 QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding()
 {
     Q_ASSERT(m_prevBinding == 0);
-    if (m_mePtr)
-        *m_mePtr = 0;
+    Q_ASSERT(m_mePtr == 0);
 }
 
 void QDeclarativeAbstractBinding::destroy()
 {
+    removeFromObject();
+    clear();
+
     delete this;
 }
 
-- 
cgit v0.12


From 9663e257f28a89f26952f5d3822a343bfe12ee6e Mon Sep 17 00:00:00 2001
From: Aaron Kennedy 
Date: Mon, 17 May 2010 17:03:13 +1000
Subject: Move Q_ENUMS to start of class declaration

---
 src/declarative/graphicsitems/qdeclarativegridview_p.h | 4 ++--
 src/declarative/graphicsitems/qdeclarativelistview_p.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index f5d061d..2bf154c 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -82,6 +82,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeGridView : public QDeclarativeFlickable
 
     Q_ENUMS(HighlightRangeMode)
     Q_ENUMS(SnapMode)
+    Q_ENUMS(Flow)
+    Q_ENUMS(PositionMode)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
@@ -120,7 +122,6 @@ public:
     qreal preferredHighlightEnd() const;
     void setPreferredHighlightEnd(qreal);
 
-    Q_ENUMS(Flow)
     enum Flow { LeftToRight, TopToBottom };
     Flow flow() const;
     void setFlow(Flow);
@@ -142,7 +143,6 @@ public:
     void setSnapMode(SnapMode mode);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain };
-    Q_ENUMS(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(int x, int y) const;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 051455c..d6e8023 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -124,6 +124,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeListView : public QDeclarativeFlickable
     Q_ENUMS(HighlightRangeMode)
     Q_ENUMS(Orientation)
     Q_ENUMS(SnapMode)
+    Q_ENUMS(PositionMode)
     Q_CLASSINFO("DefaultProperty", "data")
 
 public:
@@ -200,7 +201,6 @@ public:
     static QDeclarativeListViewAttached *qmlAttachedProperties(QObject *);
 
     enum PositionMode { Beginning, Center, End, Visible, Contain };
-    Q_ENUMS(PositionMode)
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
     Q_INVOKABLE int indexAt(int x, int y) const;
-- 
cgit v0.12


From 1db36a5a37dcca0e24ada3c852f2647ab2330eee Mon Sep 17 00:00:00 2001
From: Yann Bodson 
Date: Mon, 17 May 2010 16:45:35 +1000
Subject: Move xmldata example into rssnews demo.

---
 .../declarative/rssnews/content/BusyIndicator.qml  |  12 +++
 .../rssnews/content/CategoryDelegate.qml           |  41 ++++++++++
 demos/declarative/rssnews/content/NewsDelegate.qml |  29 +++++++
 demos/declarative/rssnews/content/RssFeeds.qml     |  18 +++++
 demos/declarative/rssnews/content/ScrollBar.qml    |  66 ++++++++++++++++
 demos/declarative/rssnews/content/images/busy.png  | Bin 0 -> 2629 bytes
 .../rssnews/content/images/scrollbar.png           | Bin 0 -> 161 bytes
 demos/declarative/rssnews/rssnews.qml              |  52 +++++++++++++
 .../declarative/xml/xmldata/daringfireball.qml     |  47 ------------
 .../declarative/xml/xmldata/xmldata.qmlproject     |  16 ----
 examples/declarative/xml/xmldata/yahoonews.qml     |  83 ---------------------
 11 files changed, 218 insertions(+), 146 deletions(-)
 create mode 100644 demos/declarative/rssnews/content/BusyIndicator.qml
 create mode 100644 demos/declarative/rssnews/content/CategoryDelegate.qml
 create mode 100644 demos/declarative/rssnews/content/NewsDelegate.qml
 create mode 100644 demos/declarative/rssnews/content/RssFeeds.qml
 create mode 100644 demos/declarative/rssnews/content/ScrollBar.qml
 create mode 100644 demos/declarative/rssnews/content/images/busy.png
 create mode 100644 demos/declarative/rssnews/content/images/scrollbar.png
 create mode 100644 demos/declarative/rssnews/rssnews.qml
 delete mode 100644 examples/declarative/xml/xmldata/daringfireball.qml
 delete mode 100644 examples/declarative/xml/xmldata/xmldata.qmlproject
 delete mode 100644 examples/declarative/xml/xmldata/yahoonews.qml

diff --git a/demos/declarative/rssnews/content/BusyIndicator.qml b/demos/declarative/rssnews/content/BusyIndicator.qml
new file mode 100644
index 0000000..4be59a8
--- /dev/null
+++ b/demos/declarative/rssnews/content/BusyIndicator.qml
@@ -0,0 +1,12 @@
+import Qt 4.7
+
+Image {
+    id: container
+    property bool on: false
+
+    source: "images/busy.png"; visible: container.on
+
+    NumberAnimation on rotation {
+        running: container.on; from: 0; to: 360; loops: Animation.Infinite; duration: 1200
+    }
+}
diff --git a/demos/declarative/rssnews/content/CategoryDelegate.qml b/demos/declarative/rssnews/content/CategoryDelegate.qml
new file mode 100644
index 0000000..1400c36
--- /dev/null
+++ b/demos/declarative/rssnews/content/CategoryDelegate.qml
@@ -0,0 +1,41 @@
+import Qt 4.7
+
+Item {
+    id: delegate
+
+    width: delegate.ListView.view.width; height: 60
+
+    Text {
+        text: name
+        color: delegate.ListView.isCurrentItem ? "white" : "black"
+        font { family: "Helvetica"; pixelSize: 16; bold: true }
+        anchors {
+            left: parent.left; leftMargin: 15
+            verticalCenter: parent.verticalCenter
+        }
+    }
+
+    BusyIndicator {
+        scale: 0.6
+        on: delegate.ListView.isCurrentItem && window.loading
+        anchors { right: parent.right; rightMargin: 10; verticalCenter: parent.verticalCenter }
+    }
+
+    Rectangle {
+        width: delegate.width; height: 1; color: "#cccccc"
+        anchors.bottom: delegate.bottom
+        visible: delegate.ListView.isCurrentItem ? false : true
+    }
+    Rectangle {
+        width: delegate.width; height: 1; color: "white"
+        visible: delegate.ListView.isCurrentItem ? false : true
+    }
+
+    MouseArea {
+        anchors.fill: delegate
+        onClicked: {
+            delegate.ListView.view.currentIndex = index
+            window.currentFeed = feed
+        }
+    }
+}
diff --git a/demos/declarative/rssnews/content/NewsDelegate.qml b/demos/declarative/rssnews/content/NewsDelegate.qml
new file mode 100644
index 0000000..0d03880
--- /dev/null
+++ b/demos/declarative/rssnews/content/NewsDelegate.qml
@@ -0,0 +1,29 @@
+import Qt 4.7
+
+Item {
+    id: delegate
+    height: childrenRect.height + 20
+    width: delegate.ListView.view.width
+
+    Column {
+        x: 20; y: 20
+        width: parent.width - 40
+
+        Text {
+            id: titleText
+            text: title; width: parent.width; wrapMode: Text.WordWrap
+            font { bold: true; family: "Helvetica"; pointSize: 16 }
+        }
+
+        Text {
+            id: descriptionText
+            width: parent.width; text: description
+            wrapMode: Text.WordWrap; font.family: "Helvetica"
+        }
+    }
+
+    Rectangle {
+        width: parent.width; height: 1; color: "#cccccc"
+        anchors.bottom: parent.bottom
+    }
+}
diff --git a/demos/declarative/rssnews/content/RssFeeds.qml b/demos/declarative/rssnews/content/RssFeeds.qml
new file mode 100644
index 0000000..21e59fe
--- /dev/null
+++ b/demos/declarative/rssnews/content/RssFeeds.qml
@@ -0,0 +1,18 @@
+import Qt 4.7
+
+ListModel {
+    id: rssFeeds
+
+    ListElement { name: "Top Stories"; feed: "rss.news.yahoo.com/rss/topstories" }
+    ListElement { name: "World"; feed: "rss.news.yahoo.com/rss/world" }
+    ListElement { name: "Europe"; feed: "rss.news.yahoo.com/rss/europe" }
+    ListElement { name: "Oceania"; feed: "rss.news.yahoo.com/rss/oceania" }
+    ListElement { name: "U.S. National"; feed: "rss.news.yahoo.com/rss/us" }
+    ListElement { name: "Politics"; feed: "rss.news.yahoo.com/rss/politics" }
+    ListElement { name: "Business"; feed: "rss.news.yahoo.com/rss/business" }
+    ListElement { name: "Technology"; feed: "rss.news.yahoo.com/rss/tech" }
+    ListElement { name: "Entertainment"; feed: "rss.news.yahoo.com/rss/entertainment" }
+    ListElement { name: "Health"; feed: "rss.news.yahoo.com/rss/health" }
+    ListElement { name: "Science"; feed: "rss.news.yahoo.com/rss/science" }
+    ListElement { name: "Sports"; feed: "rss.news.yahoo.com/rss/sports" }
+}
diff --git a/demos/declarative/rssnews/content/ScrollBar.qml b/demos/declarative/rssnews/content/ScrollBar.qml
new file mode 100644
index 0000000..d0b08dd
--- /dev/null
+++ b/demos/declarative/rssnews/content/ScrollBar.qml
@@ -0,0 +1,66 @@
+import Qt 4.7
+
+Item {
+    id: container
+
+    property variant scrollArea
+    property variant orientation: Qt.Vertical
+
+    opacity: 0
+
+    function position()
+    {
+        var ny = 0;
+        if (container.orientation == Qt.Vertical)
+            ny = scrollArea.visibleArea.yPosition * container.height;
+        else
+            ny = scrollArea.visibleArea.xPosition * container.width;
+        if (ny > 2) return ny; else return 2;
+    }
+
+    function size()
+    {
+        var nh, ny;
+
+        if (container.orientation == Qt.Vertical)
+            nh = scrollArea.visibleArea.heightRatio * container.height;
+        else
+            nh = scrollArea.visibleArea.widthRatio * container.width;
+
+        if (container.orientation == Qt.Vertical)
+            ny = scrollArea.visibleArea.yPosition * container.height;
+        else
+            ny = scrollArea.visibleArea.xPosition * container.width;
+
+        if (ny > 3) {
+            var t;
+            if (container.orientation == Qt.Vertical)
+                t = Math.ceil(container.height - 3 - ny);
+            else
+                t = Math.ceil(container.width - 3 - ny);
+            if (nh > t) return t; else return nh;
+        } else return nh + ny;
+    }
+
+    Rectangle { anchors.fill: parent; color: "Black"; opacity: 0.3 }
+
+    BorderImage {
+        source: "images/scrollbar.png"
+        border { left: 1; right: 1; top: 1; bottom: 1 }
+        x: container.orientation == Qt.Vertical ? 2 : position()
+        width: container.orientation == Qt.Vertical ? container.width - 4 : size()
+        y: container.orientation == Qt.Vertical ? position() : 2
+        height: container.orientation == Qt.Vertical ? size() : container.height - 4
+    }
+
+    states: State {
+        name: "visible"
+        when: container.orientation == Qt.Vertical ? scrollArea.movingVertically : scrollArea.movingHorizontally
+        PropertyChanges { target: container; opacity: 1.0 }
+    }
+
+    transitions: Transition {
+        from: "visible"; to: ""
+        NumberAnimation { properties: "opacity"; duration: 600 }
+    }
+}
diff --git a/demos/declarative/rssnews/content/images/busy.png b/demos/declarative/rssnews/content/images/busy.png
new file mode 100644
index 0000000..664c2b1
Binary files /dev/null and b/demos/declarative/rssnews/content/images/busy.png differ
diff --git a/demos/declarative/rssnews/content/images/scrollbar.png b/demos/declarative/rssnews/content/images/scrollbar.png
new file mode 100644
index 0000000..0228dcf
Binary files /dev/null and b/demos/declarative/rssnews/content/images/scrollbar.png differ
diff --git a/demos/declarative/rssnews/rssnews.qml b/demos/declarative/rssnews/rssnews.qml
new file mode 100644
index 0000000..29a530f
--- /dev/null
+++ b/demos/declarative/rssnews/rssnews.qml
@@ -0,0 +1,52 @@
+import Qt 4.7
+import "content"
+
+Rectangle {
+    id: window
+    width: 800; height: 480
+
+    property string currentFeed: "rss.news.yahoo.com/rss/topstories"
+    property bool loading: feedModel.status == XmlListModel.Loading
+
+    RssFeeds { id: rssFeeds }
+
+    XmlListModel {
+        id: feedModel
+        source: "http://" + window.currentFeed
+        query: "/rss/channel/item"
+
+        XmlRole { name: "title"; query: "title/string()" }
+        XmlRole { name: "link"; query: "link/string()" }
+        XmlRole { name: "description"; query: "description/string()" }
+    }
+
+    Row {
+        Rectangle {
+            width: 220; height: window.height
+            color: "#efefef"
+
+            ListView {
+                focus: true
+                id: categories
+                anchors.fill: parent
+                model: rssFeeds
+                delegate: CategoryDelegate {}
+                highlight: Rectangle { color: "steelblue" }
+                highlightMoveSpeed: 9999999
+            }
+            ScrollBar {
+                scrollArea: categories; height: categories.height; width: 8
+                anchors.right: categories.right
+            }
+        }
+        ListView {
+            id: list
+            width: window.width - 220; height: window.height
+            model: feedModel
+            delegate: NewsDelegate {}
+        }
+    }
+
+    ScrollBar { scrollArea: list; height: list.height; width: 8; anchors.right: window.right }
+    Rectangle { x: 220; height: window.height; width: 1; color: "#cccccc" }
+}
diff --git a/examples/declarative/xml/xmldata/daringfireball.qml b/examples/declarative/xml/xmldata/daringfireball.qml
deleted file mode 100644
index 480b13c..0000000
--- a/examples/declarative/xml/xmldata/daringfireball.qml
+++ /dev/null
@@ -1,47 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 600; height: 600
-
-    XmlListModel {
-        id: feedModel
-        source: "http://daringfireball.net/index.xml"
-        query: "/feed/entry"
-        namespaceDeclarations: "declare default element namespace 'http://www.w3.org/2005/Atom';"
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "tagline"; query: "author/name/string()" }
-        XmlRole { name: "content"; query: "content/string()" }
-    }
-
-    Component {
-        id: feedDelegate
-        Item {
-            height: childrenRect.height + 20
-            Text {
-                id: titleText
-                x: 10
-                text: title; font.bold: true
-            }
-            Text {
-                anchors { left: titleText.right; leftMargin: 10 }
-                text: 'by ' + tagline
-                font.italic: true
-            }
-            Text {
-                x: 10
-                width: 580
-                anchors.top: titleText.bottom
-                text: content
-                wrapMode: Text.WordWrap
-
-                onLinkActivated: { console.log('link clicked: ' + link) }
-            }
-        }
-    }
-
-    ListView {
-        anchors.fill: parent
-        model: feedModel
-        delegate: feedDelegate
-    }
-}
diff --git a/examples/declarative/xml/xmldata/xmldata.qmlproject b/examples/declarative/xml/xmldata/xmldata.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/xml/xmldata/xmldata.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/xml/xmldata/yahoonews.qml b/examples/declarative/xml/xmldata/yahoonews.qml
deleted file mode 100644
index 5bab463..0000000
--- a/examples/declarative/xml/xmldata/yahoonews.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import Qt 4.7
-
-Rectangle {
-    width: 600; height: 600
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: "black" }
-        GradientStop { position: 1.0; color: "#AAAAAA" }
-    }
-
-    XmlListModel {
-        id: feedModel
-        source: "http://rss.news.yahoo.com/rss/oceania"
-        query: "/rss/channel/item"
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "link"; query: "link/string()" }
-        XmlRole { name: "description"; query: "description/string()" }
-    }
-
-    Component {
-        id: feedDelegate
-
-        Item {
-            id: delegate
-            height: wrapper.height + 10
-
-            MouseArea {
-                anchors.fill: wrapper
-                onPressed: delegate.ListView.view.currentIndex = index;
-                onClicked: if (wrapper.state == 'Details') wrapper.state = ''; else wrapper.state = 'Details';
-            }
-
-            Rectangle {
-                id: wrapper
-
-                width: 580; y: 5; height: titleText.height + 10
-                color: "#F0F0F0"
-                radius: 5
-                
-                Text {
-                    id: titleText
-                    x: 10; y: 5
-                    text: '' + title + ''
-                    font { bold: true; family: "Helvetica"; pointSize: 14 }
-
-                    onLinkActivated: { console.log('link clicked: ' + link) }
-                }
-
-                Text {
-                    id: descriptionText
-                    x: 10; width: 560
-                    anchors.top: titleText.bottom; anchors.topMargin: 5
-                    text: description
-                    wrapMode: Text.WordWrap
-                    font.family: "Helvetica"
-                    opacity: 0
-                }
-
-                states: State {
-                    name: "Details"
-                    PropertyChanges { target: wrapper; height: childrenRect.height + 10 }
-                    PropertyChanges { target: descriptionText; opacity: 1 }
-                }
-
-                transitions: Transition {
-                    from: "*"; to: "Details"; reversible: true
-                    SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing.type: Easing.OutQuad }
-                        NumberAnimation { duration: 200; properties: "opacity" }
-                    }
-                }
-            }
-        }
-    }
-
-    ListView {
-        id: list
-        x: 10; y: 10
-        width: parent.width - 20; height: parent.height - 20
-        model: feedModel
-        delegate: feedDelegate
-    }
-}
-- 
cgit v0.12


From d2246104b4c38cdea4c4c11a7ad715312455f368 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint 
Date: Mon, 17 May 2010 09:37:13 +0200
Subject: Changelog: Added Designer/uic3 changes for 4.7.0.

---
 dist/changes-4.7.0 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 1e3a69c..41fe9d2 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -233,7 +233,16 @@ Qt for Windows CE
 
 
 - Designer
-
+ - [QTBUG-9351] Fixed a bug that caused modified headerview-properties
+   of item views to be duplicated in the UI-file.
+ - [QTBUG-8347] Fixed a layout problem caused by embedded images in the rich
+   text of a QLabel.
+ - [QTBUG-8041], [QTBUG-8213] Fixed a crash related to undo while moving
+   widgets by arrow keys.
+ - [QTBUG-7822] Added support for the 'windowOpacity'-property.
+ - [QTBUG-7764] Fixed the emission of the propertyChanged()-signal of
+   QDesignerPropertyEditorInterface.
+ - [QTBUG-5492] Made widgetbox-filter match on class names, too.
 
 - Linguist
   - Linguist GUI
@@ -251,9 +260,10 @@ Qt for Windows CE
 
 - uic
 
-
 - uic3
 
+ - [QTBUG-9207] Fixed export of image files of type XPM, added
+   compatibility option -limit-xpm-linelength.
 
 - qmake
 
-- 
cgit v0.12


From 25ae30256bd7980ed42a65ab73a4d4395040391a Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Mon, 17 May 2010 10:11:50 +0200
Subject: Optimized pixmapcache key generation for icons and styles

This re-apply commit c8d2e18c4b431870560f324a17f20904bb47ae68
from Jens that was reverted in b0f4dab4 because it did not compile.

Added the missing include to make it compile on mac

Task-number: QTBUG-9850
---
 src/gui/image/qicon.cpp         | 25 ++++++++---------
 src/gui/styles/qgtkpainter.cpp  |  9 ++++--
 src/gui/styles/qstylehelper.cpp | 62 ++++++-----------------------------------
 src/gui/styles/qstylehelper_p.h | 32 +++++++++++++++++++++
 4 files changed, 59 insertions(+), 69 deletions(-)

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 891b1db..7696632 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -55,6 +55,7 @@
 #include "qcache.h"
 #include "qdebug.h"
 #include "private/qguiplatformplugin_p.h"
+#include "private/qstylehelper_p.h"
 
 #ifdef Q_WS_MAC
 #include 
@@ -261,21 +262,17 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height()))
         actualSize.scale(size, Qt::KeepAspectRatio);
 
-    QString key = QLatin1String("$qt_icon_")
-                  + QString::number(pm.cacheKey())
-                  + QString::number(pe->mode)
-                  + QString::number(QApplication::palette().cacheKey())
-                  + QLatin1Char('_')
-                  + QString::number(actualSize.width())
-                  + QLatin1Char('_')
-                  + QString::number(actualSize.height())
-                  + QLatin1Char('_');
-
+    QString key = QLatin1Literal("qt_")
+                  % HexString(pm.cacheKey())
+                  % HexString(pe->mode)
+                  % HexString(QApplication::palette().cacheKey())
+                  % HexString(actualSize.width())
+                  % HexString(actualSize.height());
 
     if (mode == QIcon::Active) {
-        if (QPixmapCache::find(key + QString::number(mode), pm))
+        if (QPixmapCache::find(key % HexString(mode), pm))
             return pm; // horray
-        if (QPixmapCache::find(key + QString::number(QIcon::Normal), pm)) {
+        if (QPixmapCache::find(key % HexString(QIcon::Normal), pm)) {
             QStyleOption opt(0);
             opt.palette = QApplication::palette();
             QPixmap active = QApplication::style()->generatedIconPixmap(QIcon::Active, pm, &opt);
@@ -284,7 +281,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
         }
     }
 
-    if (!QPixmapCache::find(key + QString::number(mode), pm)) {
+    if (!QPixmapCache::find(key % HexString(mode), pm)) {
         if (pm.size() != actualSize)
             pm = pm.scaled(actualSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         if (pe->mode != mode && mode != QIcon::Normal) {
@@ -294,7 +291,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
             if (!generated.isNull())
                 pm = generated;
         }
-        QPixmapCache::insert(key + QString::number(mode), pm);
+        QPixmapCache::insert(key % HexString(mode), pm);
     }
     return pm;
 }
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp
index 1f68f2f..79c53e9 100644
--- a/src/gui/styles/qgtkpainter.cpp
+++ b/src/gui/styles/qgtkpainter.cpp
@@ -47,6 +47,7 @@
 // This class is primarily a wrapper around the gtk painter functions
 // and takes care of converting all such calls into cached Qt pixmaps.
 
+#include 
 #include 
 #include 
 #include 
@@ -155,8 +156,12 @@ static QString uniqueName(const QString &key, GtkStateType state, GtkShadowType
                           const QSize &size, GtkWidget *widget = 0)
 {
     // Note the widget arg should ideally use the widget path, though would compromise performance
-    QString tmp = QString(QLS("%0-%1-%2-%3x%4-%5")).arg(key).arg(uint(state)).arg(shadow)
-                          .arg(size.width()).arg(size.height()).arg(quintptr(widget));
+    QString tmp = key
+                  % HexString(state)
+                  % HexString(shadow)
+                  % HexString(size.width())
+                  % HexString(size.height())
+                  % HexString(quint64(widget));
     return tmp;
 }
 
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index 296c51c..d09d7fa 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -58,67 +58,23 @@
 
 QT_BEGIN_NAMESPACE
 
-// internal helper. Converts an integer value to an unique string token
-template 
-struct HexString
-{
-    inline HexString(const T t)
-        : val(t)
-    {}
-
-    inline void write(QChar *&dest) const
-    {
-        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-        const char *c = reinterpret_cast(&val);
-        for (uint i = 0; i < sizeof(T); ++i) {
-            *dest++ = hexChars[*c & 0xf];
-            *dest++ = hexChars[(*c & 0xf0) >> 4];
-            ++c;
-        }
-    }
-
-    const T val;
-};
-
-// specialization to enable fast concatenating of our string tokens to a string
-template 
-struct QConcatenable >
-{
-    typedef HexString type;
-    enum { ExactSize = true };
-    static int size(const HexString &str) { return sizeof(str.val) * 2; }
-    static inline void appendTo(const HexString &str, QChar *&out) { str.write(out); }
-};
-
 namespace QStyleHelper {
 
 QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size)
 {
     const QStyleOptionComplex *complexOption = qstyleoption_cast(option);
-
-    QString tmp = key
-                  % QLatin1Char('-')
-                  % HexString(option->state)
-                  % QLatin1Char('-')
-                  % HexString(option->direction)
-                  % QLatin1Char('-')
-                  % HexString(complexOption ? uint(complexOption->activeSubControls) : 0u)
-                  % QLatin1Char('-')
-                  % HexString(option->palette.cacheKey())
-                  % QLatin1Char('-')
-                  % HexString(size.width())
-                  % QLatin1Char('x')
-                  % HexString(size.height());
+    QString tmp = key % HexString(option->state)
+                      % HexString(option->direction)
+                      % HexString(complexOption ? uint(complexOption->activeSubControls) : 0u)
+                      % HexString(option->palette.cacheKey())
+                      % HexString(size.width())
+                      % HexString(size.height());
 
 #ifndef QT_NO_SPINBOX
     if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) {
-        tmp = tmp
-              % QLatin1Char('-')
-              % HexString(spinBox->buttonSymbols)
-              % QLatin1Char('-')
-              % HexString(spinBox->stepEnabled)
-              % QLatin1Char('-')
-              % QLatin1Char(spinBox->frame ? '1' : '0');
+        tmp = tmp % HexString(spinBox->buttonSymbols)
+                  % HexString(spinBox->stepEnabled)
+                  % QLatin1Char(spinBox->frame ? '1' : '0'); ;
     }
 #endif // QT_NO_SPINBOX
     return tmp;
diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h
index 31cc4ed..555ad60 100644
--- a/src/gui/styles/qstylehelper_p.h
+++ b/src/gui/styles/qstylehelper_p.h
@@ -41,6 +41,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #ifndef QSTYLEHELPER_P_H
@@ -79,6 +80,37 @@ namespace QStyleHelper
                      int bottom = 0);
 }
 
+// internal helper. Converts an integer value to an unique string token
+template 
+        struct HexString
+{
+    inline HexString(const T t)
+        : val(t)
+    {}
+
+    inline void write(QChar *&dest) const
+    {
+        const ushort hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+        const char *c = reinterpret_cast(&val);
+        for (uint i = 0; i < sizeof(T); ++i) {
+            *dest++ = hexChars[*c & 0xf];
+            *dest++ = hexChars[(*c & 0xf0) >> 4];
+            ++c;
+        }
+    }
+    const T val;
+};
+
+// specialization to enable fast concatenating of our string tokens to a string
+template 
+        struct QConcatenable >
+{
+    typedef HexString type;
+    enum { ExactSize = true };
+    static int size(const HexString &str) { return sizeof(str.val) * 2; }
+    static inline void appendTo(const HexString &str, QChar *&out) { str.write(out); }
+};
+
 QT_END_NAMESPACE
 
 #endif // QSTYLEHELPER_P_H
-- 
cgit v0.12


From cb3d2252eaacf35a5b3c76eaa884ab4b46af74dd Mon Sep 17 00:00:00 2001
From: ck 
Date: Mon, 17 May 2010 15:45:56 +0200
Subject: Compile fixes.

---
 .../qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro    | 13 +++++++++++++
 .../qgraphicslayouts/graphicsLayouts/graphicslayouts.pro    | 13 -------------
 examples/graphicsview/padnavigator/padnavigator.h           |  4 ++++
 src/declarative/qml/qdeclarativeengine_p.h                  |  1 +
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
new file mode 100644
index 0000000..e5d91b2
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+TARGET  = graphicslayouts
+QT += declarative
+
+SOURCES += \
+    graphicslayouts.cpp \
+    main.cpp
+
+HEADERS += \
+    graphicslayouts_p.h
+
+RESOURCES += \
+    graphicslayouts.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
deleted file mode 100644
index e5d91b2..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-TARGET  = graphicslayouts
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    main.cpp
-
-HEADERS += \
-    graphicslayouts_p.h
-
-RESOURCES += \
-    graphicslayouts.qrc
diff --git a/examples/graphicsview/padnavigator/padnavigator.h b/examples/graphicsview/padnavigator/padnavigator.h
index 03a1ea2..d9298ae 100644
--- a/examples/graphicsview/padnavigator/padnavigator.h
+++ b/examples/graphicsview/padnavigator/padnavigator.h
@@ -45,10 +45,14 @@
 #include 
 #include "ui_form.h"
 
+QT_BEGIN_NAMESPACE
+
 class QState;
 class QStateMachine;
 class Ui_Form;
 
+QT_END_NAMESPACE
+
 //! [0]
 class PadNavigator : public QGraphicsView
 {
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 531ac97..0b1c17d 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -91,6 +91,7 @@ class QDeclarativeEngine;
 class QDeclarativeContextPrivate;
 class QDeclarativeExpression;
 class QDeclarativeContextScriptClass;
+class QDeclarativeImportDatabase;
 class QDeclarativeObjectScriptClass;
 class QDeclarativeTypeNameScriptClass;
 class QDeclarativeValueTypeScriptClass;
-- 
cgit v0.12


From 25dd6dfe1c7c78370e7cbb266234f6ec5cf0eb95 Mon Sep 17 00:00:00 2001
From: kh1 
Date: Mon, 17 May 2010 15:56:58 +0200
Subject: Assistant has unnecessary repaints when expand/collapse selected
 node.

Task-number: QTBUG-10575
Reviewed-by: ck
---
 tools/assistant/tools/assistant/contentwindow.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tools/assistant/tools/assistant/contentwindow.cpp b/tools/assistant/tools/assistant/contentwindow.cpp
index e0347c8..8afa1df 100644
--- a/tools/assistant/tools/assistant/contentwindow.cpp
+++ b/tools/assistant/tools/assistant/contentwindow.cpp
@@ -133,11 +133,13 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e)
     if (m_contentWidget && o == m_contentWidget->viewport()
         && e->type() == QEvent::MouseButtonRelease) {
         QMouseEvent *me = static_cast(e);
-        QModelIndex index = m_contentWidget->indexAt(me->pos());
-        QItemSelectionModel *sm = m_contentWidget->selectionModel();
+        const QModelIndex &index = m_contentWidget->indexAt(me->pos());
+        if (!index.isValid())
+            return QWidget::eventFilter(o, e);
 
-        Qt::MouseButtons button = me->button();
-        if (index.isValid() && (sm && sm->isSelected(index))) {
+        const Qt::MouseButtons button = me->button();
+        QItemSelectionModel *sm = m_contentWidget->selectionModel();
+        if (sm->isSelected(index)) {
             if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier))
                 || (button == Qt::MidButton)) {
                 QHelpContentModel *contentModel =
@@ -189,9 +191,11 @@ void ContentWindow::itemClicked(const QModelIndex &index)
         qobject_cast(m_contentWidget->model());
 
     if (contentModel) {
-        QHelpContentItem *itm = contentModel->contentItemAt(index);
-        if (itm)
-            emit linkActivated(itm->url());
+        if (QHelpContentItem *itm = contentModel->contentItemAt(index)) {
+            const QUrl &url = itm->url();
+            if (url != CentralWidget::instance()->currentSource())
+                emit linkActivated(url);
+        }
     }
 }
 
-- 
cgit v0.12


From 6b5a7e8f4f33eaa6b5addca595d58f1dd4a32e7a Mon Sep 17 00:00:00 2001
From: kh1 
Date: Mon, 17 May 2010 15:58:44 +0200
Subject: Print icon in doc pages has no effect.

Task-number: QTBUG-10579
Reviewed-by: ck
---
 tools/assistant/tools/assistant/centralwidget.cpp  | 1 +
 tools/assistant/tools/assistant/helpviewer_qwv.cpp | 1 +
 tools/assistant/tools/assistant/helpviewer_qwv.h   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 2359479..131fb85 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -565,6 +565,7 @@ void CentralWidget::connectSignals()
             SIGNAL(highlighted(QString)));
         connect(viewer, SIGNAL(sourceChanged(QUrl)), this,
             SLOT(setTabTitle(QUrl)));
+        connect(viewer, SIGNAL(printRequested()), this, SLOT(print()));
     }
 }
 
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index adaa45b..244d091 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -269,6 +269,7 @@ HelpViewer::HelpViewer(CentralWidget *parent, qreal zoom)
         SIGNAL(highlighted(QString)));
     connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool)));
+    connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
 
     setFont(viewerFont());
     setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom);
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index a2c0389..2577828 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -100,6 +100,7 @@ Q_SIGNALS:
     void backwardAvailable(bool enabled);
     void highlighted(const QString &);
     void sourceChanged(const QUrl &);
+    void printRequested();
 
 protected:
     virtual void wheelEvent(QWheelEvent *);
-- 
cgit v0.12


From 672c0d15ad07aaffeb7354e9fd8a822ee0d36ac2 Mon Sep 17 00:00:00 2001
From: Laszlo Papp 
Date: Thu, 6 May 2010 08:39:00 +0200
Subject: Fix a small typo in assistant manual: hompage -> homepage

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

diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 7d56ea1..afc6361 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -359,7 +359,7 @@
 
     The \menu{Options} page lets you specify the homepage \QA will display when
     you click the \gui{Home} button in \QA's main user interface. You can specify
-    the hompage by typing it here or clicking on one of the buttons below the
+    the homepage by typing it here or clicking on one of the buttons below the
     textbox. \gui{Current Page} sets the currently displayed page as your home
     page while \gui{Restore to default} will reset your home page to the default
     home page.
-- 
cgit v0.12


From 45791722b9491076a7308a30159eba7309220664 Mon Sep 17 00:00:00 2001
From: Olivier Goffart 
Date: Mon, 17 May 2010 16:48:12 +0200
Subject: Compile with Gcc 4.1

---
 src/gui/styles/qstylehelper_p.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h
index 555ad60..71fce55 100644
--- a/src/gui/styles/qstylehelper_p.h
+++ b/src/gui/styles/qstylehelper_p.h
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifndef QSTYLEHELPER_P_H
 #define QSTYLEHELPER_P_H
-- 
cgit v0.12


From a61d857587b4adbabbeec179117767de99d36be3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint 
Date: Tue, 18 May 2010 10:02:32 +0200
Subject: qmake/MinGw: Link statically.

Reviewed-by: Thierry Bastian 
---
 qmake/Makefile.win32-g++    | 3 ++-
 qmake/Makefile.win32-g++-sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 477203d..e52b8c6 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -27,7 +27,7 @@ CFLAGS	    =	-c -o$@ -O \
 		-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
 		-DQT_BOOTSTRAPPED
 CXXFLAGS    =   $(CFLAGS)
-LFLAGS	    = -static-libgcc -s
+LFLAGS	    = -static-libgcc -static-libstdc++ -s
 LIBS	    = -lole32 -luuid
 LINKQMAKE   =	g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
 ADDCLEAN    =
@@ -326,3 +326,4 @@ qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 
 qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
+
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index 6aac39f..e4e2e6a 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -27,7 +27,7 @@ CFLAGS	    =	-c -o$@ -O \
 		-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
 		-DQT_BOOTSTRAPPED
 CXXFLAGS    =   $(CFLAGS)
-LFLAGS	    = -static-libgcc -s
+LFLAGS	    = -static-libgcc -static-libstdc++ -s
 LIBS	    = -lole32 -luuid
 LINKQMAKE   =	g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
 ADDCLEAN    =
-- 
cgit v0.12