summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-04 10:21:37 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-03-04 10:23:07 (GMT)
commit24c56ac5309150cf7ba42cd974df4e98d97ebb81 (patch)
tree449685f10840bedd62ff05e086d4b6dd55949ee5
parente53480370409b96d24d3f53513e8b2019a398e70 (diff)
downloadQt-24c56ac5309150cf7ba42cd974df4e98d97ebb81.zip
Qt-24c56ac5309150cf7ba42cd974df4e98d97ebb81.tar.gz
Qt-24c56ac5309150cf7ba42cd974df4e98d97ebb81.tar.bz2
Build fix for Sun Studio
Task-number: QTBUG-8192
-rw-r--r--src/gui/widgets/qcombobox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h
index 9b19a66..fb9af9f 100644
--- a/src/gui/widgets/qcombobox.h
+++ b/src/gui/widgets/qcombobox.h
@@ -111,10 +111,10 @@ public:
bool hasFrame() const;
inline int findText(const QString &text,
- Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive) const
+ Qt::MatchFlags flags = static_cast<Qt::MatchFlags>(Qt::MatchExactly|Qt::MatchCaseSensitive)) const
{ return findData(text, Qt::DisplayRole, flags); }
int findData(const QVariant &data, int role = Qt::UserRole,
- Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive) const;
+ Qt::MatchFlags flags = static_cast<Qt::MatchFlags>(Qt::MatchExactly|Qt::MatchCaseSensitive)) const;
enum InsertPolicy {
NoInsert,