Remove include styles that rely on configure.

May help modularization (syncqt and configure are Qt-specific).

32 files changed, 51 insertions, 51 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..c78deb0 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -47,7 +47,7 @@
 #include "qml.h"
 #include "qmlinfo.h"
 #include "qmlanimation_p_p.h"
-#include <private/qmlbehavior_p.h>
+#include "qmlbehavior_p.h"
 #include <QParallelAnimationGroup>
 #include <QSequentialAnimationGroup>
 #include <QtCore/qset.h>
@@ -55,10 +55,10 @@
 #include <QtCore/qpoint.h>
 #include <QtCore/qsize.h>
 #include <qmlexpression.h>
-#include <private/qmlstateoperations_p.h>
-#include <private/qmlstringconverters_p.h>
+#include "qmlstateoperations_p.h"
+#include "qmlstringconverters_p.h"
 #include <private/qvariantanimation_p.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 87b6703..ea48c19 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -45,9 +45,9 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/QAbstractAnimation>
 #include <QtGui/qcolor.h>
-#include <private/qmltransition_p.h>
+#include "qmltransition_p.h"
 #include <qmlpropertyvaluesource.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <qml.h>
 #include <qmlscriptstring.h>
 
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index 326e1c6..c1fe239 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -54,16 +54,16 @@
 //
 
 #include <private/qobject_p.h>
-#include <private/qmlnullablevalue_p_p.h>
+#include "qmlnullablevalue_p_p.h"
 #include <private/qvariantanimation_p.h>
 #include <QtCore/QPauseAnimation>
 #include <QtCore/QVariantAnimation>
 #include <QtCore/QAnimationGroup>
 #include <QtGui/QColor>
-#include <private/qmlanimation_p.h>
+#include "qmlanimation_p.h"
 #include <qml.h>
 #include <qmlcontext.h>
-#include <private/qmltimeline_p_p.h>
+#include "qmltimeline_p_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp
index 23d3838..10de9fc 100644
--- a/src/declarative/util/qmlbehavior.cpp
+++ b/src/declarative/util/qmlbehavior.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <private/qobject_p.h>
-#include <private/qmlanimation_p.h>
-#include <private/qmltransition_p.h>
+#include "qmlanimation_p.h"
+#include "qmltransition_p.h"
 #include "qmlbehavior_p.h"
 #include <qmlcontext.h>
 #include <qmlinfo.h>
diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h
index 581a0a8..b6426a3 100644
--- a/src/declarative/util/qmlbehavior_p.h
+++ b/src/declarative/util/qmlbehavior_p.h
@@ -45,7 +45,7 @@
 #include <qmlpropertyvaluesource.h>
 #include <qmlpropertyvalueinterceptor.h>
 #include <qml.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index 2f692d8..ae0a2a6 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -47,7 +47,7 @@
 #include <QtScript/qscriptvalue.h>
 #include <QtScript/qscriptcontext.h>
 #include <QtScript/qscriptengine.h>
-#include <private/qmlnullablevalue_p_p.h>
+#include "qmlnullablevalue_p_p.h"
 #include "qmlbind_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 3e72ab8..59798a2 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -41,7 +41,7 @@
 
 #include "qmlconnection_p.h"
 #include <qmlexpression.h>
-#include "private/qmlboundsignal_p.h"
+#include "qmlboundsignal_p.h"
 #include "private/qobject_p.h"
 #include <qmlcontext.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp
index b326f63..5e81117 100644
--- a/src/declarative/util/qmleasefollow.cpp
+++ b/src/declarative/util/qmleasefollow.cpp
@@ -43,7 +43,7 @@
 #include <qmlmetaproperty.h>
 #include <math.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlanimation_p_p.h>
+#include "qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index bb26536..ba06e19 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -46,7 +46,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
-#include <QmlContext>
+#include <qmlcontext.h>
 #include <qmlengine.h>
 #include <QFontDatabase>
 
diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp
index 4adec81..8c7e80a 100644
--- a/src/declarative/util/qmllistaccessor.cpp
+++ b/src/declarative/util/qmllistaccessor.cpp
@@ -45,7 +45,7 @@
 #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..2ba4c35 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -42,10 +42,10 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qstack.h>
 #include <QXmlStreamReader>
-#include <private/qmlcustomparser_p.h>
-#include <private/qmlparser_p.h>
+#include "qmlcustomparser_p.h"
+#include "qmlparser_p.h"
 #include "qmlopenmetaobject_p.h"
-#include <private/qmlengine_p.h>
+#include "qmlengine_p.h"
 #include <qmlcontext.h>
 #include "qmllistmodel_p.h"
 #include <QtScript/qscriptvalueiterator.h>
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index d626060..7354296 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -48,7 +48,7 @@
 #include <QtCore/QList>
 #include <QtCore/QVariant>
 #include <qml.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include <QtScript/qscriptvalue.h>
 
 
diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h
index 346c2f0..98e5b92 100644
--- a/src/declarative/util/qmlnumberformatter_p.h
+++ b/src/declarative/util/qmlnumberformatter_p.h
@@ -43,7 +43,7 @@
 #define QMLNUMBERFORMATTER_H
 
 #include <qml.h>
-#include <private/qnumberformat_p.h>
+#include "qnumberformat_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp
index 05ff80a..1bbfbda 100644
--- a/src/declarative/util/qmlopenmetaobject.cpp
+++ b/src/declarative/util/qmlopenmetaobject.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qmlopenmetaobject_p.h"
-#include "private/qmetaobjectbuilder_p.h"
+#include "qmetaobjectbuilder_p.h"
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
index b8a9bd7..49825db 100644
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ b/src/declarative/util/qmlpixmapcache.cpp
@@ -44,7 +44,7 @@
 #include <QHash>
 #include <QNetworkReply>
 #include <QPixmapCache>
-#include <private/qfxperf_p_p.h>
+#include "qfxperf_p_p.h"
 #include <qmlengine.h>
 #include <QFile>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index 9ca6db8..532cc2d 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -44,8 +44,8 @@
 #include "qmlpropertychanges_p.h"
 #include <QtCore/qdebug.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>
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..0c398fd 100644
--- a/src/declarative/util/qmlpropertymap.cpp
+++ b/src/declarative/util/qmlpropertymap.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #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..ffecad0 100644
--- a/src/declarative/util/qmlspringfollow.cpp
+++ b/src/declarative/util/qmlspringfollow.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/qdebug.h>
 #include "private/qobject_p.h"
 #include "qmlspringfollow_p.h"
-#include "private/qmlanimation_p_p.h"
+#include "qmlanimation_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 5fde89a..a55308e 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -48,7 +48,7 @@
 #include "qmlanimation_p_p.h"
 #include "qmlstate_p.h"
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h
index 75eb3fd..5d3a7dd 100644
--- a/src/declarative/util/qmlstate_p_p.h
+++ b/src/declarative/util/qmlstate_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <private/qobject_p.h>
-#include <private/qmlanimation_p_p.h>
-#include <private/qmltransitionmanager_p_p.h>
+#include "qmlanimation_p_p.h"
+#include "qmltransitionmanager_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index f206f5c..f6a0d1a 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -45,7 +45,7 @@
 #include "qmlstate_p_p.h"
 #include <qmlbinding.h>
 #include <QtCore/qdebug.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_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..560c86b 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -46,8 +46,8 @@
 #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 <QtGui/qgraphicsitem.h>
 #include <QtCore/qmath.h>
 
diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h
index 589fe20..9e9dbd1 100644
--- a/src/declarative/util/qmlstateoperations_p.h
+++ b/src/declarative/util/qmlstateoperations_p.h
@@ -42,9 +42,9 @@
 #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/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
index 1891a6e..ebc8b79 100644
--- a/src/declarative/util/qmltransition_p.h
+++ b/src/declarative/util/qmltransition_p.h
@@ -43,7 +43,7 @@
 #define QMLTRANSITION_H
 
 #include <QtCore/qobject.h>
-#include <private/qmlstate_p.h>
+#include "qmlstate_p.h"
 #include <qml.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp
index 1a164c7..da9a0dd 100644
--- a/src/declarative/util/qmltransitionmanager.cpp
+++ b/src/declarative/util/qmltransitionmanager.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include <qmlbinding.h>
-#include <private/qmltransitionmanager_p_p.h>
-#include <private/qmlstate_p_p.h>
+#include "qmltransitionmanager_p_p.h"
+#include "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..dc14730 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -53,16 +53,16 @@
 
 #include "qml.h"
 #include "qmlgraphicsitem.h"
-#include "private/qperformancelog_p_p.h"
-#include "private/qfxperf_p_p.h"
+#include "qperformancelog_p_p.h"
+#include "qfxperf_p_p.h"
 
 #include "qmlview.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 <QtCore/qabstractanimation.h>
-#include <private/qmlglobal_p.h>
+#include "qmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h
index 2fa1be8..2b46515 100644
--- a/src/declarative/util/qmlxmllistmodel_p.h
+++ b/src/declarative/util/qmlxmllistmodel_p.h
@@ -43,7 +43,7 @@
 #define QMLXMLLISTMODEL_H
 
 #include <qml.h>
-#include <private/qlistmodelinterface_p.h>
+#include "qlistmodelinterface_p.h"
 #include <qmlinfo.h>
 
 QT_BEGIN_HEADER