Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

52 files changed, 336 insertions, 239 deletions

diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp
index 8fcab2b..f62f810 100644
--- a/src/declarative/util/qfxperf.cpp
+++ b/src/declarative/util/qfxperf.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qfxperf_p_p.h"
+#include "qfxperf_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qfxperf_p_p.h b/src/declarative/util/qfxperf_p_p.h
index c16bf7b..e3f820c 100644
--- a/src/declarative/util/qfxperf_p_p.h
+++ b/src/declarative/util/qfxperf_p_p.h
@@ -52,7 +52,7 @@
 // We mean it.
 //
 
-#include "private/qperformancelog_p_p.h"
+#include "qperformancelog_p_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 475978f..0f5a0f0 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -40,25 +40,29 @@
 ****************************************************************************/
 
 #include "qmlanimation_p.h"
-#include "qvariant.h"
-#include "qcolor.h"
-#include "qfile.h"
-#include "qmlpropertyvaluesource.h"
-#include "qml.h"
-#include "qmlinfo.h"
 #include "qmlanimation_p_p.h"
-#include <private/qmlbehavior_p.h>
+
+#include "qmlbehavior_p.h"
+#include "qmlstateoperations_p.h"
+
+#include <qmlpropertyvaluesource.h>
+#include <qml.h>
+#include <qmlinfo.h>
+#include <qmlexpression.h>
+#include <qmlstringconverters_p.h>
+#include <qmlglobal_p.h>
+
+#include <qvariant.h>
+#include <qcolor.h>
+#include <qfile.h>
 #include <QParallelAnimationGroup>
 #include <QSequentialAnimationGroup>
 #include <QtCore/qset.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
-#include <qmlexpression.h>
-#include <private/qmlstateoperations_p.h>
-#include <private/qmlstringconverters_p.h>
+
 #include <private/qvariantanimation_p.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 87b6703..707ed33 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -42,15 +42,17 @@
 #ifndef QMLANIMATION_H
 #define QMLANIMATION_H
 
-#include <QtCore/qvariant.h>
-#include <QtCore/QAbstractAnimation>
-#include <QtGui/qcolor.h>
-#include <private/qmltransition_p.h>
+#include "qmltransition_p.h"
+#include "qmlstate_p.h"
+
 #include <qmlpropertyvaluesource.h>
-#include <private/qmlstate_p.h>
 #include <qml.h>
 #include <qmlscriptstring.h>
 
+#include <QtCore/qvariant.h>
+#include <QtCore/QAbstractAnimation>
+#include <QtGui/qcolor.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 326e1c6..0b65c27 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -53,19 +53,23 @@
 // We mean it.
 //
 
-#include <private/qobject_p.h>
-#include <private/qmlnullablevalue_p_p.h>
-#include <private/qvariantanimation_p.h>
+#include "qmlanimation_p.h"
+
+#include "qmlnullablevalue_p_p.h"
+#include "qmltimeline_p_p.h"
+
+#include <qml.h>
+#include <qmlcontext.h>
+
 #include <QtCore/QPauseAnimation>
 #include <QtCore/QVariantAnimation>
 #include <QtCore/QAnimationGroup>
 #include <QtGui/QColor>
-#include <private/qmlanimation_p.h>
-#include <qml.h>
-#include <qmlcontext.h>
-#include <private/qmltimeline_p_p.h>
 #include <QDebug>
 
+#include <private/qobject_p.h>
+#include <private/qvariantanimation_p.h>
+
 QT_BEGIN_NAMESPACE
 
 //interface for classes that provide animation actions for QActionAnimation
@@ -201,14 +205,14 @@ public:
       connectedTimeLine(false), componentComplete(true), startOnCompletion(false),
       target(0), group(0) {}
 
-    bool running;
-    bool paused;
-    bool alwaysRunToEnd;
-    bool repeat;
-    bool connectedTimeLine;
+    bool running:1;
+    bool paused:1;
+    bool alwaysRunToEnd:1;
+    bool repeat:1;
+    bool connectedTimeLine:1;
 
-    bool componentComplete;
-    bool startOnCompletion;
+    bool componentComplete:1;
+    bool startOnCompletion:1;
 
     void commence();
 
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index 23d3838..9757fa2 100644
--- a/src/declarative/util/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
@@ -39,14 +39,18 @@
 **
 ****************************************************************************/
 
-#include <private/qobject_p.h>
-#include <private/qmlanimation_p.h>
-#include <private/qmltransition_p.h>
 #include "qmlbehavior_p.h"
+
+#include "qmlanimation_p.h"
+#include "qmltransition_p.h"
+
 #include <qmlcontext.h>
 #include <qmlinfo.h>
+
 #include <QtCore/qparallelanimationgroup.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QML_DEFINE_TYPE(Qt,4,6,Behavior,QmlBehavior)
diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
index 581a0a8..da3b40f 100644
--- a/src/declarative/util/qmlbehavior_p.h
+++ b/src/declarative/util/qmlbehavior_p.h
@@ -42,10 +42,11 @@
 #ifndef QMLBEHAVIOR_H
 #define QMLBEHAVIOR_H
 
+#include "qmlstate_p.h"
+
 #include <qmlpropertyvaluesource.h>
 #include <qmlpropertyvalueinterceptor.h>
 #include <qml.h>
-#include <private/qmlstate_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index 2f692d8..c68cef2 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -39,16 +39,20 @@
 **
 ****************************************************************************/
 
+#include "qmlbind_p.h"
+
+#include "qmlnullablevalue_p_p.h"
+
 #include <qmlengine.h>
 #include <qmlcontext.h>
-#include <private/qobject_p.h>
+
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptcontext.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlnullablevalue_p_p.h>
-#include "qmlbind_p.h"
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlbind_p.h b/src/declarative/util/qmlbind_p.h
index 4d85698..4d7cd1f 100644
--- a/src/declarative/util/qmlbind_p.h
+++ b/src/declarative/util/qmlbind_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLBIND_H
 #define QMLBIND_H
 
-#include <QtCore/qobject.h>
 #include <qml.h>
 
+#include <QtCore/qobject.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 3e72ab8..f5fbd3f 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -40,12 +40,15 @@
 ****************************************************************************/
 
 #include "qmlconnection_p.h"
+
 #include <qmlexpression.h>
-#include "private/qmlboundsignal_p.h"
-#include "private/qobject_p.h"
+#include <qmlboundsignal_p.h>
 #include <qmlcontext.h>
+
 #include <QtCore/qdebug.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlConnectionPrivate : public QObjectPrivate
diff --git a/src/declarative/util/qmlconnection_p.h b/src/declarative/util/qmlconnection_p.h
index 1bc81fe..52bc247 100644
--- a/src/declarative/util/qmlconnection_p.h
+++ b/src/declarative/util/qmlconnection_p.h
@@ -42,11 +42,12 @@
 #ifndef QMLCONNECTION_H
 #define QMLCONNECTION_H
 
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
 #include <qml.h>
 #include <qmlscriptstring.h>
 
+#include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp
index 983287e..9d216cf 100644
--- a/src/declarative/util/qmldatetimeformatter.cpp
+++ b/src/declarative/util/qmldatetimeformatter.cpp
@@ -40,9 +40,11 @@
 ****************************************************************************/
 
 #include "qmldatetimeformatter_p.h"
-#include "private/qobject_p.h"
+
 #include <QtCore/qlocale.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 //TODO: may need optimisation as the QDateTime member may not be needed?
diff --git a/src/declarative/util/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h
index cd5f75f..c90ee8c 100644
--- a/src/declarative/util/qmldatetimeformatter_p.h
+++ b/src/declarative/util/qmldatetimeformatter_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLDATETIMEFORMATTER_H
 #define QMLDATETIMEFORMATTER_H
 
-#include <QtCore/qdatetime.h>
 #include <qml.h>
 
+#include <QtCore/qdatetime.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index 50758f4..e3153b1 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -40,10 +40,14 @@
 ****************************************************************************/
 
 #include "qmleasefollow_p.h"
+
+#include "qmlanimation_p_p.h"
+
 #include <qmlmetaproperty.h>
-#include <math.h>
+
 #include <QtCore/qdebug.h>
-#include <private/qmlanimation_p_p.h>
+
+#include <math.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmleasefollow_p.h b/src/declarative/util/qmleasefollow_p.h
index 8ea2b8f..ef095a3 100644
--- a/src/declarative/util/qmleasefollow_p.h
+++ b/src/declarative/util/qmleasefollow_p.h
@@ -42,10 +42,11 @@
 #ifndef QMLEASEFOLLOW_H
 #define QMLEASEFOLLOW_H
 
-#include <QtCore/qobject.h>
 #include <qml.h>
 #include <qmlpropertyvaluesource.h>
 
+#include <QtCore/qobject.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index bb26536..8230b1a 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -39,17 +39,20 @@
 **
 ****************************************************************************/
 
-#include "private/qobject_p.h"
 #include "qmlfontloader_p.h"
+
+#include <qmlcontext.h>
+#include <qmlengine.h>
+
 #include <QUrl>
 #include <QDebug>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
-#include <QmlContext>
-#include <qmlengine.h>
 #include <QFontDatabase>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlFontLoaderPrivate : public QObjectPrivate
diff --git a/src/declarative/util/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h
index 0202f3c..aac8a71 100644
--- a/src/declarative/util/qmlfontloader_p.h
+++ b/src/declarative/util/qmlfontloader_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLFONTLOADER_H
 #define QMLFONTLOADER_H
 
-#include <QtCore/qobject.h>
 #include <qml.h>
 
+#include <QtCore/qobject.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp
index 4adec81..1e051b7 100644
--- a/src/declarative/util/qmllistaccessor.cpp
+++ b/src/declarative/util/qmllistaccessor.cpp
@@ -40,12 +40,14 @@
 ****************************************************************************/
 
 #include "qmllistaccessor_p.h"
-#include <QStringList>
+
 #include <qmlmetatype.h>
+
+#include <QStringList>
 #include <QtCore/qdebug.h>
 
 // ### Remove me
-#include <private/qmlengine_p.h>
+#include <qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 8259dcd..00c99f6 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -39,17 +39,20 @@
 **
 ****************************************************************************/
 
+#include "qmllistmodel_p.h"
+
+#include "qmlopenmetaobject_p.h"
+
+#include <qmlcustomparser_p.h>
+#include <qmlparser_p.h>
+#include <qmlengine_p.h>
+#include <qmlcontext.h>
+#include <qmlinfo.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlparser_p.h>
-#include "qmlopenmetaobject_p.h"
-#include <private/qmlengine_p.h>
-#include <qmlcontext.h>
-#include "qmllistmodel_p.h"
 #include <QtScript/qscriptvalueiterator.h>
-#include "qmlinfo.h"
 
 Q_DECLARE_METATYPE(QListModelInterface *)
 
@@ -442,6 +445,7 @@ void QmlListModel::clear()
     _root = 0;
     roleStrings.clear();
     emit itemsRemoved(0,cleared);
+    emit countChanged(0);
 }
 
 /*!
@@ -923,4 +927,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlListElement)
 
-#include "qmllistmodel.moc"
+#include <qmllistmodel.moc>
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index d626060..734d44c 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -42,16 +42,16 @@
 #ifndef QMLLISTMODEL_H
 #define QMLLISTMODEL_H
 
+#include <qml.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QVariant>
-#include <qml.h>
-#include <private/qlistmodelinterface_p.h>
+#include <qlistmodelinterface_p.h>
 #include <QtScript/qscriptvalue.h>
 
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp
index fce35d9..073dc68 100644
--- a/src/declarative/util/qmlnumberformatter.cpp
+++ b/src/declarative/util/qmlnumberformatter.cpp
@@ -40,7 +40,8 @@
 ****************************************************************************/
 
 #include "qmlnumberformatter_p.h"
-#include "private/qobject_p.h"
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
index 346c2f0..71fceb2 100644
--- a/src/declarative/util/qmlnumberformatter_p.h
+++ b/src/declarative/util/qmlnumberformatter_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLNUMBERFORMATTER_H
 #define QMLNUMBERFORMATTER_H
 
+#include "qnumberformat_p.h"
+
 #include <qml.h>
-#include <private/qnumberformat_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp
index 05ff80a..04cd8a5 100644
--- a/src/declarative/util/qmlopenmetaobject.cpp
+++ b/src/declarative/util/qmlopenmetaobject.cpp
@@ -40,7 +40,8 @@
 ****************************************************************************/
 
 #include "qmlopenmetaobject_p.h"
-#include "private/qmetaobjectbuilder_p.h"
+
+#include <qmetaobjectbuilder_p.h>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlopenmetaobject_p.h b/src/declarative/util/qmlopenmetaobject_p.h
index 7a5b4ce..6045678 100644
--- a/src/declarative/util/qmlopenmetaobject_p.h
+++ b/src/declarative/util/qmlopenmetaobject_p.h
@@ -43,9 +43,10 @@
 #define QMLOPENMETAOBJECT_H
 
 #include <QtCore/QMetaObject>
-#include <private/qobject_p.h>
 #include <QtCore/QObject>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
index 6bc1ef9..f9238ca 100644
--- a/src/declarative/util/qmlpackage.cpp
+++ b/src/declarative/util/qmlpackage.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include "private/qobject_p.h"
 #include "qmlpackage_p.h"
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlPackagePrivate : public QObjectPrivate
@@ -151,4 +152,4 @@ QML_DEFINE_TYPE(Qt,4,6,Package,QmlPackage)
 
 QT_END_NAMESPACE
 
-#include "qmlpackage.moc"
+#include <qmlpackage.moc>
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
index b8a9bd7..16e3dc8 100644
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ b/src/declarative/util/qmlpixmapcache.cpp
@@ -40,12 +40,15 @@
 ****************************************************************************/
 
 #include "qmlpixmapcache_p.h"
+
+#include "qfxperf_p_p.h"
+
+#include <qmlengine.h>
+
 #include <QImageReader>
 #include <QHash>
 #include <QNetworkReply>
 #include <QPixmapCache>
-#include <private/qfxperf_p_p.h>
-#include <qmlengine.h>
 #include <QFile>
 #include <QtCore/qdebug.h>
 
@@ -147,59 +150,62 @@ bool QmlPixmapCache::find(const QUrl& url, QPixmap *pixmap)
     QmlPerfTimer<QmlPerf::PixmapLoad> perf;
 #endif
 
-    QString key = url.toString();
     bool ok = true;
-    if (!QPixmapCache::find(key,pixmap)) {
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-        QString lf = toLocalFileOrQrc(url);
-        if (!lf.isEmpty()) {
+    QString lf = toLocalFileOrQrc(url);
+    if (!lf.isEmpty()) {
+        if (!QPixmapCache::find(lf,pixmap)) {
             QFile f(lf);
             if (f.open(QIODevice::ReadOnly)) {
                 if (!readImage(&f, pixmap)) {
                     qWarning() << "Format error loading" << url;
                     *pixmap = QPixmap();
                     ok = false;
+                } else {
+                    QPixmapCache::insert(lf, *pixmap);
+                    ok = !pixmap->isNull();
                 }
             } else {
                 *pixmap = QPixmap();
                 ok = false;
             }
-        } else
+        } else {
+            ok = !pixmap->isNull();
+        }
+        return ok;
+    }
 #endif
-        {
-            QmlGraphicsSharedNetworkReplyHash::Iterator iter = qfxActiveNetworkReplies.find(key);
-            if (iter == qfxActiveNetworkReplies.end()) {
-                // API usage error
-                qWarning() << "QmlPixmapCache: URL not loaded" << url;
+
+    QString key = url.toString();
+    if (!QPixmapCache::find(key,pixmap)) {
+        QmlGraphicsSharedNetworkReplyHash::Iterator iter = qfxActiveNetworkReplies.find(key);
+        if (iter == qfxActiveNetworkReplies.end()) {
+            // API usage error
+            qWarning() << "QmlPixmapCache: URL not loaded" << url;
+            ok = false;
+        } else {
+            if ((*iter)->reply->error()) {
+                qWarning() << "Network error loading" << url << (*iter)->reply->errorString();
+                *pixmap = QPixmap();
+                ok = false;
+            } else if (!readImage((*iter)->reply, pixmap)) {
+                qWarning() << "Format error loading" << url;
+                *pixmap = QPixmap();
                 ok = false;
             } else {
-                if ((*iter)->reply->error()) {
-                    qWarning() << "Network error loading" << url << (*iter)->reply->errorString();
-                    *pixmap = QPixmap();
-                    ok = false;
-                } else if (!readImage((*iter)->reply, pixmap)) {
-                    qWarning() << "Format error loading" << url;
-                    *pixmap = QPixmap();
-                    ok = false;
-                } else {
-                    if ((*iter)->refCount > 1)
-                        (*iter)->pixmap = *pixmap;
-                }
-                (*iter)->release();
+                if ((*iter)->refCount > 1)
+                    (*iter)->pixmap = *pixmap;
             }
+            (*iter)->release();
         }
         QPixmapCache::insert(key, *pixmap);
     } else {
         ok = !pixmap->isNull();
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-        if (url.scheme()!=QLatin1String("file"))
-#endif
+
         // We may be the second finder. Still need to check for active replies.
-        {
-            QmlGraphicsSharedNetworkReplyHash::Iterator iter = qfxActiveNetworkReplies.find(key);
-            if (iter != qfxActiveNetworkReplies.end())
-                (*iter)->release();
-        }
+        QmlGraphicsSharedNetworkReplyHash::Iterator iter = qfxActiveNetworkReplies.find(key);
+        if (iter != qfxActiveNetworkReplies.end())
+            (*iter)->release();
     }
     return ok;
 }
@@ -223,8 +229,7 @@ QNetworkReply *QmlPixmapCache::get(QmlEngine *engine, const QUrl& url, QPixmap *
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
     QString lf = toLocalFileOrQrc(url);
     if (!lf.isEmpty()) {
-        QString key = url.toString();
-        if (!QPixmapCache::find(key,pixmap)) {
+        if (!QPixmapCache::find(lf,pixmap)) {
             bool loaded = true;
             QFile f(lf);
             if (f.open(QIODevice::ReadOnly)) {
@@ -239,7 +244,7 @@ QNetworkReply *QmlPixmapCache::get(QmlEngine *engine, const QUrl& url, QPixmap *
                 loaded = false;
             }
             if (loaded)
-                QPixmapCache::insert(key, *pixmap);
+                QPixmapCache::insert(lf, *pixmap);
             if (ok) *ok = loaded;
         }
         return 0;
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 9ca6db8..b9ec67a 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -39,17 +39,21 @@
 **
 ****************************************************************************/
 
-#include "private/qobject_p.h"
-#include "qmlopenmetaobject_p.h"
 #include "qmlpropertychanges_p.h"
-#include <QtCore/qdebug.h>
+
+#include "qmlopenmetaobject_p.h"
+
 #include <qmlinfo.h>
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlparser_p.h>
+#include <qmlcustomparser_p.h>
+#include <qmlparser_p.h>
 #include <qmlexpression.h>
 #include <qmlbinding.h>
 #include <qmlcontext.h>
 
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h
index 2c0cba9..461730d 100644
--- a/src/declarative/util/qmlpropertychanges_p.h
+++ b/src/declarative/util/qmlpropertychanges_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLPROPERTYCHANGES_H
 #define QMLPROPERTYCHANGES_H
 
-#include <private/qmlstateoperations_p.h>
+#include "qmlstateoperations_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp
index c0e3340..d0a0428 100644
--- a/src/declarative/util/qmlpropertymap.cpp
+++ b/src/declarative/util/qmlpropertymap.cpp
@@ -40,7 +40,9 @@
 ****************************************************************************/
 
 #include "qmlpropertymap.h"
-#include <private/qmlopenmetaobject_p.h>
+
+#include "qmlopenmetaobject_p.h"
+
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp
index d6961b0..29dcf91 100644
--- a/src/declarative/util/qmlspringfollow.cpp
+++ b/src/declarative/util/qmlspringfollow.cpp
@@ -39,12 +39,16 @@
 **
 ****************************************************************************/
 
+#include "qmlspringfollow_p.h"
+
+#include "qmlanimation_p_p.h"
+
+#include <QtCore/qdebug.h>
+
+#include <private/qobject_p.h>
+
 #include <limits.h>
 #include <math.h>
-#include <QtCore/qdebug.h>
-#include "private/qobject_p.h"
-#include "qmlspringfollow_p.h"
-#include "private/qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 5fde89a..98cc0b6 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -39,16 +39,19 @@
 **
 ****************************************************************************/
 
+#include "qmlstate_p_p.h"
+#include "qmlstate_p.h"
+
 #include "qmltransition_p.h"
 #include "qmlstategroup_p.h"
-#include "qmlstate_p_p.h"
-#include "qmlbinding.h"
 #include "qmlstateoperations_p.h"
 #include "qmlanimation_p.h"
 #include "qmlanimation_p_p.h"
-#include "qmlstate_p.h"
+
+#include <qmlbinding.h>
+#include <qmlglobal_p.h>
+
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index 856af8a..33e66d8 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLSTATE_H
 #define QMLSTATE_H
 
-#include <QtCore/qobject.h>
 #include <qml.h>
 
+#include <QtCore/qobject.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h
index 75eb3fd..ee08949 100644
--- a/src/declarative/util/qmlstate_p_p.h
+++ b/src/declarative/util/qmlstate_p_p.h
@@ -53,10 +53,12 @@
 // We mean it.
 //
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
+
+#include "qmlanimation_p_p.h"
+#include "qmltransitionmanager_p_p.h"
+
 #include <private/qobject_p.h>
-#include <private/qmlanimation_p_p.h>
-#include <private/qmltransitionmanager_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index f206f5c..373d457 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -39,13 +39,17 @@
 **
 ****************************************************************************/
 
-#include "private/qobject_p.h"
 #include "qmlstategroup_p.h"
+
 #include "qmltransition_p.h"
 #include "qmlstate_p_p.h"
+
 #include <qmlbinding.h>
+#include <qmlglobal_p.h>
+
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstategroup_p.h b/src/declarative/util/qmlstategroup_p.h
index ddd27d7..82cc504 100644
--- a/src/declarative/util/qmlstategroup_p.h
+++ b/src/declarative/util/qmlstategroup_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLSTATEGROUP_H
 #define QMLSTATEGROUP_H
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 9727ca7..ebbb5ee 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -39,18 +39,21 @@
 **
 ****************************************************************************/
 
-#include <private/qobject_p.h>
+#include "qmlstateoperations_p.h"
+
 #include <qml.h>
 #include <qmlcontext.h>
 #include <qmlexpression.h>
-#include "qmlstateoperations_p.h"
-#include <QtCore/qdebug.h>
 #include <qmlinfo.h>
-#include <private/qmlgraphicsanchors_p_p.h>
-#include <private/qmlgraphicsitem_p.h>
+#include <qmlgraphicsanchors_p_p.h>
+#include <qmlgraphicsitem_p.h>
+
+#include <QtCore/qdebug.h>
 #include <QtGui/qgraphicsitem.h>
 #include <QtCore/qmath.h>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlParentChangePrivate : public QObjectPrivate
@@ -823,8 +826,8 @@ void QmlAnchorChanges::saveCurrentValues()
     d->rewindBaseline = d->target->anchors()->baseline();
 }
 
-#include "qmlstateoperations.moc"
-#include "moc_qmlstateoperations_p.cpp"
+#include <qmlstateoperations.moc>
+#include <moc_qmlstateoperations_p.cpp>
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h
index 589fe20..b03af48 100644
--- a/src/declarative/util/qmlstateoperations_p.h
+++ b/src/declarative/util/qmlstateoperations_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLSTATEOPERATIONS_H
 #define QMLSTATEOPERATIONS_H
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
+
 #include <qmlgraphicsitem.h>
-#include <private/qmlgraphicsanchors_p.h>
+#include <qmlgraphicsanchors_p.h>
 #include <qmlscriptstring.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp
index 4ddc82d..d43a971 100644
--- a/src/declarative/util/qmlsystempalette.cpp
+++ b/src/declarative/util/qmlsystempalette.cpp
@@ -39,10 +39,12 @@
 **
 ****************************************************************************/
 
-#include "private/qobject_p.h"
 #include "qmlsystempalette_p.h"
+
 #include <QApplication>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QmlSystemPalettePrivate : public QObjectPrivate
diff --git a/src/declarative/util/qmlsystempalette_p.h b/src/declarative/util/qmlsystempalette_p.h
index 8ee511a..7c39d4a 100644
--- a/src/declarative/util/qmlsystempalette_p.h
+++ b/src/declarative/util/qmlsystempalette_p.h
@@ -42,8 +42,9 @@
 #ifndef QMLSYSTEMPALETTE_H
 #define QMLSYSTEMPALETTE_H
 
-#include <QtCore/qobject.h>
 #include <qml.h>
+
+#include <QtCore/qobject.h>
 #include <QPalette>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltimeline.cpp b/src/declarative/util/qmltimeline.cpp
index e8695de..130e02d 100644
--- a/src/declarative/util/qmltimeline.cpp
+++ b/src/declarative/util/qmltimeline.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qmltimeline_p_p.h"
+
 #include <QDebug>
 #include <QMutex>
 #include <QThread>
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index 9b54337..046dfe9 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -39,11 +39,13 @@
 **
 ****************************************************************************/
 
-#include "QtCore/qcoreapplication.h"
-#include "QtCore/qpauseanimation.h"
-#include "private/qobject_p.h"
 #include "qmltimer_p.h"
-#include "qdebug.h"
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qpauseanimation.h>
+#include <qdebug.h>
+
+#include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmltimer_p.h b/src/declarative/util/qmltimer_p.h
index 50cae2b..fcd6c84 100644
--- a/src/declarative/util/qmltimer_p.h
+++ b/src/declarative/util/qmltimer_p.h
@@ -42,9 +42,10 @@
 #ifndef QMLTIMER_H
 #define QMLTIMER_H
 
+#include <qml.h>
+
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractanimation.h>
-#include <qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index 204887c..ec92cf9 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -46,6 +46,7 @@
 #include "qmlanimation_p.h"
 #include "qmlanimation_p_p.h"
 #include "qmltransitionmanager_p_p.h"
+
 #include <QParallelAnimationGroup>
 
 QT_BEGIN_NAMESPACE
@@ -71,7 +72,7 @@ class ParallelAnimationWrapper : public QParallelAnimationGroup
 {
     Q_OBJECT
 public:
-    ParallelAnimationWrapper(QObject *parent) : QParallelAnimationGroup(parent) {}
+    ParallelAnimationWrapper(QObject *parent = 0) : QParallelAnimationGroup(parent) {}
     QmlTransitionPrivate *trans;
 protected:
     virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
@@ -96,8 +97,7 @@ public:
 
     void init()
     {
-        Q_Q(QmlTransition);
-        group = new ParallelAnimationWrapper(q);
+        group = new ParallelAnimationWrapper;
         group->trans = this;
     }
 
@@ -146,6 +146,8 @@ QmlTransition::QmlTransition(QObject *parent)
 
 QmlTransition::~QmlTransition()
 {
+    Q_D(QmlTransition);
+    delete d->group;
 }
 
 void QmlTransition::stop()
@@ -257,4 +259,4 @@ QmlList<QmlAbstractAnimation *>* QmlTransition::animations()
 
 QT_END_NAMESPACE
 
-#include "qmltransition.moc"
+#include <qmltransition.moc>
diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
index 1891a6e..3dd0244 100644
--- a/src/declarative/util/qmltransition_p.h
+++ b/src/declarative/util/qmltransition_p.h
@@ -42,10 +42,12 @@
 #ifndef QMLTRANSITION_H
 #define QMLTRANSITION_H
 
-#include <QtCore/qobject.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
+
 #include <qml.h>
 
+#include <QtCore/qobject.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index 1a164c7..8ae5785 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
+#include "qmltransitionmanager_p_p.h"
+
+#include "qmlstate_p_p.h"
+
 #include <qmlbinding.h>
-#include <private/qmltransitionmanager_p_p.h>
-#include <private/qmlstate_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmltransitionmanager_p_p.h b/src/declarative/util/qmltransitionmanager_p_p.h
index 9a05684..c7e609f 100644
--- a/src/declarative/util/qmltransitionmanager_p_p.h
+++ b/src/declarative/util/qmltransitionmanager_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qmlstateoperations_p.h>
+#include "qmlstateoperations_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index afeead2..b5f33f2 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -39,30 +39,31 @@
 **
 ****************************************************************************/
 
-#include "qscriptvalueiterator.h"
-#include "qdebug.h"
-#include "qtimer.h"
-#include "qevent.h"
-#include "qdir.h"
-#include "qcoreapplication.h"
-#include "qfontdatabase.h"
-#include "qicon.h"
-#include "qurl.h"
-#include "qboxlayout.h"
-#include "qbasictimer.h"
-
-#include "qml.h"
-#include "qmlgraphicsitem.h"
-#include "private/qperformancelog_p_p.h"
-#include "private/qfxperf_p_p.h"
-
 #include "qmlview.h"
+
+#include "qperformancelog_p_p.h"
+#include "qfxperf_p_p.h"
+
+#include <qml.h>
+#include <qmlgraphicsitem.h>
 #include <qmlengine.h>
 #include <qmlcontext.h>
-#include <private/qmldebug_p.h>
-#include <private/qmldebugservice_p.h>
+#include <qmldebug_p.h>
+#include <qmldebugservice_p.h>
+#include <qmlglobal_p.h>
+
+#include <qscriptvalueiterator.h>
+#include <qdebug.h>
+#include <qtimer.h>
+#include <qevent.h>
+#include <qdir.h>
+#include <qcoreapplication.h>
+#include <qfontdatabase.h>
+#include <qicon.h>
+#include <qurl.h>
+#include <qboxlayout.h>
+#include <qbasictimer.h>
 #include <QtCore/qabstractanimation.h>
-#include <private/qmlglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp
index 2dfffbf..6f8da9c 100644
--- a/src/declarative/util/qmlxmllistmodel.cpp
+++ b/src/declarative/util/qmlxmllistmodel.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include "qmlxmllistmodel_p.h"
-#include "private/qobject_p.h"
 
 #include <qmlcontext.h>
 #include <qmlengine.h>
+
 #include <QDebug>
 #include <QApplication>
 #include <QThread>
@@ -56,6 +56,8 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
+#include <private/qobject_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QML_DEFINE_TYPE(Qt,4,6,XmlRole,QmlXmlListModelRole)
@@ -716,4 +718,4 @@ void QmlXmlListModel::queryCompleted(int id, int size)
 
 QT_END_NAMESPACE
 
-#include "qmlxmllistmodel.moc"
+#include <qmlxmllistmodel.moc>
diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 2fa1be8..e645740 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -43,9 +43,10 @@
 #define QMLXMLLISTMODEL_H
 
 #include <qml.h>
-#include <private/qlistmodelinterface_p.h>
 #include <qmlinfo.h>
 
+#include <qlistmodelinterface_p.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h
index be3dfce..c73ef8a 100644
--- a/src/declarative/util/qnumberformat_p.h
+++ b/src/declarative/util/qnumberformat_p.h
@@ -43,6 +43,7 @@
 #define NUMBERFORMAT_H 
 
 #include <qml.h>
+
 #include <QtCore/QLocale>
 #include <QtCore/QTime>
 
diff --git a/src/declarative/util/qperformancelog.cpp b/src/declarative/util/qperformancelog.cpp
index ff2f42e..2f91dfb 100644
--- a/src/declarative/util/qperformancelog.cpp
+++ b/src/declarative/util/qperformancelog.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qperformancelog_p_p.h"
+
 #include <QHash>
 #include <QDebug>
 
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index d2faec9..b3418c7 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,68 +1,70 @@
+INCLUDEPATH += $$PWD
+
 SOURCES += \
-           util/qmlview.cpp \
-           util/qfxperf.cpp \
-           util/qperformancelog.cpp \
-           util/qmlconnection.cpp \
-           util/qmlpackage.cpp \
-           util/qmlanimation.cpp \
-           util/qmlsystempalette.cpp \
-           util/qmlspringfollow.cpp \
-           util/qmleasefollow.cpp \
-           util/qmlstate.cpp\
-           util/qmltransitionmanager.cpp \
-           util/qmlstateoperations.cpp \
-           util/qmlpropertychanges.cpp \
-           util/qmlstategroup.cpp \
-           util/qmltransition.cpp \
-           util/qmllistmodel.cpp\
-           util/qmllistaccessor.cpp \
-           util/qmlopenmetaobject.cpp \
-           util/qmltimeline.cpp \
-           util/qmltimer.cpp \
-           util/qmlbind.cpp \
-           util/qmlpropertymap.cpp \
-           util/qmlpixmapcache.cpp \
-           util/qnumberformat.cpp \
-           util/qmlnumberformatter.cpp \
-           util/qmldatetimeformatter.cpp \
-           util/qmlbehavior.cpp \
-           util/qmlfontloader.cpp
+    $$PWD/qmlview.cpp \
+    $$PWD/qfxperf.cpp \
+    $$PWD/qperformancelog.cpp \
+    $$PWD/qmlconnection.cpp \
+    $$PWD/qmlpackage.cpp \
+    $$PWD/qmlanimation.cpp \
+    $$PWD/qmlsystempalette.cpp \
+    $$PWD/qmlspringfollow.cpp \
+    $$PWD/qmleasefollow.cpp \
+    $$PWD/qmlstate.cpp\
+    $$PWD/qmltransitionmanager.cpp \
+    $$PWD/qmlstateoperations.cpp \
+    $$PWD/qmlpropertychanges.cpp \
+    $$PWD/qmlstategroup.cpp \
+    $$PWD/qmltransition.cpp \
+    $$PWD/qmllistmodel.cpp\
+    $$PWD/qmllistaccessor.cpp \
+    $$PWD/qmlopenmetaobject.cpp \
+    $$PWD/qmltimeline.cpp \
+    $$PWD/qmltimer.cpp \
+    $$PWD/qmlbind.cpp \
+    $$PWD/qmlpropertymap.cpp \
+    $$PWD/qmlpixmapcache.cpp \
+    $$PWD/qnumberformat.cpp \
+    $$PWD/qmlnumberformatter.cpp \
+    $$PWD/qmldatetimeformatter.cpp \
+    $$PWD/qmlbehavior.cpp \
+    $$PWD/qmlfontloader.cpp
 
 HEADERS += \
-           util/qmlview.h \
-           util/qfxperf_p_p.h \
-           util/qperformancelog_p_p.h \
-           util/qmlconnection_p.h \
-           util/qmlpackage_p.h \
-           util/qmlanimation_p.h \
-           util/qmlanimation_p_p.h \
-           util/qmlsystempalette_p.h \
-           util/qmlspringfollow_p.h \
-           util/qmleasefollow_p.h \
-           util/qmlstate_p.h\
-           util/qmlstateoperations_p.h \
-           util/qmlpropertychanges_p.h \
-           util/qmlstate_p_p.h\
-           util/qmltransitionmanager_p_p.h \
-           util/qmlstategroup_p.h \
-           util/qmltransition_p.h \
-           util/qmllistmodel_p.h\
-           util/qmllistaccessor_p.h \
-           util/qmlopenmetaobject_p.h \
-           util/qmlnullablevalue_p_p.h \
-           util/qmltimeline_p_p.h \
-           util/qmltimer_p.h \
-           util/qmlbind_p.h \
-           util/qmlpropertymap.h \
-           util/qmlpixmapcache_p.h \
-           util/qnumberformat_p.h \
-           util/qmlnumberformatter_p.h \
-           util/qmldatetimeformatter_p.h \
-           util/qmlbehavior_p.h \
-           util/qmlfontloader_p.h
+    $$PWD/qmlview.h \
+    $$PWD/qfxperf_p_p.h \
+    $$PWD/qperformancelog_p_p.h \
+    $$PWD/qmlconnection_p.h \
+    $$PWD/qmlpackage_p.h \
+    $$PWD/qmlanimation_p.h \
+    $$PWD/qmlanimation_p_p.h \
+    $$PWD/qmlsystempalette_p.h \
+    $$PWD/qmlspringfollow_p.h \
+    $$PWD/qmleasefollow_p.h \
+    $$PWD/qmlstate_p.h\
+    $$PWD/qmlstateoperations_p.h \
+    $$PWD/qmlpropertychanges_p.h \
+    $$PWD/qmlstate_p_p.h\
+    $$PWD/qmltransitionmanager_p_p.h \
+    $$PWD/qmlstategroup_p.h \
+    $$PWD/qmltransition_p.h \
+    $$PWD/qmllistmodel_p.h\
+    $$PWD/qmllistaccessor_p.h \
+    $$PWD/qmlopenmetaobject_p.h \
+    $$PWD/qmlnullablevalue_p_p.h \
+    $$PWD/qmltimeline_p_p.h \
+    $$PWD/qmltimer_p.h \
+    $$PWD/qmlbind_p.h \
+    $$PWD/qmlpropertymap.h \
+    $$PWD/qmlpixmapcache_p.h \
+    $$PWD/qnumberformat_p.h \
+    $$PWD/qmlnumberformatter_p.h \
+    $$PWD/qmldatetimeformatter_p.h \
+    $$PWD/qmlbehavior_p.h \
+    $$PWD/qmlfontloader_p.h
 
 contains(QT_CONFIG, xmlpatterns) {
     QT+=xmlpatterns
-    SOURCES += util/qmlxmllistmodel.cpp
-    HEADERS += util/qmlxmllistmodel_p.h
+    SOURCES += $$PWD/qmlxmllistmodel.cpp
+    HEADERS += $$PWD/qmlxmllistmodel_p.h
 }