diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:46:31 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:46:31 (GMT) |
| commit | d1bb572b9fb5b0286df992c8ae560d91c9dc3388 (patch) | |
| tree | d79063da3fa40a431da5ce795753eb27c9c8d2a1 /src/declarative/fx/qfxtextedit.h | |
| parent | 872c45c272ca71e8618475060aa28075e83fffce (diff) | |
| download | Qt-d1bb572b9fb5b0286df992c8ae560d91c9dc3388.zip Qt-d1bb572b9fb5b0286df992c8ae560d91c9dc3388.tar.gz Qt-d1bb572b9fb5b0286df992c8ae560d91c9dc3388.tar.bz2 | |
Rename QFxImageItem to QFxPaintedItem.
Done to avoid confusion with QFxImage and QFxAnimatedImage(Item)
Diffstat (limited to 'src/declarative/fx/qfxtextedit.h')
| -rw-r--r-- | src/declarative/fx/qfxtextedit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h index be84a3c..b017635 100644 --- a/src/declarative/fx/qfxtextedit.h +++ b/src/declarative/fx/qfxtextedit.h @@ -43,7 +43,7 @@ #define QFXTEXTEDIT_H #include <qfxtext.h> -#include <qfximageitem.h> +#include <qfxpainteditem.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> @@ -60,7 +60,7 @@ QT_MODULE(Declarative) WARNING: SHORT TERM CLASS. INTENDED TO MERGE INTO QFxTextItem */ class QFxTextEditPrivate; -class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxImageItem +class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem { Q_OBJECT Q_ENUMS(VAlignment) |