AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the annoying qWarning when QUrl::setPort is out of range

Browse Source 
That's what we have QUrl::errorString() for. This will become evident
especially now that QUrl::toString() / toEncoded() return empty if
there are errors.

Change-Id: I64a84e9c6ee57c0fc38cc0c58f5286ddc1248d1f
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: David Faure <faure@kde.org>
This commit is contained in:
Thiago Macieira 2012-09-20 15:46:41 +02:00 committed by The Qt Project
parent fe1541b268
commit ceca141d0c
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/io/qurl.cpp
View File

@ -2105,7 +2105,6 @@ void QUrl::setPort(int port)
detach();
if (port < -1 || port > 65535) {
qWarning("QUrl::setPort: Out of range");
port = -1;
d->sectionHasError |= QUrlPrivate::Port;
d->errorCode = QUrlPrivate::InvalidPortError;

3
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -183,11 +183,9 @@ void tst_QUrl::getSetCheck()
obj1.setPort(0);
QCOMPARE(0, obj1.port());
QTest::ignoreMessage(QtWarningMsg, "QUrl::setPort: Out of range");
obj1.setPort(INT_MIN);
QCOMPARE(-1, obj1.port()); // Out of range, -1
QTest::ignoreMessage(QtWarningMsg, "QUrl::setPort: Out of range");
obj1.setPort(INT_MAX);
QCOMPARE(-1, obj1.port()); // Out of range, -1
@ -2443,7 +2441,6 @@ void tst_QUrl::setPort()
QCOMPARE(url.port(), -1);
QCOMPARE(url.toString(), QString());
url.setPort(80);
QTest::ignoreMessage(QtWarningMsg, "QUrl::setPort: Out of range");
url.setPort(65536);
QCOMPARE(url.port(), -1);
QVERIFY(url.errorString().contains("out of range"));