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:
16628b7
)
Fix tst_QVariant::invalidColor
author
Jiang Jiang
<jiang.jiang@nokia.com>
Wed, 11 May 2011 13:21:14 +0000
(15:21 +0200)
committer
Jiang Jiang
<jiang.jiang@nokia.com>
Wed, 11 May 2011 13:28:19 +0000
(15:28 +0200)
Since
a423ff5474b89028eeca95b254f5184311c8223b
, the warning message is
no longer produced.
Reviewed-by: Samuel Rødal
(cherry picked from commit
8a5e82732be3aac37d14ef85c6974add46c6b65f
)
tests/auto/qvariant/tst_qvariant.cpp
patch
|
blob
|
history
diff --git
a/tests/auto/qvariant/tst_qvariant.cpp
b/tests/auto/qvariant/tst_qvariant.cpp
index
6ebe84e
..
3e65d7e
100644
(file)
--- a/
tests/auto/qvariant/tst_qvariant.cpp
+++ b/
tests/auto/qvariant/tst_qvariant.cpp
@@
-2650,7
+2650,6
@@
void tst_QVariant::invalidAsByteArray()
void tst_QVariant::invalidQColor() const
{
QVariant va("An invalid QColor::name() value.");
- QTest::ignoreMessage(QtWarningMsg, "QColor::setNamedColor: Unknown color name 'An invalid QColor::name() value.'");
QVERIFY(va.canConvert(QVariant::Color));
QVERIFY(!va.convert(QVariant::Color));