diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-17 06:57:24 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-17 06:57:24 (GMT) |
| commit | 065d6dcc16d5b48b875ebe9bd755b1c605f86d89 (patch) | |
| tree | 24afc499f4183bf3246cf305933a14d651b910ea /src/declarative/fx/qfxlineedit.h | |
| parent | fe66eaeed64402a7b22a43a85cd92c938a534b71 (diff) | |
| parent | 43a497cac00a93f015ec62339529f36ba3f19ece (diff) | |
| download | Qt-065d6dcc16d5b48b875ebe9bd755b1c605f86d89.zip Qt-065d6dcc16d5b48b875ebe9bd755b1c605f86d89.tar.gz Qt-065d6dcc16d5b48b875ebe9bd755b1c605f86d89.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximage.h
Diffstat (limited to 'src/declarative/fx/qfxlineedit.h')
| -rw-r--r-- | src/declarative/fx/qfxlineedit.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/declarative/fx/qfxlineedit.h b/src/declarative/fx/qfxlineedit.h index 5abb418..e053c54 100644 --- a/src/declarative/fx/qfxlineedit.h +++ b/src/declarative/fx/qfxlineedit.h @@ -84,8 +84,7 @@ class Q_DECLARATIVE_EXPORT QFxLineEdit : public QFxPaintedItem /* Q_PROPERTY(int scrollDuration READ scrollDuration SET setScrollDuration NOTIFY scrollDurationChanged); */ - //### Requested by Aaron K.(Remove before release?) - Q_PROPERTY(bool awesome READ isAwesome WRITE setAwesome); + public: QFxLineEdit(QFxItem* parent=0); ~QFxLineEdit(); @@ -148,9 +147,6 @@ public: bool hasAcceptableInput() const; - bool isAwesome() const; - void setAwesome(bool a); - void drawContents(QPainter *p,const QRect &r); Q_SIGNALS: void textChanged(); @@ -178,7 +174,6 @@ private slots: void updateAll(); void createCursor(); void moveCursor(); - void rainbowRedraw(); private: Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxLineEdit); |