projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4953093
)
Style: Don't put an else after a return.
author
Stephen Kelly
<stephen.kelly@kdab.com>
Sun, 1 Apr 2012 18:25:33 +0000
(20:25 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 12 Apr 2012 23:44:02 +0000
(
01:44
+0200)
Change-Id: I41d031d92489e5539f293c30a6257310f2a1c657
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
src/corelib/kernel/qvariant.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/kernel/qvariant.cpp
b/src/corelib/kernel/qvariant.cpp
index
c3f8422
..
654170f
100644
(file)
--- a/
src/corelib/kernel/qvariant.cpp
+++ b/
src/corelib/kernel/qvariant.cpp
@@
-2503,8
+2503,7
@@
bool QVariant::canConvert(int targetTypeId) const
if (targetTypeId == String && currentType == StringList)
return v_cast<QStringList>(&d)->count() == 1;
- else
- return qCanConvertMatrix[targetTypeId] & (1 << currentType);
+ return qCanConvertMatrix[targetTypeId] & (1 << currentType);
}
/*!