diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
| commit | 436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f (patch) | |
| tree | 9fa98ed5eea2a806ef4e949f8d95a0f25e6c4be1 /src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h | |
| parent | 5ec35c0756464ec512de0961c2ae41bec39ac2f7 (diff) | |
| parent | 4621061e8c32e234a0d7688e226e92d87172f99b (diff) | |
| download | Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.zip Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.gz Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h index 84965e4..8914bfd 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h @@ -54,9 +54,9 @@ // #include "qmlgraphicsitem.h" -#include <private/qmlgraphicspainteditem_p_p.h> -#include "qml.h" +#include "qmlgraphicspainteditem_p_p.h" +#include <qml.h> QT_BEGIN_NAMESPACE class QTextLayout; |