diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-09 01:33:17 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-09 01:33:17 (GMT) |
| commit | f107c0d9dfe5c854c1235d34755bbf1de34c4cb4 (patch) | |
| tree | 57aab298b3a97f2f65f88f04888020077701ee10 /src/declarative | |
| parent | d019f392273d4c0904abce72bcce95fc75575ec0 (diff) | |
| parent | bf50114e0a039102b37f7f7a50def33b2275b3b3 (diff) | |
| download | Qt-f107c0d9dfe5c854c1235d34755bbf1de34c4cb4.zip Qt-f107c0d9dfe5c854c1235d34755bbf1de34c4cb4.tar.gz Qt-f107c0d9dfe5c854c1235d34755bbf1de34c4cb4.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsitem_p.h | 4 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicspositioners_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qmlenginedebug_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmllistmodel_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlstateoperations_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlxmllistmodel_p.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h index a8d77ea..304e36c 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h @@ -58,8 +58,8 @@ #include "qmlgraphicsanchors_p.h" #include "qmlgraphicsanchors_p_p.h" -#include <qmlstate_p.h> -#include <qmlnullablevalue_p_p.h> +#include "../util/qmlstate_p.h" +#include "../util/qmlnullablevalue_p_p.h" #include <qml.h> #include <qmlcontext.h> diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h index a4ef32d..4148ff6 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h @@ -44,7 +44,7 @@ #include "qmlgraphicsitem.h" -#include <qmlstate_p.h> +#include "../util/qmlstate_p.h" #include <QtCore/QObject> #include <QtCore/QString> diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h index c7d067d..88938a7 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h @@ -44,7 +44,7 @@ #include "qmlgraphicsborderimage_p.h" -#include <qmlpixmapcache_p.h> +#include "../util/qmlpixmapcache_p.h" #include <qml.h> #include <QtCore/QString> diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h index c173fdc..7c48b8b 100644 --- a/src/declarative/qml/qmlenginedebug_p.h +++ b/src/declarative/qml/qmlenginedebug_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <qmldebugservice_p.h> +#include "../debugger/qmldebugservice_p.h" #include <QtCore/qurl.h> #include <QtCore/qvariant.h> diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h index 734d44c..2a1a57d 100644 --- a/src/declarative/util/qmllistmodel_p.h +++ b/src/declarative/util/qmllistmodel_p.h @@ -49,7 +49,7 @@ #include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QVariant> -#include <qlistmodelinterface_p.h> +#include "../3rdparty/qlistmodelinterface_p.h" #include <QtScript/qscriptvalue.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h index b03af48..87af7bb 100644 --- a/src/declarative/util/qmlstateoperations_p.h +++ b/src/declarative/util/qmlstateoperations_p.h @@ -45,7 +45,7 @@ #include "qmlstate_p.h" #include <qmlgraphicsitem.h> -#include <qmlgraphicsanchors_p.h> +#include "../graphicsitems/qmlgraphicsanchors_p.h" #include <qmlscriptstring.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h index e645740..67fc751 100644 --- a/src/declarative/util/qmlxmllistmodel_p.h +++ b/src/declarative/util/qmlxmllistmodel_p.h @@ -45,7 +45,7 @@ #include <qml.h> #include <qmlinfo.h> -#include <qlistmodelinterface_p.h> +#include "../3rdparty/qlistmodelinterface_p.h" QT_BEGIN_HEADER |