diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 21:55:04 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 21:55:04 +1000 |
| commit | c1031d334f6ecac42a3cb57ea326a1a8cfa7fa1e (patch) | |
| tree | c0d4bdabd614719c4125b501b1b8c6e094ba5938 | |
| parent | fe0a4972b89d082b6f5557653a916b827dd6f865 (diff) | |
| parent | 0377b7f96de5b12ab38e0ebd3068c6d17347f39d (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Remove warning from QColor::setNamedColor().
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qcolor/tst_qcolor.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index ff6c24ee9e..cd87d215c2 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -532,8 +532,7 @@ QString QColor::name() const void QColor::setNamedColor(const QString &name) { - if (!setColorFromString(name)) - qWarning("QColor::setNamedColor: Unknown color name '%s'", name.toLatin1().constData()); + setColorFromString(name); } /*! diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp index d42c26cbd6..b02537ec57 100644 --- a/tests/auto/qcolor/tst_qcolor.cpp +++ b/tests/auto/qcolor/tst_qcolor.cpp @@ -1506,7 +1506,6 @@ void tst_QColor::setallowX11ColorNames() for (int i = 0; i < x11RgbTblSize; ++i) { QString colorName = QLatin1String(x11RgbTbl[i].name); QColor color; - QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1()); color.setNamedColor(colorName); QVERIFY(!color.isValid()); } @@ -1528,7 +1527,6 @@ void tst_QColor::setallowX11ColorNames() for (int i = 0; i < x11RgbTblSize; ++i) { QString colorName = QLatin1String(x11RgbTbl[i].name); QColor color; - QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1()); color.setNamedColor(colorName); QVERIFY(!color.isValid()); } |