summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlineedit.cpp
diff options
context:
space:
mode:
authorRobert Griebl <rgriebl@trolltech.com>2010-03-03 16:48:34 (GMT)
committerRobert Griebl <rgriebl@trolltech.com>2010-03-03 16:48:34 (GMT)
commit97728e94e199017204d9c70f042ccb62e4eacc90 (patch)
tree530ad22a7bea21b21d8499e6d05897b1f33cb4c2 /src/gui/widgets/qlineedit.cpp
parent65e7400babb0625f4d7616ec5d71490a2dcd3c6f (diff)
downloadQt-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
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
-rw-r--r--src/gui/widgets/qlineedit.cpp3
1 files changed, 0 insertions, 3 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