diff options
| author | Robert Griebl <rgriebl@trolltech.com> | 2010-03-03 16:48:34 (GMT) |
|---|---|---|
| committer | Robert Griebl <rgriebl@trolltech.com> | 2010-03-03 16:48:34 (GMT) |
| commit | 97728e94e199017204d9c70f042ccb62e4eacc90 (patch) | |
| tree | 530ad22a7bea21b21d8499e6d05897b1f33cb4c2 | |
| parent | 65e7400babb0625f4d7616ec5d71490a2dcd3c6f (diff) | |
| download | Qt-97728e94e199017204d9c70f042ccb62e4eacc90.zip Qt-97728e94e199017204d9c70f042ccb62e4eacc90.tar.gz Qt-97728e94e199017204d9c70f042ccb62e4eacc90.tar.bz2 | |
Remove the Qt 4.7 #if guards that were needed for 4.6
Reviewed-by: TrustMe
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qlineedit.h | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 595f552..7ccced6 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -383,8 +383,6 @@ void QLineEdit::setText(const QString& text) d->control->setText(text); } -// ### Qt 4.7: remove this #if guard -#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5) /*! \since 4.7 @@ -414,7 +412,6 @@ void QLineEdit::setPlaceholderText(const QString& placeholderText) update(); } } -#endif /*! \property QLineEdit::displayText diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h index fa04bfc..94e0dbe 100644 --- a/src/gui/widgets/qlineedit.h +++ b/src/gui/widgets/qlineedit.h @@ -83,10 +83,7 @@ class Q_GUI_EXPORT QLineEdit : public QWidget Q_PROPERTY(bool undoAvailable READ isUndoAvailable) Q_PROPERTY(bool redoAvailable READ isRedoAvailable) Q_PROPERTY(bool acceptableInput READ hasAcceptableInput) -// ### Qt 4.7: remove this #if guard -#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) -#endif public: explicit QLineEdit(QWidget* parent=0); @@ -102,11 +99,8 @@ public: QString displayText() const; -// ### Qt 4.7: remove this #if guard -#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5) QString placeholderText() const; void setPlaceholderText(const QString &); -#endif int maxLength() const; void setMaxLength(int); |