From c1def8bb267ed4035ba56db343c0ca6966015dba Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 28 Jun 2012 13:17:51 +0200 Subject: [PATCH] Fix compilation of QSearchField in Qt 4.6 --- 3rdparty/qocoa/qsearchfield_nonmac.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/3rdparty/qocoa/qsearchfield_nonmac.cpp b/3rdparty/qocoa/qsearchfield_nonmac.cpp index 617c2963f..d43468b82 100644 --- a/3rdparty/qocoa/qsearchfield_nonmac.cpp +++ b/3rdparty/qocoa/qsearchfield_nonmac.cpp @@ -105,7 +105,11 @@ void QSearchField::setPlaceholderText(const QString &text) } QString QSearchField::placeholderText() const { +#if QT_VERSION >= 0x040700 return pimpl->lineEdit->placeholderText(); +#else + return QString(); +#endif } void QSearchField::clear()