diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-02 07:58:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-02 07:58:21 (GMT) |
| commit | f378ee91aecf64e9f9f2105a9831fa7b0ffc9463 (patch) | |
| tree | 241fb1c0efc75df84a7e4b872eac58ecbe5b07a3 /src/declarative/qml/qmlmetaproperty_p.h | |
| parent | 3a6809a54bee6eba517d7077070c697ecc0b56c3 (diff) | |
| parent | 4c8fdfca8b31916f9a130c163914ded7eb391807 (diff) | |
| download | Qt-f378ee91aecf64e9f9f2105a9831fa7b0ffc9463.zip Qt-f378ee91aecf64e9f9f2105a9831fa7b0ffc9463.tar.gz Qt-f378ee91aecf64e9f9f2105a9831fa7b0ffc9463.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlvme.cpp
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty_p.h')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index d225afa..dfb05fb 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -55,7 +55,7 @@ #include "qmlmetaproperty.h" #include <private/qobject_p.h> -#include <private/qmlpropertycache_p.h> +#include "qmlpropertycache_p.h" QT_BEGIN_NAMESPACE |