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

36 files changed, 61 insertions, 61 deletions

diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h
index bb7ae24..2c03aad 100644
--- a/src/declarative/qml/qml.h
+++ b/src/declarative/qml/qml.h
@@ -46,11 +46,11 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlmetaproperty.h>
-#include <QtDeclarative/qmlparserstatus.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmllist.h>
+#include <qmlmetatype.h>
+#include <qmlmetaproperty.h>
+#include <qmlparserstatus.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmllist.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h
index 8814e77..8fbe441 100644
--- a/src/declarative/qml/qmlbinding.h
+++ b/src/declarative/qml/qmlbinding.h
@@ -43,9 +43,9 @@
 #define QMLBINDING_H
 
 #include <QtCore/QObject>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qml.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmlexpression.h>
 #include <QtCore/QMetaProperty>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h
index e4de239..30a31ab 100644
--- a/src/declarative/qml/qmlbinding_p.h
+++ b/src/declarative/qml/qmlbinding_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qmlbinding.h>
-#include <QtDeclarative/qmlmetaproperty.h>
+#include <qmlbinding.h>
+#include <qmlmetaproperty.h>
 #include "qmlexpression_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h
index 5a00eb2..2cdc07d 100644
--- a/src/declarative/qml/qmlbindingoptimizations_p.h
+++ b/src/declarative/qml/qmlbindingoptimizations_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <private/qmlexpression_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h
index 35679fd..e801892 100644
--- a/src/declarative/qml/qmlboundsignal_p.h
+++ b/src/declarative/qml/qmlboundsignal_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlexpression.h>
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 81ebd86..2cb44a3 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -69,7 +69,7 @@
 #include <private/qmlexpression_p.h>
 #include "qmlmetaproperty_p.h"
 #include "qmlrewrite_p.h"
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
 #include <private/qmlglobal_p.h>
 
 #include "qmlscriptparser_p.h"
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index 51c165e..8f28ac9 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -55,8 +55,8 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qset.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qml.h>
+#include <qmlerror.h>
 #include <private/qmlinstruction_p.h>
 #include <private/qmlcompositetypemanager_p.h>
 #include <private/qmlparser_p.h>
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index bfb4d53..835bdc5 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -45,8 +45,8 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtScript/qscriptvalue.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qml.h>
+#include <qmlerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index e69f541..61a8a10 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -60,9 +60,9 @@
 #include <private/qmlengine_p.h>
 #include <private/qmlcompositetypemanager_p.h>
 #include <private/qbitfield_p.h>
-#include <QtDeclarative/qmlerror.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qml.h>
+#include <qmlerror.h>
+#include <qmlcomponent.h>
+#include <qml.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index 3c4982b..7dbe788 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -42,12 +42,12 @@
 #include <private/qmlcompositetypedata_p.h>
 #include <private/qmlcompositetypemanager_p.h>
 #include <private/qmlscriptparser_p.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
 #include <QtNetwork/qnetworkreply.h>
 #include <private/qmlengine_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qfile.h>
-#include <QtDeclarative/qmlcomponent.h>
+#include <qmlcomponent.h>
 #include <private/qmlcomponent_p.h>
 #include <private/qmlcompiler_p.h>
 
diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h
index af028df..0abbfb5 100644
--- a/src/declarative/qml/qmlcompositetypemanager_p.h
+++ b/src/declarative/qml/qmlcompositetypemanager_p.h
@@ -56,8 +56,8 @@
 #include <QtCore/qglobal.h>
 #include <private/qmlscriptparser_p.h>
 #include <private/qmlrefcount_p.h>
-#include <QtDeclarative/qmlerror.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlerror.h>
+#include <qmlengine.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 105c673..42f467b 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -49,7 +49,7 @@
 #include <QtCore/qdebug.h>
 #include <private/qmlbindingoptimizations_p.h>
 #include <private/qscriptdeclarativeclass_p.h>
-#include <QtDeclarative/qmlinfo.h>
+#include <qmlinfo.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h
index 22d981f..a9c25a3 100644
--- a/src/declarative/qml/qmlcontext_p.h
+++ b/src/declarative/qml/qmlcontext_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlcontext.h>
 #include <private/qobject_p.h>
 #include <private/qmldeclarativedata_p.h>
 #include <QtCore/qhash.h>
diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h
index 74bed25..88a264f 100644
--- a/src/declarative/qml/qmlcustomparser_p.h
+++ b/src/declarative/qml/qmlcustomparser_p.h
@@ -55,8 +55,8 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
-#include <QtDeclarative/qmlmetatype.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlmetatype.h>
+#include <qmlerror.h>
 #include <private/qmlparser_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h
index 250307f..ad28d0d 100644
--- a/src/declarative/qml/qmldom.h
+++ b/src/declarative/qml/qmldom.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 53febf5..b6f3bde 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -86,7 +86,7 @@
 #include <private/qmlsqldatabase_p.h>
 #include <private/qmltypenamescriptclass_p.h>
 #include <private/qmllistscriptclass_p.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
 #include <private/qmlglobal_p.h>
 #include <QtCore/qcryptographichash.h>
 
@@ -1154,7 +1154,7 @@ QmlEnginePrivate::Imports::~Imports()
         delete d;
 }
 
-#include <QtDeclarative/qmlmetatype.h>
+#include <qmlmetatype.h>
 #include <private/qmltypenamecache_p.h>
 static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache)
 {
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 5b4e884..2e880bb 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -64,12 +64,12 @@
 #include <private/qmlclassfactory_p.h>
 #include <private/qmlcompositetypemanager_p.h>
 #include <private/qpodvector_p.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
 #include <private/qmlbasicscript_p.h>
 #include <private/qmlvaluetype_p.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlcontext.h>
+#include <qmlengine.h>
+#include <qmlexpression.h>
 #include <QtScript/qscriptengine.h>
 #include <private/qmlmetaproperty_p.h>
 #include <private/qmlpropertycache_p.h>
diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 3813d20..78b166e 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -43,8 +43,8 @@
 #include "qmlboundsignal_p.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
-#include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qmlmetatype.h>
+#include <qmlengine.h>
+#include <qmlmetatype.h>
 #include <qmlmetaproperty.h>
 #include <qmlbinding.h>
 #include "qmlcontext_p.h"
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index 9b123be..cbea58a 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index 9a19b80..7a194e0 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlinfo.h"
 #include <private/qmldeclarativedata_p.h>
-#include <QtDeclarative/qmlcontext.h>
+#include <qmlcontext.h>
 #include <QtGui/qapplication.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp
index d1927b3..1103ef2 100644
--- a/src/declarative/qml/qmlintegercache.cpp
+++ b/src/declarative/qml/qmlintegercache.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlintegercache_p.h"
 #include <private/qmlengine_p.h>
-#include <QtDeclarative/qmlmetatype.h>
+#include <qmlmetatype.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h
index c631d9e..e51b078 100644
--- a/src/declarative/qml/qmllist.h
+++ b/src/declarative/qml/qmllist.h
@@ -42,7 +42,7 @@
 #ifndef QMLLIST_H
 #define QMLLIST_H
 
-#include <QtDeclarative/qmlprivate.h>
+#include <qmlprivate.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 4ad9aac..8bde318 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -50,7 +50,7 @@
 #include "qmlboundsignal_p.h"
 #include <math.h>
 #include <QtCore/qdebug.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
 #include <private/qmlengine_p.h>
 #include <private/qmldeclarativedata_p.h>
 
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 1f493f8..9a17c34 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -45,10 +45,10 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qbitarray.h>
-#include <QtDeclarative/qmlprivate.h>
-#include <QtDeclarative/qmlparserstatus.h>
-#include <QtDeclarative/qmlpropertyvaluesource.h>
-#include <QtDeclarative/qmlpropertyvalueinterceptor.h>
+#include <qmlprivate.h>
+#include <qmlparserstatus.h>
+#include <qmlpropertyvaluesource.h>
+#include <qmlpropertyvalueinterceptor.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp
index c5641e5..1a6f724 100644
--- a/src/declarative/qml/qmlobjectscriptclass.cpp
+++ b/src/declarative/qml/qmlobjectscriptclass.cpp
@@ -46,7 +46,7 @@
 #include <private/qmldeclarativedata_p.h>
 #include <private/qmltypenamescriptclass_p.h>
 #include <private/qmllistscriptclass_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
 #include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 4f080e5..2ece51f 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -56,7 +56,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
 #include <QtCore/qstring.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
 #include <private/qmlrefcount_p.h>
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index 339bdef..b7a5fad 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlpropertycache_p.h"
 #include <private/qmlengine_p.h>
-#include <QtDeclarative/qmlbinding.h>
+#include <qmlbinding.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h
index 8ab3b6c..7f9163c 100644
--- a/src/declarative/qml/qmlproxymetaobject_p.h
+++ b/src/declarative/qml/qmlproxymetaobject_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/QObject>
 #include <private/qmetaobjectbuilder_p.h>
 #include <private/qobject_p.h>
-#include <QtDeclarative/qml.h>
+#include <qml.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index d4cdeda..cb3e9e9 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -54,7 +54,7 @@
 
 #include <QtCore/QList>
 #include <QtCore/QUrl>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
 #include "qmlparser_p.h"
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index 01d0590..c7d2e12 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
 #include <private/qmlengine_p.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h
index e7566f9..2af261d 100644
--- a/src/declarative/qml/qmlvaluetype_p.h
+++ b/src/declarative/qml/qmlvaluetype_p.h
@@ -62,7 +62,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QmlValueType : public QObject
+class Q_DECLARATIVE_EXPORT QmlValueType : public QObject
 {
     Q_OBJECT
 public:
@@ -73,7 +73,7 @@ public:
     virtual void setValue(QVariant) = 0;
 };
 
-class Q_AUTOTEST_EXPORT QmlValueTypeFactory
+class Q_DECLARATIVE_EXPORT QmlValueTypeFactory
 {
 public:
     QmlValueTypeFactory();
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index f3d0f65..da09288 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -67,7 +67,7 @@
 #include <private/qmlbinding_p.h>
 #include <private/qmlcontext_p.h>
 #include <private/qmlbindingoptimizations_p.h>
-#include <QtDeclarative/qmlscriptstring.h>
+#include <qmlscriptstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h
index ab58b6a..a15bd08 100644
--- a/src/declarative/qml/qmlvme_p.h
+++ b/src/declarative/qml/qmlvme_p.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QStack>
-#include <QtDeclarative/qmlerror.h>
+#include <qmlerror.h>
 #include <private/qbitfield_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h
index f2ee09b..f78cfaa 100644
--- a/src/declarative/qml/qmlvmemetaobject_p.h
+++ b/src/declarative/qml/qmlvmemetaobject_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qml.h>
+#include <qml.h>
 #include <QtCore/QMetaObject>
 #include <QtCore/QBitArray>
 #include <QtCore/QPair>
diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp
index 2737bf9..889ac78 100644
--- a/src/declarative/qml/qmlwatcher.cpp
+++ b/src/declarative/qml/qmlwatcher.cpp
@@ -41,10 +41,10 @@
 
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qdebug.h>
-#include <QtDeclarative/qmlexpression.h>
+#include <qmlexpression.h>
 #include <private/qmldebugservice_p.h>
-#include <QtDeclarative/qmlcontext.h>
-#include <QtDeclarative/qml.h>
+#include <qmlcontext.h>
+#include <qml.h>
 
 #include "qmlwatcher_p.h"
 
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index 1e9ad50..0a774e6 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore/qobject.h>
-#include <QtDeclarative/qmlengine.h>
+#include <qmlengine.h>
 #include <private/qmlengine_p.h>
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptcontext.h>