summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_compare.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_compare.py')
0 files changed, 0 insertions, 0 deletions
generated by cgit v0.12 at 2024-09-24 04:18:47 (GMT)
ss='sha1'>13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch) treeb647be5699145ccae1545096aba5c495d96f8eb5 /tests/arthur parent081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff)parentde088b5a7f7b57e568399334667b14bfc9e7b893 (diff)downloadQt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.zip
Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz
Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.bz2
Merge commit 'qt/master'
Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'tests/arthur')
-rw-r--r--tests/arthur/common/framework.cpp2
-rw-r--r--tests/arthur/common/framework.h2
-rw-r--r--tests/arthur/common/paintcommands.cpp2
-rw-r--r--tests/arthur/common/paintcommands.h2
-rw-r--r--tests/arthur/common/qengines.cpp2
-rw-r--r--tests/arthur/common/qengines.h2
-rw-r--r--tests/arthur/common/xmldata.cpp2
-rw-r--r--tests/arthur/common/xmldata.h2
-rw-r--r--tests/arthur/datagenerator/datagenerator.cpp2
-rw-r--r--tests/arthur/datagenerator/datagenerator.h2
-rw-r--r--tests/arthur/datagenerator/main.cpp2
-rw-r--r--tests/arthur/datagenerator/xmlgenerator.cpp2
-rw-r--r--tests/arthur/datagenerator/xmlgenerator.h2
-rw-r--r--tests/arthur/htmlgenerator/htmlgenerator.cpp2
-rw-r--r--tests/arthur/htmlgenerator/htmlgenerator.h2
-rw-r--r--tests/arthur/htmlgenerator/main.cpp2
-rw-r--r--tests/arthur/lance/interactivewidget.cpp2
-rw-r--r--tests/arthur/lance/interactivewidget.h2
-rw-r--r--tests/arthur/lance/main.cpp4
-rw-r--r--tests/arthur/lance/widgets.h41
-rw-r--r--tests/arthur/performancediff/main.cpp2
-rw-r--r--tests/arthur/performancediff/performancediff.cpp2
-rw-r--r--tests/arthur/performancediff/performancediff.h2
-rw-r--r--tests/arthur/shower/main.cpp2
-rw-r--r--tests/arthur/shower/shower.cpp2
-rw-r--r--tests/arthur/shower/shower.h2
26 files changed, 48 insertions, 45 deletions
diff --git a/tests/arthur/common/framework.cpp b/tests/arthur/common/framework.cpp
index 4fe225a..65945b2 100644
--- a/tests/arthur/common/framework.cpp
+++ b/tests/arthur/common/framework.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/framework.h b/tests/arthur/common/framework.h
index 62f83ae..e8244a6 100644
--- a/tests/arthur/common/framework.h
+++ b/tests/arthur/common/framework.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 7d18196..2d59324 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index 2c346d7..50d3d5b 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/qengines.cpp b/tests/arthur/common/qengines.cpp
index 00677ac..462b9eb 100644
--- a/tests/arthur/common/qengines.cpp
+++ b/tests/arthur/common/qengines.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/qengines.h b/tests/arthur/common/qengines.h
index b7c8353..1eb5a25 100644
--- a/tests/arthur/common/qengines.h
+++ b/tests/arthur/common/qengines.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/xmldata.cpp b/tests/arthur/common/xmldata.cpp
index aad1f22..ac9ef69 100644
--- a/tests/arthur/common/xmldata.cpp
+++ b/tests/arthur/common/xmldata.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/common/xmldata.h b/tests/arthur/common/xmldata.h
index b99df1c..41cd534 100644
--- a/tests/arthur/common/xmldata.h
+++ b/tests/arthur/common/xmldata.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/datagenerator/datagenerator.cpp b/tests/arthur/datagenerator/datagenerator.cpp
index 576affb..e919c8f 100644
--- a/tests/arthur/datagenerator/datagenerator.cpp
+++ b/tests/arthur/datagenerator/datagenerator.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/datagenerator/datagenerator.h b/tests/arthur/datagenerator/datagenerator.h
index bc4a4b4..c7f8e2d 100644
--- a/tests/arthur/datagenerator/datagenerator.h
+++ b/tests/arthur/datagenerator/datagenerator.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/datagenerator/main.cpp b/tests/arthur/datagenerator/main.cpp
index ac1d9ae..e38e95f 100644
--- a/tests/arthur/datagenerator/main.cpp
+++ b/tests/arthur/datagenerator/main.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/datagenerator/xmlgenerator.cpp b/tests/arthur/datagenerator/xmlgenerator.cpp
index e52f8b6..022be29 100644
--- a/tests/arthur/datagenerator/xmlgenerator.cpp
+++ b/tests/arthur/datagenerator/xmlgenerator.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/datagenerator/xmlgenerator.h b/tests/arthur/datagenerator/xmlgenerator.h
index 90b9ca5..0aa53e1 100644
--- a/tests/arthur/datagenerator/xmlgenerator.h
+++ b/tests/arthur/datagenerator/xmlgenerator.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.cpp b/tests/arthur/htmlgenerator/htmlgenerator.cpp
index 1c8ee08..ea54081 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.cpp
+++ b/tests/arthur/htmlgenerator/htmlgenerator.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.h b/tests/arthur/htmlgenerator/htmlgenerator.h
index 04a36e2..33c491d 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.h
+++ b/tests/arthur/htmlgenerator/htmlgenerator.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/htmlgenerator/main.cpp b/tests/arthur/htmlgenerator/main.cpp
index 2ad5ea8..c831b80 100644
--- a/tests/arthur/htmlgenerator/main.cpp
+++ b/tests/arthur/htmlgenerator/main.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/lance/interactivewidget.cpp b/tests/arthur/lance/interactivewidget.cpp
index 0c2c7a6..d41a584 100644
--- a/tests/arthur/lance/interactivewidget.cpp
+++ b/tests/arthur/lance/interactivewidget.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/lance/interactivewidget.h b/tests/arthur/lance/interactivewidget.h
index 2bf0ea2..a0f6156 100644
--- a/tests/arthur/lance/interactivewidget.h
+++ b/tests/arthur/lance/interactivewidget.h
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp