diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-12 10:20:38 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 11:13:48 +0200 |
commit | 84f0377517f7289cea5e33fbd3239a4fabcc258b (patch) | |
tree | 75f8b0c634897ee81a2507b29ac8d95f417c1e16 /tests | |
parent | a7fa4cd5850a85c6e06b01c5a0a8aace7fc7511e (diff) |
Replace www.nokia.com by www.qt-project.org in tests.
Task-number: QTBUG-32390
Change-Id: Iad6471698c31ff24cc622456d5d51a23af047780
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests')
7 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index 025e0567..57d5f545 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -73,9 +73,9 @@ void tst_qdeclarativecontext::baseUrl() QCOMPARE(ctxt.baseUrl(), QUrl()); - ctxt.setBaseUrl(QUrl("http://www.nokia.com/")); + ctxt.setBaseUrl(QUrl("http://www.qt-project.org/")); - QCOMPARE(ctxt.baseUrl(), QUrl("http://www.nokia.com/")); + QCOMPARE(ctxt.baseUrl(), QUrl("http://www.qt-project.org/")); } void tst_qdeclarativecontext::resolvedUrl() @@ -83,18 +83,18 @@ void tst_qdeclarativecontext::resolvedUrl() // Relative to the component { QDeclarativeContext ctxt(&engine); - ctxt.setBaseUrl(QUrl("http://www.nokia.com/")); + ctxt.setBaseUrl(QUrl("http://www.qt-project.org/")); - QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.nokia.com/main.qml")); + QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.qt-project.org/main.qml")); } // Relative to a parent { QDeclarativeContext ctxt(&engine); - ctxt.setBaseUrl(QUrl("http://www.nokia.com/")); + ctxt.setBaseUrl(QUrl("http://www.qt-project.org/")); QDeclarativeContext ctxt2(&ctxt); - QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml")); + QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.qt-project.org/main2.qml")); } // Relative to the engine @@ -106,10 +106,10 @@ void tst_qdeclarativecontext::resolvedUrl() // Relative to a deleted parent { QDeclarativeContext *ctxt = new QDeclarativeContext(&engine); - ctxt->setBaseUrl(QUrl("http://www.nokia.com/")); + ctxt->setBaseUrl(QUrl("http://www.qt-project.org/")); QDeclarativeContext ctxt2(ctxt); - QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml")); + QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.qt-project.org/main2.qml")); delete ctxt; ctxt = 0; @@ -120,7 +120,7 @@ void tst_qdeclarativecontext::resolvedUrl() { QDeclarativeContext ctxt(&engine); - QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.nokia.com/main2.qml")), QUrl("http://www.nokia.com/main2.qml")); + QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.qt-project.org/main2.qml")), QUrl("http://www.qt-project.org/main2.qml")); QCOMPARE(ctxt.resolvedUrl(QUrl("file:///main2.qml")), QUrl("file:///main2.qml")); } } diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp index 05bf3ca5..671ebc30 100644 --- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp +++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp @@ -63,18 +63,18 @@ void tst_qdeclarativeerror::url() QCOMPARE(error.url(), QUrl()); - error.setUrl(QUrl("http://www.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); - QCOMPARE(error.url(), QUrl("http://www.nokia.com/main.qml")); + QCOMPARE(error.url(), QUrl("http://www.qt-project.org/main.qml")); QDeclarativeError error2 = error; - QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml")); + QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml")); error.setUrl(QUrl("http://qt.nokia.com/main.qml")); QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml")); - QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml")); + QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml")); } void tst_qdeclarativeerror::description() @@ -141,28 +141,28 @@ void tst_qdeclarativeerror::toString() { { QDeclarativeError error; - error.setUrl(QUrl("http://www.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); error.setDescription("An Error"); error.setLine(92); error.setColumn(13); - QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92:13: An Error")); + QCOMPARE(error.toString(), QString("http://www.qt-project.org/main.qml:92:13: An Error")); } { QDeclarativeError error; - error.setUrl(QUrl("http://www.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); error.setDescription("An Error"); error.setLine(92); - QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92: An Error")); + QCOMPARE(error.toString(), QString("http://www.qt-project.org/main.qml:92: An Error")); } } void tst_qdeclarativeerror::copy() { QDeclarativeError error; - error.setUrl(QUrl("http://www.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); error.setDescription("An Error"); error.setLine(92); error.setColumn(13); @@ -181,12 +181,12 @@ void tst_qdeclarativeerror::copy() QCOMPARE(error.line(), 2); QCOMPARE(error.column(), 33); - QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml")); + QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml")); QCOMPARE(error2.description(), QString("An Error")); QCOMPARE(error2.line(), 92); QCOMPARE(error2.column(), 13); - QCOMPARE(error3.url(), QUrl("http://www.nokia.com/main.qml")); + QCOMPARE(error3.url(), QUrl("http://www.qt-project.org/main.qml")); QCOMPARE(error3.description(), QString("An Error")); QCOMPARE(error3.line(), 92); QCOMPARE(error3.column(), 13); @@ -197,12 +197,12 @@ void tst_qdeclarativeerror::debug() { { QDeclarativeError error; - error.setUrl(QUrl("http://www.nokia.com/main.qml")); + error.setUrl(QUrl("http://www.qt-project.org/main.qml")); error.setDescription("An Error"); error.setLine(92); error.setColumn(13); - QTest::ignoreMessage(QtWarningMsg, "http://www.nokia.com/main.qml:92:13: An Error "); + QTest::ignoreMessage(QtWarningMsg, "http://www.qt-project.org/main.qml:92:13: An Error "); qWarning() << error; } diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp index 0f45d463..9f458805 100644 --- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp +++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp @@ -176,7 +176,7 @@ void tst_qdeclarativeinstruction::dump() } { - data->urls << QUrl("http://www.nokia.com"); + data->urls << QUrl("http://www.qt-project.org"); QDeclarativeInstruction i; i.line = 11; i.type = QDeclarativeInstruction::StoreUrl; @@ -544,7 +544,7 @@ void tst_qdeclarativeinstruction::dump() << "8\t\t8\tSTORE_INTEGER\t\t5\t9" << "9\t\t9\tSTORE_BOOL\t\t6\ttrue" << "10\t\t10\tSTORE_STRING\t\t7\t1\t\t\"Test String\"" - << "11\t\t11\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.nokia.com\") " + << "11\t\t11\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.qt-project.org\") " << "12\t\t12\tSTORE_COLOR\t\t9\t\t\t\"ff00ff00\"" << "13\t\t13\tSTORE_DATE\t\t10\t9" << "14\t\t14\tSTORE_TIME\t\t11\t33" diff --git a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp index 49eab51e..e27c95e5 100644 --- a/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp +++ b/tests/auto/declarative/qdeclarativemetatype/tst_qdeclarativemetatype.cpp @@ -173,7 +173,7 @@ void tst_qdeclarativemetatype::copy() QT_COPY_TEST(QTime, ct); QDateTime cdt = QDateTime::currentDateTime(); QT_COPY_TEST(QDateTime, cdt); - QT_COPY_TEST(QUrl, QUrl("http://www.nokia.com")); + QT_COPY_TEST(QUrl, QUrl("http://www.qt-project.org")); QT_COPY_TEST(QLocale, QLocale(QLocale::English, QLocale::Australia)); QT_COPY_TEST(QRect, QRect(-10, 10, 102, 99)); QT_COPY_TEST(QRectF, QRectF(-10.2, 1.2, 102, 99.6)); diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml index f0032927..aaea9ebe 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml @@ -7,7 +7,7 @@ QtObject { var x = new XMLHttpRequest; try { - x.open("GET", "http://www.nokia.com", true, "user", "password", "extra"); + x.open("GET", "http://www.qt-project.org", true, "user", "password", "extra"); } catch (e) { if (e.code == DOMException.SYNTAX_ERR) exceptionThrown = true; diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml index b87823d5..197317b7 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml @@ -7,7 +7,7 @@ QtObject { var x = new XMLHttpRequest; try { - x.open("BLAH", "http://www.nokia.com"); + x.open("BLAH", "http://www.qt-project.org"); } catch (e) { if (e.code == DOMException.SYNTAX_ERR) exceptionThrown = true; diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml index 9f8f3098..06c388a3 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml @@ -7,7 +7,7 @@ QtObject { var x = new XMLHttpRequest; try { - x.open("GET", "http://www.nokia.com", false); + x.open("GET", "http://www.qt-project.org", false); } catch (e) { if (e.code == DOMException.NOT_SUPPORTED_ERR) exceptionThrown = true; |