Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I746d5aa3e11e8c01c370db3786788270cdd7c685

2 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/qxmlschema/tst_qxmlschema.cpp b/tests/auto/qxmlschema/tst_qxmlschema.cpp
index 4327c48..71f9fc2 100644
--- a/tests/auto/qxmlschema/tst_qxmlschema.cpp
+++ b/tests/auto/qxmlschema/tst_qxmlschema.cpp
@@ -184,13 +184,13 @@ void tst_QXmlSchema::copyMutationTest() const
     const QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                            "<xsd:schema"
                            "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                           "        xmlns=\"http://qt.nokia.com/xmlschematest\""
-                           "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                           "        xmlns=\"http://www.qt-project.org/xmlschematest\""
+                           "        targetNamespace=\"http://www.qt-project.org/xmlschematest\""
                            "        version=\"1.0\""
                            "        elementFormDefault=\"qualified\">"
                            "</xsd:schema>" );
 
-    const QUrl documentUri("http://qt.nokia.com/xmlschematest");
+    const QUrl documentUri("http://www.qt-project.org/xmlschematest");
     schema1.load(data, documentUri);
 
     QVERIFY(schema2.isValid() != schema1.isValid());
@@ -208,13 +208,13 @@ void tst_QXmlSchema::documentUri() const
     const QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                            "<xsd:schema"
                            "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                           "        xmlns=\"http://qt.nokia.com/xmlschematest\""
-                           "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                           "        xmlns=\"http://www.qt-project.org/xmlschematest\""
+                           "        targetNamespace=\"http://www.qt-project.org/xmlschematest\""
                            "        version=\"1.0\""
                            "        elementFormDefault=\"qualified\">"
                            "</xsd:schema>" );
 
-    const QUrl documentUri("http://qt.nokia.com/xmlschematest");
+    const QUrl documentUri("http://www.qt-project.org/xmlschematest");
     QXmlSchema schema;
     schema.load(data, documentUri);
 
@@ -245,8 +245,8 @@ void tst_QXmlSchema::loadSchemaDeviceSuccess() const
     QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                      "<xsd:schema"
                      "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                     "        xmlns=\"http://qt.nokia.com/xmlschematest\""
-                     "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                     "        xmlns=\"http://www.qt-project.org/xmlschematest\""
+                     "        targetNamespace=\"http://www.qt-project.org/xmlschematest\""
                      "        version=\"1.0\""
                      "        elementFormDefault=\"qualified\">"
                      "</xsd:schema>" );
@@ -263,8 +263,8 @@ void tst_QXmlSchema::loadSchemaDeviceFail() const
     QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                      "<xsd:schema"
                      "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                     "        xmlns=\"http://qt.nokia.com/xmlschematest\""
-                     "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                     "        xmlns=\"http://www.qt-project.org/xmlschematest\""
+                     "        targetNamespace=\"http://www.qt-project.org/xmlschematest\""
                      "        version=\"1.0\""
                      "        elementFormDefault=\"qualified\">"
                      "</xsd:schema>" );
@@ -281,8 +281,8 @@ void tst_QXmlSchema::loadSchemaDataSuccess() const
     const QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                            "<xsd:schema"
                            "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                           "        xmlns=\"http://qt.nokia.com/xmlschematest\""
-                           "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                           "        xmlns=\"http://www.qt-project.org/xmlschematest\""
+                           "        targetNamespace=\"http://www.qt-project.org/xmlschematest\""
                            "        version=\"1.0\""
                            "        elementFormDefault=\"qualified\">"
                            "</xsd:schema>" );
diff --git a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
index 5859f62..1406d76 100644
--- a/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
+++ b/tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp
@@ -94,14 +94,14 @@ static QXmlSchema createValidSchema()
     const QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                            "<xsd:schema"
                            "        xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
-                           "        xmlns=\"http://qt.nokia.com/xmlschematest\""
-                           "        targetNamespace=\"http://qt.nokia.com/xmlschematest\""
+                           "        xmlns=\"http://www.qt-project.org/xmlschematest\""
+                           "        targetNamespace=\"http://www.qt-project.org/xmlschematest\""
                            "        version=\"1.0\""
                            "        elementFormDefault=\"qualified\">"
                            "  <xsd:element name=\"myRoot\" type=\"xsd:string\"/>"
                            "</xsd:schema>" );
 
-    const QUrl documentUri("http://qt.nokia.com/xmlschematest");
+    const QUrl documentUri("http://www.qt-project.org/xmlschematest");
 
     QXmlSchema schema;
     schema.load(data, documentUri);
@@ -238,7 +238,7 @@ void tst_QXmlSchemaValidator::loadInstanceDeviceSuccess() const
 {
     const QXmlSchema schema(createValidSchema());
 
-    QByteArray data( "<myRoot xmlns=\"http://qt.nokia.com/xmlschematest\">Testme</myRoot>" );
+    QByteArray data( "<myRoot xmlns=\"http://www.qt-project.org/xmlschematest\">Testme</myRoot>" );
     QBuffer buffer(&data);
     buffer.open(QIODevice::ReadOnly);
 
@@ -250,7 +250,7 @@ void tst_QXmlSchemaValidator::loadInstanceDeviceFail() const
 {
     const QXmlSchema schema(createValidSchema());
 
-    QByteArray data( "<myRoot xmlns=\"http://qt.nokia.com/xmlschematest\">Testme</myRoot>" );
+    QByteArray data( "<myRoot xmlns=\"http://www.qt-project.org/xmlschematest\">Testme</myRoot>" );
     QBuffer buffer(&data);
     // a closed device can not be loaded
 
@@ -262,7 +262,7 @@ void tst_QXmlSchemaValidator::loadInstanceDataSuccess() const
 {
     const QXmlSchema schema(createValidSchema());
 
-    const QByteArray data( "<myRoot xmlns=\"http://qt.nokia.com/xmlschematest\">Testme</myRoot>" );
+    const QByteArray data( "<myRoot xmlns=\"http://www.qt-project.org/xmlschematest\">Testme</myRoot>" );
 
     QXmlSchemaValidator validator(schema);
     QVERIFY(validator.validate(data));