diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-04-29 00:11:28 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 08:30:59 +0200 |
| commit | ade888860334d207f5f070b0bc9c4c98deaf3862 (patch) | |
| tree | 133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/auto/network/access | |
| parent | 6102ab8d646d76a68bb460885394501e90b4fd1f (diff) | |
Don't use obsolete qVariantValue, qVariantCanConvert, etc.
qVariantValue and qVariantCanConvert are Compatibility members, while in
Qt4.8 they are marked as Qt 3 Support Members.
qVariantFromValue and qVariantSetValue are Obsolete members.
Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/network/access')
| -rw-r--r-- | tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp index 928dc48125..25764aacce 100644 --- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp +++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp @@ -282,21 +282,21 @@ void tst_QNetworkRequest::setHeader_data() cookie.setName("a"); cookie.setValue("b"); QTest::newRow("Cookie-1") << QNetworkRequest::CookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Cookie" << "a=b"; QTest::newRow("SetCookie-1") << QNetworkRequest::SetCookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Set-Cookie" << "a=b"; cookie.setPath("/"); QTest::newRow("Cookie-2") << QNetworkRequest::CookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Cookie" << "a=b"; QTest::newRow("SetCookie-2") << QNetworkRequest::SetCookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Set-Cookie" << "a=b; path=/"; @@ -304,11 +304,11 @@ void tst_QNetworkRequest::setHeader_data() cookie2.setName("c"); cookie2.setValue("d"); QTest::newRow("Cookie-3") << QNetworkRequest::CookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2) << true << "Cookie" << "a=b; c=d"; QTest::newRow("SetCookie-3") << QNetworkRequest::SetCookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2) << true << "Set-Cookie" << "a=b; path=/, c=d"; } @@ -388,17 +388,17 @@ void tst_QNetworkRequest::rawHeaderParsing_data() cookie.setName("a"); cookie.setValue("b"); QTest::newRow("Cookie-1") << QNetworkRequest::CookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Cookie" << "a=b"; QTest::newRow("SetCookie-1") << QNetworkRequest::SetCookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Set-Cookie" << "a=b"; cookie.setPath("/"); QTest::newRow("SetCookie-2") << QNetworkRequest::SetCookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie) << true << "Set-Cookie" << "a=b; path=/"; @@ -407,12 +407,12 @@ void tst_QNetworkRequest::rawHeaderParsing_data() cookie2.setName("c"); cookie2.setValue("d"); QTest::newRow("Cookie-3") << QNetworkRequest::CookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2) << true << "Cookie" << "a=b; c=d"; cookie.setPath("/"); QTest::newRow("SetCookie-3") << QNetworkRequest::SetCookieHeader - << qVariantFromValue(QList<QNetworkCookie>() << cookie << cookie2) + << QVariant::fromValue(QList<QNetworkCookie>() << cookie << cookie2) << true << "Set-Cookie" << "a=b; path=/, c=d"; } |