summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-07-15 14:51:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-15 15:40:37 +0200
commit86b1cc8113f7151417206fe0478fbd71336b9c8f (patch)
tree0c2c5206394b96ab672348878829f4ce23dffe68
parent489e26b2e1654f45a3a4ef645f4471b754978b5a (diff)
Replace qt.nokia.com by www.qt-project.org in tests.
Task-number: QTBUG-32390 Change-Id: I3662046e22c014618ba07b1c8fddda13ac09690a Reviewed-by: Leonard Lee <leonard.lee@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp8
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp8
-rw-r--r--tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp4
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
index 671ebc30..45b29deb 100644
--- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
+++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp
@@ -71,9 +71,9 @@ void tst_qdeclarativeerror::url()
QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml"));
- error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
+ error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
- QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
+ QCOMPARE(error.url(), QUrl("http://www.qt-project.org/main.qml"));
QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml"));
}
@@ -171,12 +171,12 @@ void tst_qdeclarativeerror::copy()
QDeclarativeError error3;
error3 = error;
- error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
+ error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
error.setDescription("Another Error");
error.setLine(2);
error.setColumn(33);
- QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
+ QCOMPARE(error.url(), QUrl("http://www.qt-project.org/main.qml"));
QCOMPARE(error.description(), QString("Another Error"));
QCOMPARE(error.line(), 2);
QCOMPARE(error.column(), 33);
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
index 35cceb59..5c7a4989 100644
--- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
+++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
@@ -154,8 +154,8 @@ void tst_qdeclarativeinfo::types()
//### do we actually want QUrl to show up in the output?
//### why the extra space at the end?
- QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QUrl(\"http://qt.nokia.com\") ");
- qmlInfo(0) << QUrl("http://qt.nokia.com");
+ QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QUrl(\"http://www.qt-project.org\") ");
+ qmlInfo(0) << QUrl("http://www.qt-project.org");
//### should this be quoted?
QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: hello");
@@ -177,14 +177,14 @@ void tst_qdeclarativeinfo::chaining()
//### should more of these be automatically inserting spaces?
QString str("Hello World");
QStringRef ref(&str, 6, 5);
- QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://qt.nokia.com\") World \"Qt\" Quick ");
+ QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://www.qt-project.org\") World \"Qt\" Quick ");
qmlInfo(0) << false << ' '
<< 1.1 << ' '
<< 1.2f << ' '
<< 15 << ' '
<< QLatin1String("hello") << ' '
<< QChar('b') << ' '
- << QUrl("http://qt.nokia.com")
+ << QUrl("http://www.qt-project.org")
<< ref
<< QByteArray("Qt")
<< QString ("Quick");
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 5c7fc9bc..7f05cc53 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -1101,7 +1101,7 @@ public slots:
void tst_qdeclarativetext::clickLink()
{
{
- QString componentStr = "import QtQuick 1.0\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }";
+ QString componentStr = "import QtQuick 1.0\nText { text: \"<a href=\\\"http://www.qt-project.org\\\">Hello world!</a>\" }";
QDeclarativeComponent textComponent(&engine);
textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
@@ -1125,7 +1125,7 @@ void tst_qdeclarativetext::clickLink()
static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me);
}
- QCOMPARE(test.link, QLatin1String("http://qt.nokia.com"));
+ QCOMPARE(test.link, QLatin1String("http://www.qt-project.org"));
}
}