summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxtextedit.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-19 08:48:46 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-19 08:48:46 (GMT)
commit0a2258c3e7b49b7383ef9ace11a4d8a448b7def1 (patch)
tree9879b8453d9a711db29045d062bd1607f1667bc6 /src/declarative/fx/qfxtextedit.h
parent4871ff0563cf8a9691db8b084dce012aeb5abf47 (diff)
parent23c781b67c838b120e7fba42bc9008d38f191330 (diff)
downloadQt-0a2258c3e7b49b7383ef9ace11a4d8a448b7def1.zip
Qt-0a2258c3e7b49b7383ef9ace11a4d8a448b7def1.tar.gz
Qt-0a2258c3e7b49b7383ef9ace11a4d8a448b7def1.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxtextedit.h')
-rw-r--r--src/declarative/fx/qfxtextedit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index 0aaa17b..f702101 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -42,8 +42,8 @@
#ifndef QFXTEXTEDIT_H
#define QFXTEXTEDIT_H
-#include <qfxtext.h>
-#include <qfxpainteditem.h>
+#include <QtDeclarative/qfxtext.h>
+#include <QtDeclarative/qfxpainteditem.h>
#include <QtGui/qtextdocument.h>
#include <QtGui/qtextoption.h>