Adds qml prefix to all declarative autotests

215 files changed, 19 insertions, 19 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 7b13b41..8773026 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,18 +1,15 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-           anchors \                # Cover
-           animatedimage \          # Cover
-           animations \             # Cover
-           behaviors \              # Cover
-           datetimeformatter \      # Cover
            graphicswidgets \        # Cover
            layouts \                # Cover
-           numberformatter \        # Cover
            parserstress \           # Cover
            qmetaobjectbuilder \     # Cover
+           qmlanimations \          # Cover
+           qmlbehaviors \           # Cover
            qmlbinding \             # Cover
            qmlconnection \          # Cover
            qmlcontext \             # Cover
+           qmldatetimeformatter \   # Cover
            qmldebug \               # Cover
            qmldebugclient \         # Cover
            qmldebugservice \        # Cover
@@ -22,6 +19,8 @@ SUBDIRS += \
            qmlengine     \          # Cover
            qmlerror \               # Cover
            qmlfontloader \          # Cover
+           qmlgraphicsanchors \     # Cover
+           qmlgraphicsanimatedimage \ # Cover
            qmlgraphicsimage \       # Cover
            qmlgraphicsborderimage \ # Cover
            qmlgraphicsflickable   \ # Cover
@@ -45,19 +44,20 @@ SUBDIRS += \
            qmllistmodel \           # Cover
            qmlmetaproperty \        # Cover
            qmlmetatype \            # Cover
+           qmlnumberformatter \     # Cover
            qmlpixmapcache \         # Cover
            qmlpropertymap \         # Cover
            qmlqt \                  # Cover
            qmlspringfollow \        # Cover
+           qmlstates \              # Cover
            qmlsystempalette \       # Cover
            qmltimer \               # Cover
            qmlxmllistmodel \        # Cover
            qpacketprotocol \        # Cover
            qmlgraphicsrepeater \    # Cover
-           sql \                    # Cover
-           states \                 # Cover
-           valuetypes \             # Cover
-           xmlhttprequest           # Cover
+           qmlvaluetypes \          # Cover
+           qmlxmlhttprequest \      # Cover
+           sql                      # Cover
 
 
 # Tests which should run in Pulse
diff --git a/tests/auto/declarative/animations/data/attached.qml b/tests/auto/declarative/qmlanimations/data/attached.qml
index 0fb6f8c..0fb6f8c 100644
--- a/tests/auto/declarative/animations/data/attached.qml
+++ b/tests/auto/declarative/qmlanimations/data/attached.qml
diff --git a/tests/auto/declarative/animations/data/badproperty1.qml b/tests/auto/declarative/qmlanimations/data/badproperty1.qml
index d31cae9..d31cae9 100644
--- a/tests/auto/declarative/animations/data/badproperty1.qml
+++ b/tests/auto/declarative/qmlanimations/data/badproperty1.qml
diff --git a/tests/auto/declarative/animations/data/badproperty2.qml b/tests/auto/declarative/qmlanimations/data/badproperty2.qml
index 3b8b111..3b8b111 100644
--- a/tests/auto/declarative/animations/data/badproperty2.qml
+++ b/tests/auto/declarative/qmlanimations/data/badproperty2.qml
diff --git a/tests/auto/declarative/animations/data/badtype1.qml b/tests/auto/declarative/qmlanimations/data/badtype1.qml
index 6381df3..6381df3 100644
--- a/tests/auto/declarative/animations/data/badtype1.qml
+++ b/tests/auto/declarative/qmlanimations/data/badtype1.qml
diff --git a/tests/auto/declarative/animations/data/badtype2.qml b/tests/auto/declarative/qmlanimations/data/badtype2.qml
index 8d57e41..8d57e41 100644
--- a/tests/auto/declarative/animations/data/badtype2.qml
+++ b/tests/auto/declarative/qmlanimations/data/badtype2.qml
diff --git a/tests/auto/declarative/animations/data/badtype3.qml b/tests/auto/declarative/qmlanimations/data/badtype3.qml
index c4867c3..c4867c3 100644
--- a/tests/auto/declarative/animations/data/badtype3.qml
+++ b/tests/auto/declarative/qmlanimations/data/badtype3.qml
diff --git a/tests/auto/declarative/animations/data/badtype4.qml b/tests/auto/declarative/qmlanimations/data/badtype4.qml
index a4cf265..a4cf265 100644
--- a/tests/auto/declarative/animations/data/badtype4.qml
+++ b/tests/auto/declarative/qmlanimations/data/badtype4.qml
diff --git a/tests/auto/declarative/animations/data/dotproperty.qml b/tests/auto/declarative/qmlanimations/data/dotproperty.qml
index 369491f..369491f 100644
--- a/tests/auto/declarative/animations/data/dotproperty.qml
+++ b/tests/auto/declarative/qmlanimations/data/dotproperty.qml
diff --git a/tests/auto/declarative/animations/data/mixedtype1.qml b/tests/auto/declarative/qmlanimations/data/mixedtype1.qml
index 87f4f16..87f4f16 100644
--- a/tests/auto/declarative/animations/data/mixedtype1.qml
+++ b/tests/auto/declarative/qmlanimations/data/mixedtype1.qml
diff --git a/tests/auto/declarative/animations/data/mixedtype2.qml b/tests/auto/declarative/qmlanimations/data/mixedtype2.qml
index d555abd..d555abd 100644
--- a/tests/auto/declarative/animations/data/mixedtype2.qml
+++ b/tests/auto/declarative/qmlanimations/data/mixedtype2.qml
diff --git a/tests/auto/declarative/animations/data/properties.qml b/tests/auto/declarative/qmlanimations/data/properties.qml
index 7e73f57..7e73f57 100644
--- a/tests/auto/declarative/animations/data/properties.qml
+++ b/tests/auto/declarative/qmlanimations/data/properties.qml
diff --git a/tests/auto/declarative/animations/data/properties2.qml b/tests/auto/declarative/qmlanimations/data/properties2.qml
index 86568ca..86568ca 100644
--- a/tests/auto/declarative/animations/data/properties2.qml
+++ b/tests/auto/declarative/qmlanimations/data/properties2.qml
diff --git a/tests/auto/declarative/animations/data/properties3.qml b/tests/auto/declarative/qmlanimations/data/properties3.qml
index ff08885..ff08885 100644
--- a/tests/auto/declarative/animations/data/properties3.qml
+++ b/tests/auto/declarative/qmlanimations/data/properties3.qml
diff --git a/tests/auto/declarative/animations/data/properties4.qml b/tests/auto/declarative/qmlanimations/data/properties4.qml
index dab7e5f..dab7e5f 100644
--- a/tests/auto/declarative/animations/data/properties4.qml
+++ b/tests/auto/declarative/qmlanimations/data/properties4.qml
diff --git a/tests/auto/declarative/animations/data/properties5.qml b/tests/auto/declarative/qmlanimations/data/properties5.qml
index 56e0be8..56e0be8 100644
--- a/tests/auto/declarative/animations/data/properties5.qml
+++ b/tests/auto/declarative/qmlanimations/data/properties5.qml
diff --git a/tests/auto/declarative/animations/data/propertiesTransition.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml
index 75603b9..75603b9 100644
--- a/tests/auto/declarative/animations/data/propertiesTransition.qml
+++ b/tests/auto/declarative/qmlanimations/data/propertiesTransition.qml
diff --git a/tests/auto/declarative/animations/data/propertiesTransition2.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml
index ae59157..ae59157 100644
--- a/tests/auto/declarative/animations/data/propertiesTransition2.qml
+++ b/tests/auto/declarative/qmlanimations/data/propertiesTransition2.qml
diff --git a/tests/auto/declarative/animations/data/propertiesTransition3.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml
index eedba7b..eedba7b 100644
--- a/tests/auto/declarative/animations/data/propertiesTransition3.qml
+++ b/tests/auto/declarative/qmlanimations/data/propertiesTransition3.qml
diff --git a/tests/auto/declarative/animations/data/propertiesTransition4.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml
index 301f796..301f796 100644
--- a/tests/auto/declarative/animations/data/propertiesTransition4.qml
+++ b/tests/auto/declarative/qmlanimations/data/propertiesTransition4.qml
diff --git a/tests/auto/declarative/animations/data/propertiesTransition5.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml
index 565c519..565c519 100644
--- a/tests/auto/declarative/animations/data/propertiesTransition5.qml
+++ b/tests/auto/declarative/qmlanimations/data/propertiesTransition5.qml
diff --git a/tests/auto/declarative/animations/data/propertiesTransition6.qml b/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml
index b541dab..b541dab 100644
--- a/tests/auto/declarative/animations/data/propertiesTransition6.qml
+++ b/tests/auto/declarative/qmlanimations/data/propertiesTransition6.qml
diff --git a/tests/auto/declarative/animations/data/valuesource.qml b/tests/auto/declarative/qmlanimations/data/valuesource.qml
index c35063d..c35063d 100644
--- a/tests/auto/declarative/animations/data/valuesource.qml
+++ b/tests/auto/declarative/qmlanimations/data/valuesource.qml
diff --git a/tests/auto/declarative/animations/data/valuesource2.qml b/tests/auto/declarative/qmlanimations/data/valuesource2.qml
index 1a60542..1a60542 100644
--- a/tests/auto/declarative/animations/data/valuesource2.qml
+++ b/tests/auto/declarative/qmlanimations/data/valuesource2.qml
diff --git a/tests/auto/declarative/animations/animations.pro b/tests/auto/declarative/qmlanimations/qmlanimations.pro
index e13ecb9..447fb0f 100644
--- a/tests/auto/declarative/animations/animations.pro
+++ b/tests/auto/declarative/qmlanimations/qmlanimations.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_animations.cpp
+SOURCES += tst_qmlanimations.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/animations/tst_animations.cpp b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
index 17085af..17085af 100644
--- a/tests/auto/declarative/animations/tst_animations.cpp
+++ b/tests/auto/declarative/qmlanimations/tst_qmlanimations.cpp
diff --git a/tests/auto/declarative/behaviors/data/binding.qml b/tests/auto/declarative/qmlbehaviors/data/binding.qml
index e0c3321..e0c3321 100644
--- a/tests/auto/declarative/behaviors/data/binding.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/binding.qml
diff --git a/tests/auto/declarative/behaviors/data/color.qml b/tests/auto/declarative/qmlbehaviors/data/color.qml
index 6598703..6598703 100644
--- a/tests/auto/declarative/behaviors/data/color.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/color.qml
diff --git a/tests/auto/declarative/behaviors/data/cpptrigger.qml b/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
index ba507c4..ba507c4 100644
--- a/tests/auto/declarative/behaviors/data/cpptrigger.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/cpptrigger.qml
diff --git a/tests/auto/declarative/behaviors/data/disabled.qml b/tests/auto/declarative/qmlbehaviors/data/disabled.qml
index e7b8d51..e7b8d51 100644
--- a/tests/auto/declarative/behaviors/data/disabled.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/disabled.qml
diff --git a/tests/auto/declarative/behaviors/data/empty.qml b/tests/auto/declarative/qmlbehaviors/data/empty.qml
index 412e26c..412e26c 100644
--- a/tests/auto/declarative/behaviors/data/empty.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/empty.qml
diff --git a/tests/auto/declarative/behaviors/data/groupProperty.qml b/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
index 4f127c1..4f127c1 100644
--- a/tests/auto/declarative/behaviors/data/groupProperty.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/groupProperty.qml
diff --git a/tests/auto/declarative/behaviors/data/groupProperty2.qml b/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
index 19d70b6..19d70b6 100644
--- a/tests/auto/declarative/behaviors/data/groupProperty2.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/groupProperty2.qml
diff --git a/tests/auto/declarative/behaviors/data/loop.qml b/tests/auto/declarative/qmlbehaviors/data/loop.qml
index 5f2c057..5f2c057 100644
--- a/tests/auto/declarative/behaviors/data/loop.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/loop.qml
diff --git a/tests/auto/declarative/behaviors/data/nonSelecting.qml b/tests/auto/declarative/qmlbehaviors/data/nonSelecting.qml
index ba36d93..ba36d93 100644
--- a/tests/auto/declarative/behaviors/data/nonSelecting.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/nonSelecting.qml
diff --git a/tests/auto/declarative/behaviors/data/nonSelecting2.qml b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
index e9849eb..e9849eb 100644
--- a/tests/auto/declarative/behaviors/data/nonSelecting2.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/nonSelecting2.qml
diff --git a/tests/auto/declarative/behaviors/data/parent.qml b/tests/auto/declarative/qmlbehaviors/data/parent.qml
index 4f4911b..4f4911b 100644
--- a/tests/auto/declarative/behaviors/data/parent.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/parent.qml
diff --git a/tests/auto/declarative/behaviors/data/reassignedAnimation.qml b/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
index 693a595..693a595 100644
--- a/tests/auto/declarative/behaviors/data/reassignedAnimation.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/reassignedAnimation.qml
diff --git a/tests/auto/declarative/behaviors/data/scripttrigger.qml b/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
index 4383a0b..4383a0b 100644
--- a/tests/auto/declarative/behaviors/data/scripttrigger.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/scripttrigger.qml
diff --git a/tests/auto/declarative/behaviors/data/simple.qml b/tests/auto/declarative/qmlbehaviors/data/simple.qml
index 37c3915..37c3915 100644
--- a/tests/auto/declarative/behaviors/data/simple.qml
+++ b/tests/auto/declarative/qmlbehaviors/data/simple.qml
diff --git a/tests/auto/declarative/anchors/anchors.pro b/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro
index 1e25a90..1e685ee 100644
--- a/tests/auto/declarative/anchors/anchors.pro
+++ b/tests/auto/declarative/qmlbehaviors/qmlbehaviors.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_anchors.cpp
+SOURCES += tst_qmlbehaviors.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/behaviors/tst_behaviors.cpp b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
index fd84596..fd84596 100644
--- a/tests/auto/declarative/behaviors/tst_behaviors.cpp
+++ b/tests/auto/declarative/qmlbehaviors/tst_qmlbehaviors.cpp
diff --git a/tests/auto/declarative/datetimeformatter/datetimeformatter.pro b/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro
index 62eb303..2b1947d 100644
--- a/tests/auto/declarative/datetimeformatter/datetimeformatter.pro
+++ b/tests/auto/declarative/qmldatetimeformatter/qmldatetimeformatter.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_datetimeformatter.cpp
+SOURCES += tst_qmldatetimeformatter.cpp
diff --git a/tests/auto/declarative/datetimeformatter/tst_datetimeformatter.cpp b/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp
index 3302cfa..3302cfa 100644
--- a/tests/auto/declarative/datetimeformatter/tst_datetimeformatter.cpp
+++ b/tests/auto/declarative/qmldatetimeformatter/tst_qmldatetimeformatter.cpp
diff --git a/tests/auto/declarative/anchors/data/anchors.qml b/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml
index b64d0b0..b64d0b0 100644
--- a/tests/auto/declarative/anchors/data/anchors.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/anchors.qml
diff --git a/tests/auto/declarative/anchors/data/centerin.qml b/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml
index 09b97f6..09b97f6 100644
--- a/tests/auto/declarative/anchors/data/centerin.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/centerin.qml
diff --git a/tests/auto/declarative/anchors/data/crash1.qml b/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml
index fd9dc55..fd9dc55 100644
--- a/tests/auto/declarative/anchors/data/crash1.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/crash1.qml
diff --git a/tests/auto/declarative/anchors/data/fill.qml b/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml
index 902465c..902465c 100644
--- a/tests/auto/declarative/anchors/data/fill.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/fill.qml
diff --git a/tests/auto/declarative/anchors/data/loop1.qml b/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml
index a266612..a266612 100644
--- a/tests/auto/declarative/anchors/data/loop1.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/loop1.qml
diff --git a/tests/auto/declarative/anchors/data/loop2.qml b/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml
index acb57cd..acb57cd 100644
--- a/tests/auto/declarative/anchors/data/loop2.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/loop2.qml
diff --git a/tests/auto/declarative/anchors/data/margins.qml b/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml
index 4a29e77..4a29e77 100644
--- a/tests/auto/declarative/anchors/data/margins.qml
+++ b/tests/auto/declarative/qmlgraphicsanchors/data/margins.qml
diff --git a/tests/auto/declarative/behaviors/behaviors.pro b/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
index 8886b0c..755de3f 100644
--- a/tests/auto/declarative/behaviors/behaviors.pro
+++ b/tests/auto/declarative/qmlgraphicsanchors/qmlgraphicsanchors.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_behaviors.cpp
+SOURCES += tst_qmlgraphicsanchors.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
index 4cbfc94..4cbfc94 100644
--- a/tests/auto/declarative/anchors/tst_anchors.cpp
+++ b/tests/auto/declarative/qmlgraphicsanchors/tst_qmlgraphicsanchors.cpp
diff --git a/tests/auto/declarative/animatedimage/data/colors.gif b/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif
index 1270bfa..1270bfa 100644
--- a/tests/auto/declarative/animatedimage/data/colors.gif
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.gif
diff --git a/tests/auto/declarative/animatedimage/data/colors.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml
index 5bada34..5bada34 100644
--- a/tests/auto/declarative/animatedimage/data/colors.qml
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/data/colors.qml
diff --git a/tests/auto/declarative/animatedimage/data/stickman.gif b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif
index 7c4cd18..7c4cd18 100644
--- a/tests/auto/declarative/animatedimage/data/stickman.gif
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.gif
diff --git a/tests/auto/declarative/animatedimage/data/stickman.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml
index a70db5d..a70db5d 100644
--- a/tests/auto/declarative/animatedimage/data/stickman.qml
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickman.qml
diff --git a/tests/auto/declarative/animatedimage/data/stickmanpause.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml
index 7ab17d4..7ab17d4 100644
--- a/tests/auto/declarative/animatedimage/data/stickmanpause.qml
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanpause.qml
diff --git a/tests/auto/declarative/animatedimage/data/stickmanstopped.qml b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml
index 53b0c3a..53b0c3a 100644
--- a/tests/auto/declarative/animatedimage/data/stickmanstopped.qml
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/data/stickmanstopped.qml
diff --git a/tests/auto/declarative/animatedimage/animatedimage.pro b/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro
index 5a8ec6c..877dfab 100644
--- a/tests/auto/declarative/animatedimage/animatedimage.pro
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/qmlgraphicsanimatedimage.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative network
 HEADERS += ../shared/testhttpserver.h
-SOURCES += tst_animatedimage.cpp ../shared/testhttpserver.cpp
+SOURCES += tst_qmlgraphicsanimatedimage.cpp ../shared/testhttpserver.cpp
 macx:CONFIG -= app_bundle
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/animatedimage/tst_animatedimage.cpp b/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp
index ee072c8..ee072c8 100644
--- a/tests/auto/declarative/animatedimage/tst_animatedimage.cpp
+++ b/tests/auto/declarative/qmlgraphicsanimatedimage/tst_qmlgraphicsanimatedimage.cpp
diff --git a/tests/auto/declarative/numberformatter/numberformatter.pro b/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro
index ed7ef22..8113278 100644
--- a/tests/auto/declarative/numberformatter/numberformatter.pro
+++ b/tests/auto/declarative/qmlnumberformatter/qmlnumberformatter.pro
@@ -2,4 +2,4 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative 
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_numberformatter.cpp
+SOURCES += tst_qmlnumberformatter.cpp
diff --git a/tests/auto/declarative/numberformatter/tst_numberformatter.cpp b/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp
index b00e08a..b00e08a 100644
--- a/tests/auto/declarative/numberformatter/tst_numberformatter.cpp
+++ b/tests/auto/declarative/qmlnumberformatter/tst_qmlnumberformatter.cpp
diff --git a/tests/auto/declarative/states/data/ExtendedRectangle.qml b/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml
index 8d64663..8d64663 100644
--- a/tests/auto/declarative/states/data/ExtendedRectangle.qml
+++ b/tests/auto/declarative/qmlstates/data/ExtendedRectangle.qml
diff --git a/tests/auto/declarative/states/data/anchorChanges.qml b/tests/auto/declarative/qmlstates/data/anchorChanges.qml
index 7dce889..7dce889 100644
--- a/tests/auto/declarative/states/data/anchorChanges.qml
+++ b/tests/auto/declarative/qmlstates/data/anchorChanges.qml
diff --git a/tests/auto/declarative/states/data/anchorChanges2.qml b/tests/auto/declarative/qmlstates/data/anchorChanges2.qml
index 545345e..545345e 100644
--- a/tests/auto/declarative/states/data/anchorChanges2.qml
+++ b/tests/auto/declarative/qmlstates/data/anchorChanges2.qml
diff --git a/tests/auto/declarative/states/data/anchorChanges3.qml b/tests/auto/declarative/qmlstates/data/anchorChanges3.qml
index 9d5b317..9d5b317 100644
--- a/tests/auto/declarative/states/data/anchorChanges3.qml
+++ b/tests/auto/declarative/qmlstates/data/anchorChanges3.qml
diff --git a/tests/auto/declarative/states/data/anchorChanges4.qml b/tests/auto/declarative/qmlstates/data/anchorChanges4.qml
index f128989..f128989 100644
--- a/tests/auto/declarative/states/data/anchorChanges4.qml
+++ b/tests/auto/declarative/qmlstates/data/anchorChanges4.qml
diff --git a/tests/auto/declarative/states/data/anchorChanges5.qml b/tests/auto/declarative/qmlstates/data/anchorChanges5.qml
index 4e6d34b..4e6d34b 100644
--- a/tests/auto/declarative/states/data/anchorChanges5.qml
+++ b/tests/auto/declarative/qmlstates/data/anchorChanges5.qml
diff --git a/tests/auto/declarative/states/data/autoStateAtStartupRestoreBug.qml b/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml
index 693a5c5..693a5c5 100644
--- a/tests/auto/declarative/states/data/autoStateAtStartupRestoreBug.qml
+++ b/tests/auto/declarative/qmlstates/data/autoStateAtStartupRestoreBug.qml
diff --git a/tests/auto/declarative/states/data/basicBinding.qml b/tests/auto/declarative/qmlstates/data/basicBinding.qml
index 6528113..6528113 100644
--- a/tests/auto/declarative/states/data/basicBinding.qml
+++ b/tests/auto/declarative/qmlstates/data/basicBinding.qml
diff --git a/tests/auto/declarative/states/data/basicBinding2.qml b/tests/auto/declarative/qmlstates/data/basicBinding2.qml
index 2e7b4cf..2e7b4cf 100644
--- a/tests/auto/declarative/states/data/basicBinding2.qml
+++ b/tests/auto/declarative/qmlstates/data/basicBinding2.qml
diff --git a/tests/auto/declarative/states/data/basicBinding3.qml b/tests/auto/declarative/qmlstates/data/basicBinding3.qml
index a3c47d9..a3c47d9 100644
--- a/tests/auto/declarative/states/data/basicBinding3.qml
+++ b/tests/auto/declarative/qmlstates/data/basicBinding3.qml
diff --git a/tests/auto/declarative/states/data/basicBinding4.qml b/tests/auto/declarative/qmlstates/data/basicBinding4.qml
index 1f52d0e..1f52d0e 100644
--- a/tests/auto/declarative/states/data/basicBinding4.qml
+++ b/tests/auto/declarative/qmlstates/data/basicBinding4.qml
diff --git a/tests/auto/declarative/states/data/basicChanges.qml b/tests/auto/declarative/qmlstates/data/basicChanges.qml
index 88ea256..88ea256 100644
--- a/tests/auto/declarative/states/data/basicChanges.qml
+++ b/tests/auto/declarative/qmlstates/data/basicChanges.qml
diff --git a/tests/auto/declarative/states/data/basicChanges2.qml b/tests/auto/declarative/qmlstates/data/basicChanges2.qml
index 4dd293f..4dd293f 100644
--- a/tests/auto/declarative/states/data/basicChanges2.qml
+++ b/tests/auto/declarative/qmlstates/data/basicChanges2.qml
diff --git a/tests/auto/declarative/states/data/basicChanges3.qml b/tests/auto/declarative/qmlstates/data/basicChanges3.qml
index 62ab1d5..62ab1d5 100644
--- a/tests/auto/declarative/states/data/basicChanges3.qml
+++ b/tests/auto/declarative/qmlstates/data/basicChanges3.qml
diff --git a/tests/auto/declarative/states/data/basicExtension.qml b/tests/auto/declarative/qmlstates/data/basicExtension.qml
index 1836f8a..1836f8a 100644
--- a/tests/auto/declarative/states/data/basicExtension.qml
+++ b/tests/auto/declarative/qmlstates/data/basicExtension.qml
diff --git a/tests/auto/declarative/states/data/deleting.qml b/tests/auto/declarative/qmlstates/data/deleting.qml
index 3da0b12..3da0b12 100644
--- a/tests/auto/declarative/states/data/deleting.qml
+++ b/tests/auto/declarative/qmlstates/data/deleting.qml
diff --git a/tests/auto/declarative/states/data/deletingState.qml b/tests/auto/declarative/qmlstates/data/deletingState.qml
index a5e8ed3..a5e8ed3 100644
--- a/tests/auto/declarative/states/data/deletingState.qml
+++ b/tests/auto/declarative/qmlstates/data/deletingState.qml
diff --git a/tests/auto/declarative/states/data/explicit.qml b/tests/auto/declarative/qmlstates/data/explicit.qml
index 7543f84..7543f84 100644
--- a/tests/auto/declarative/states/data/explicit.qml
+++ b/tests/auto/declarative/qmlstates/data/explicit.qml
diff --git a/tests/auto/declarative/states/data/fakeExtension.qml b/tests/auto/declarative/qmlstates/data/fakeExtension.qml
index c7975e1..c7975e1 100644
--- a/tests/auto/declarative/states/data/fakeExtension.qml
+++ b/tests/auto/declarative/qmlstates/data/fakeExtension.qml
diff --git a/tests/auto/declarative/states/data/illegalTempState.qml b/tests/auto/declarative/qmlstates/data/illegalTempState.qml
index 2702be4..2702be4 100644
--- a/tests/auto/declarative/states/data/illegalTempState.qml
+++ b/tests/auto/declarative/qmlstates/data/illegalTempState.qml
diff --git a/tests/auto/declarative/states/data/legalTempState.qml b/tests/auto/declarative/qmlstates/data/legalTempState.qml
index 54c97b9..54c97b9 100644
--- a/tests/auto/declarative/states/data/legalTempState.qml
+++ b/tests/auto/declarative/qmlstates/data/legalTempState.qml
diff --git a/tests/auto/declarative/states/data/nonExistantProp.qml b/tests/auto/declarative/qmlstates/data/nonExistantProp.qml
index a5dd86a..a5dd86a 100644
--- a/tests/auto/declarative/states/data/nonExistantProp.qml
+++ b/tests/auto/declarative/qmlstates/data/nonExistantProp.qml
diff --git a/tests/auto/declarative/states/data/parentChange.qml b/tests/auto/declarative/qmlstates/data/parentChange.qml
index 087da6b..087da6b 100644
--- a/tests/auto/declarative/states/data/parentChange.qml
+++ b/tests/auto/declarative/qmlstates/data/parentChange.qml
diff --git a/tests/auto/declarative/states/data/parentChange2.qml b/tests/auto/declarative/qmlstates/data/parentChange2.qml
index f0b00f5..f0b00f5 100644
--- a/tests/auto/declarative/states/data/parentChange2.qml
+++ b/tests/auto/declarative/qmlstates/data/parentChange2.qml
diff --git a/tests/auto/declarative/states/data/parentChange3.qml b/tests/auto/declarative/qmlstates/data/parentChange3.qml
index 2aa507c..2aa507c 100644
--- a/tests/auto/declarative/states/data/parentChange3.qml
+++ b/tests/auto/declarative/qmlstates/data/parentChange3.qml
diff --git a/tests/auto/declarative/states/data/parentChange4.qml b/tests/auto/declarative/qmlstates/data/parentChange4.qml
index d00274b..d00274b 100644
--- a/tests/auto/declarative/states/data/parentChange4.qml
+++ b/tests/auto/declarative/qmlstates/data/parentChange4.qml
diff --git a/tests/auto/declarative/states/data/parentChange5.qml b/tests/auto/declarative/qmlstates/data/parentChange5.qml
index f75e2a3..f75e2a3 100644
--- a/tests/auto/declarative/states/data/parentChange5.qml
+++ b/tests/auto/declarative/qmlstates/data/parentChange5.qml
diff --git a/tests/auto/declarative/states/data/propertyErrors.qml b/tests/auto/declarative/qmlstates/data/propertyErrors.qml
index 080e833..080e833 100644
--- a/tests/auto/declarative/states/data/propertyErrors.qml
+++ b/tests/auto/declarative/qmlstates/data/propertyErrors.qml
diff --git a/tests/auto/declarative/states/data/restoreEntryValues.qml b/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml
index 088c608..088c608 100644
--- a/tests/auto/declarative/states/data/restoreEntryValues.qml
+++ b/tests/auto/declarative/qmlstates/data/restoreEntryValues.qml
diff --git a/tests/auto/declarative/states/data/script.qml b/tests/auto/declarative/qmlstates/data/script.qml
index 3c5f33e..3c5f33e 100644
--- a/tests/auto/declarative/states/data/script.qml
+++ b/tests/auto/declarative/qmlstates/data/script.qml
diff --git a/tests/auto/declarative/states/data/signalOverride.qml b/tests/auto/declarative/qmlstates/data/signalOverride.qml
index 5ba1566..5ba1566 100644
--- a/tests/auto/declarative/states/data/signalOverride.qml
+++ b/tests/auto/declarative/qmlstates/data/signalOverride.qml
diff --git a/tests/auto/declarative/states/data/signalOverride2.qml b/tests/auto/declarative/qmlstates/data/signalOverride2.qml
index 527e165..527e165 100644
--- a/tests/auto/declarative/states/data/signalOverride2.qml
+++ b/tests/auto/declarative/qmlstates/data/signalOverride2.qml
diff --git a/tests/auto/declarative/states/data/signalOverrideCrash.qml b/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml
index 702fa86..702fa86 100644
--- a/tests/auto/declarative/states/data/signalOverrideCrash.qml
+++ b/tests/auto/declarative/qmlstates/data/signalOverrideCrash.qml
diff --git a/tests/auto/declarative/states/states.pro b/tests/auto/declarative/qmlstates/qmlstates.pro
index a1f3b02..538734a 100644
--- a/tests/auto/declarative/states/states.pro
+++ b/tests/auto/declarative/qmlstates/qmlstates.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_states.cpp
+SOURCES += tst_qmlstates.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/states/tst_states.cpp b/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
index 9e3387f..9e3387f 100644
--- a/tests/auto/declarative/states/tst_states.cpp
+++ b/tests/auto/declarative/qmlstates/tst_qmlstates.cpp
diff --git a/tests/auto/declarative/valuetypes/data/autoBindingRemoval.2.qml b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml
index ce2e82d..ce2e82d 100644
--- a/tests/auto/declarative/valuetypes/data/autoBindingRemoval.2.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.2.qml
diff --git a/tests/auto/declarative/valuetypes/data/autoBindingRemoval.3.qml b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml
index c82b533..c82b533 100644
--- a/tests/auto/declarative/valuetypes/data/autoBindingRemoval.3.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.3.qml
diff --git a/tests/auto/declarative/valuetypes/data/autoBindingRemoval.qml b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml
index a8a72f5..a8a72f5 100644
--- a/tests/auto/declarative/valuetypes/data/autoBindingRemoval.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/autoBindingRemoval.qml
diff --git a/tests/auto/declarative/valuetypes/data/bindingAssignment.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml
index a652186..a652186 100644
--- a/tests/auto/declarative/valuetypes/data/bindingAssignment.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/bindingAssignment.qml
diff --git a/tests/auto/declarative/valuetypes/data/bindingConflict.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml
index fd25c9f..fd25c9f 100644
--- a/tests/auto/declarative/valuetypes/data/bindingConflict.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/bindingConflict.qml
diff --git a/tests/auto/declarative/valuetypes/data/bindingRead.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml
index 538d776..538d776 100644
--- a/tests/auto/declarative/valuetypes/data/bindingRead.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/bindingRead.qml
diff --git a/tests/auto/declarative/valuetypes/data/bindingVariantCopy.qml b/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml
index 691a56c..691a56c 100644
--- a/tests/auto/declarative/valuetypes/data/bindingVariantCopy.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/bindingVariantCopy.qml
diff --git a/tests/auto/declarative/valuetypes/data/deletedObject.js b/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js
index af298ff..af298ff 100644
--- a/tests/auto/declarative/valuetypes/data/deletedObject.js
+++ b/tests/auto/declarative/qmlvaluetypes/data/deletedObject.js
diff --git a/tests/auto/declarative/valuetypes/data/deletedObject.qml b/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml
index 05459f4..05459f4 100644
--- a/tests/auto/declarative/valuetypes/data/deletedObject.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/deletedObject.qml
diff --git a/tests/auto/declarative/valuetypes/data/font_read.qml b/tests/auto/declarative/qmlvaluetypes/data/font_read.qml
index e1d1ce0..e1d1ce0 100644
--- a/tests/auto/declarative/valuetypes/data/font_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/font_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/font_write.2.qml b/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml
index b559389..b559389 100644
--- a/tests/auto/declarative/valuetypes/data/font_write.2.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/font_write.2.qml
diff --git a/tests/auto/declarative/valuetypes/data/font_write.3.qml b/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml
index 913ac50..913ac50 100644
--- a/tests/auto/declarative/valuetypes/data/font_write.3.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/font_write.3.qml
diff --git a/tests/auto/declarative/valuetypes/data/font_write.qml b/tests/auto/declarative/qmlvaluetypes/data/font_write.qml
index ff4d0a1..ff4d0a1 100644
--- a/tests/auto/declarative/valuetypes/data/font_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/font_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/point_read.qml b/tests/auto/declarative/qmlvaluetypes/data/point_read.qml
index 3e67de6..3e67de6 100644
--- a/tests/auto/declarative/valuetypes/data/point_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/point_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/point_write.qml b/tests/auto/declarative/qmlvaluetypes/data/point_write.qml
index 063525a..063525a 100644
--- a/tests/auto/declarative/valuetypes/data/point_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/point_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/pointf_read.qml b/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml
index d845a5b..d845a5b 100644
--- a/tests/auto/declarative/valuetypes/data/pointf_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/pointf_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/pointf_write.qml b/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml
index 9ee3fc1..9ee3fc1 100644
--- a/tests/auto/declarative/valuetypes/data/pointf_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/pointf_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/rect_read.qml b/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml
index 5364431..5364431 100644
--- a/tests/auto/declarative/valuetypes/data/rect_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/rect_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/rect_write.qml b/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml
index 8add453..8add453 100644
--- a/tests/auto/declarative/valuetypes/data/rect_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/rect_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/rectf_read.qml b/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml
index aeb9f41..aeb9f41 100644
--- a/tests/auto/declarative/valuetypes/data/rectf_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/rectf_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/rectf_write.qml b/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml
index 1e6ff4f..1e6ff4f 100644
--- a/tests/auto/declarative/valuetypes/data/rectf_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/rectf_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/scriptAccess.qml b/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml
index 96592eb..96592eb 100644
--- a/tests/auto/declarative/valuetypes/data/scriptAccess.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/scriptAccess.qml
diff --git a/tests/auto/declarative/valuetypes/data/scriptVariantCopy.qml b/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml
index 29157e8..29157e8 100644
--- a/tests/auto/declarative/valuetypes/data/scriptVariantCopy.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/scriptVariantCopy.qml
diff --git a/tests/auto/declarative/valuetypes/data/size_read.qml b/tests/auto/declarative/qmlvaluetypes/data/size_read.qml
index 86dba03..86dba03 100644
--- a/tests/auto/declarative/valuetypes/data/size_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/size_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/size_write.qml b/tests/auto/declarative/qmlvaluetypes/data/size_write.qml
index 2f9d10e..2f9d10e 100644
--- a/tests/auto/declarative/valuetypes/data/size_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/size_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/sizef_read.qml b/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml
index c6f34e4..c6f34e4 100644
--- a/tests/auto/declarative/valuetypes/data/sizef_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/sizef_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/sizef_write.qml b/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml
index f16f0bd..f16f0bd 100644
--- a/tests/auto/declarative/valuetypes/data/sizef_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/sizef_write.qml
diff --git a/tests/auto/declarative/valuetypes/data/staticAssignment.qml b/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml
index b687f89..b687f89 100644
--- a/tests/auto/declarative/valuetypes/data/staticAssignment.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/staticAssignment.qml
diff --git a/tests/auto/declarative/valuetypes/data/valueInterceptors.qml b/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml
index 026ae83..026ae83 100644
--- a/tests/auto/declarative/valuetypes/data/valueInterceptors.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/valueInterceptors.qml
diff --git a/tests/auto/declarative/valuetypes/data/valueSources.qml b/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml
index d4d4391..d4d4391 100644
--- a/tests/auto/declarative/valuetypes/data/valueSources.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/valueSources.qml
diff --git a/tests/auto/declarative/valuetypes/data/vector3d_read.qml b/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml
index abdf9f0..abdf9f0 100644
--- a/tests/auto/declarative/valuetypes/data/vector3d_read.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/vector3d_read.qml
diff --git a/tests/auto/declarative/valuetypes/data/vector3d_write.qml b/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml
index 9c1bf76..9c1bf76 100644
--- a/tests/auto/declarative/valuetypes/data/vector3d_write.qml
+++ b/tests/auto/declarative/qmlvaluetypes/data/vector3d_write.qml
diff --git a/tests/auto/declarative/valuetypes/valuetypes.pro b/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro
index ae7c731..82d067e 100644
--- a/tests/auto/declarative/valuetypes/valuetypes.pro
+++ b/tests/auto/declarative/qmlvaluetypes/qmlvaluetypes.pro
@@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle
 
 HEADERS += testtypes.h
 
-SOURCES += tst_valuetypes.cpp \
+SOURCES += tst_qmlvaluetypes.cpp \
            testtypes.cpp
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/valuetypes/testtypes.cpp b/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
index 565eb1c..565eb1c 100644
--- a/tests/auto/declarative/valuetypes/testtypes.cpp
+++ b/tests/auto/declarative/qmlvaluetypes/testtypes.cpp
diff --git a/tests/auto/declarative/valuetypes/testtypes.h b/tests/auto/declarative/qmlvaluetypes/testtypes.h
index 67e32f5..67e32f5 100644
--- a/tests/auto/declarative/valuetypes/testtypes.h
+++ b/tests/auto/declarative/qmlvaluetypes/testtypes.h
diff --git a/tests/auto/declarative/valuetypes/tst_valuetypes.cpp b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
index c3d08a2..c3d08a2 100644
--- a/tests/auto/declarative/valuetypes/tst_valuetypes.cpp
+++ b/tests/auto/declarative/qmlvaluetypes/tst_qmlvaluetypes.cpp
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort.expect b/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect
index f43e043..f43e043 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/abort.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort.qml b/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml
index d7b9266..d7b9266 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/abort.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort.reply b/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply
index 35b11f4..35b11f4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/abort.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort_opened.qml b/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml
index 72a45e7..72a45e7 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort_opened.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/abort_opened.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/abort_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml
index aa78cde..aa78cde 100644
--- a/tests/auto/declarative/xmlhttprequest/data/abort_unsent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/abort_unsent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/attr.qml b/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml
index 9049fc7..9049fc7 100644
--- a/tests/auto/declarative/xmlhttprequest/data/attr.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/attr.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/attr.xml b/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml
index 2aa64a3..2aa64a3 100644
--- a/tests/auto/declarative/xmlhttprequest/data/attr.xml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/attr.xml
diff --git a/tests/auto/declarative/xmlhttprequest/data/callbackException.qml b/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml
index 9255922..9255922 100644
--- a/tests/auto/declarative/xmlhttprequest/data/callbackException.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/callbackException.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/cdata.qml b/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml
index b2d0209..b2d0209 100644
--- a/tests/auto/declarative/xmlhttprequest/data/cdata.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/cdata.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/cdata.xml b/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml
index 061d37c..061d37c 100644
--- a/tests/auto/declarative/xmlhttprequest/data/cdata.xml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/cdata.xml
diff --git a/tests/auto/declarative/xmlhttprequest/data/constructor.qml b/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml
index 93e44fd..93e44fd 100644
--- a/tests/auto/declarative/xmlhttprequest/data/constructor.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/constructor.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/defaultState.qml b/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml
index 4dcf6f9..4dcf6f9 100644
--- a/tests/auto/declarative/xmlhttprequest/data/defaultState.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/defaultState.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/document.qml b/tests/auto/declarative/qmlxmlhttprequest/data/document.qml
index e372361..e372361 100644
--- a/tests/auto/declarative/xmlhttprequest/data/document.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/document.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/document.xml b/tests/auto/declarative/qmlxmlhttprequest/data/document.xml
index fb693ea..fb693ea 100644
--- a/tests/auto/declarative/xmlhttprequest/data/document.xml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/document.xml
diff --git a/tests/auto/declarative/xmlhttprequest/data/domExceptionCodes.qml b/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml
index de5ee4f..de5ee4f 100644
--- a/tests/auto/declarative/xmlhttprequest/data/domExceptionCodes.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/domExceptionCodes.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/element.qml b/tests/auto/declarative/qmlxmlhttprequest/data/element.qml
index 78c0374..78c0374 100644
--- a/tests/auto/declarative/xmlhttprequest/data/element.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/element.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/element.xml b/tests/auto/declarative/qmlxmlhttprequest/data/element.xml
index 071ffae..071ffae 100644
--- a/tests/auto/declarative/xmlhttprequest/data/element.xml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/element.xml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml
index 02a8083..02a8083 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_args.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml
index 37124c7..37124c7 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_args.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_args.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_sent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml
index 505e4b1..505e4b1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_sent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_sent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml
index 20fb040..20fb040 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getAllResponseHeaders_unsent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getAllResponseHeaders_unsent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.expect b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml
index 2f949e1..2f949e1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.reply b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply
index 62ec67b..62ec67b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_args.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml
index d5aa4b1..d5aa4b1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_args.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_args.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_sent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml
index 7538ffd..7538ffd 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_sent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_sent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml
index 3b55802..3b55802 100644
--- a/tests/auto/declarative/xmlhttprequest/data/getResponseHeader_unsent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/getResponseHeader_unsent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/instanceStateValues.qml b/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml
index b8d01c4..b8d01c4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/instanceStateValues.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/instanceStateValues.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/invalidMethodUsage.qml b/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml
index b30989b..b30989b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/invalidMethodUsage.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/invalidMethodUsage.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open.qml
index c06bae3..c06bae3 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.1.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml
index b6d4c32..b6d4c32 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.1.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.1.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.2.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml
index 8c86c20..8c86c20 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_arg_count.2.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_arg_count.2.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_invalid_method.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml
index 69f79ae..69f79ae 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_invalid_method.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_invalid_method.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_network.expect b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_network.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_network.reply b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply
index 35b11f4..35b11f4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_network.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_network.wait b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait
index e69de29..e69de29 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_network.wait
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_network.wait
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_sync.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml
index 1477279..1477279 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_sync.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_sync.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_user.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml
index 19e37fa..19e37fa 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_user.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_user.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/open_username.qml b/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml
index 983ea14..983ea14 100644
--- a/tests/auto/declarative/xmlhttprequest/data/open_username.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/open_username.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/redirectError.qml b/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml
index 6b345cc..6b345cc 100644
--- a/tests/auto/declarative/xmlhttprequest/data/redirectError.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/redirectError.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/redirectRecur.qml b/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml
index c0321dc..c0321dc 100644
--- a/tests/auto/declarative/xmlhttprequest/data/redirectRecur.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/redirectRecur.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/redirects.qml b/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml
index f6fabdb..f6fabdb 100644
--- a/tests/auto/declarative/xmlhttprequest/data/redirects.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/redirects.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/redirecttarget.html b/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html
index 95f35e0..95f35e0 100644
--- a/tests/auto/declarative/xmlhttprequest/data/redirecttarget.html
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/redirecttarget.html
diff --git a/tests/auto/declarative/xmlhttprequest/data/responseText.qml b/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml
index 4bb3a7a..4bb3a7a 100644
--- a/tests/auto/declarative/xmlhttprequest/data/responseText.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/responseText.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/responseXML_invalid.qml b/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml
index 63f288e..63f288e 100644
--- a/tests/auto/declarative/xmlhttprequest/data/responseXML_invalid.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/responseXML_invalid.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/seconddocument.html b/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html
index a33f44b..a33f44b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/seconddocument.html
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/seconddocument.html
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_alreadySent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml
index 0bad7df..0bad7df 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_alreadySent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_alreadySent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.1.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect
index 81dd4a0..81dd4a0 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.1.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.1.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml
index 03543a9..03543a9 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.1.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.1.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.2.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml
index 79a27b6..79a27b6 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.2.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.2.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.3.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml
index e048769..e048769 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.3.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.3.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.4.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect
index 8fcf3ac..8fcf3ac 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.4.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.4.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml
index 7ab0b27..7ab0b27 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.4.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.4.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.5.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml
index 29bf2c2..29bf2c2 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.5.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.5.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.6.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect
index 97e6fac..97e6fac 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.6.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.6.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml
index 135f45c..135f45c 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.6.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.6.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.7.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml
index 4a09527..4a09527 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.7.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.7.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_data.reply b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply
index 35b11f4..35b11f4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_data.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_data.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml
index dd5fa46..dd5fa46 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.reply b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply
index 35b11f4..35b11f4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData_GET.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_GET.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData_PUT.expect b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect
index 991bd59..991bd59 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_ignoreData_PUT.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_ignoreData_PUT.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/send_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml
index 7f51ecf..7f51ecf 100644
--- a/tests/auto/declarative/xmlhttprequest/data/send_unsent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/send_unsent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.expect b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect
index 4600f2a..4600f2a 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml
index b0723aa..b0723aa 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.reply b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply
index 35b11f4..35b11f4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_args.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml
index 8305ae1..8305ae1 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_args.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_args.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml
index bf31eca..bf31eca 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_illegalName.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_illegalName.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml
index c2bbc6e..c2bbc6e 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_sent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_sent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_unsent.qml b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml
index 30bc93e..30bc93e 100644
--- a/tests/auto/declarative/xmlhttprequest/data/setRequestHeader_unsent.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/setRequestHeader_unsent.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/staticStateValues.qml b/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml
index ec1c5d8..ec1c5d8 100644
--- a/tests/auto/declarative/xmlhttprequest/data/staticStateValues.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/staticStateValues.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/status.200.reply b/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply
index 35b11f4..35b11f4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/status.200.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/status.200.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/status.404.reply b/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply
index 964a7a8..964a7a8 100644
--- a/tests/auto/declarative/xmlhttprequest/data/status.404.reply
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/status.404.reply
diff --git a/tests/auto/declarative/xmlhttprequest/data/status.expect b/tests/auto/declarative/qmlxmlhttprequest/data/status.expect
index a740c79..a740c79 100644
--- a/tests/auto/declarative/xmlhttprequest/data/status.expect
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/status.expect
diff --git a/tests/auto/declarative/xmlhttprequest/data/status.qml b/tests/auto/declarative/qmlxmlhttprequest/data/status.qml
index 04202c4..04202c4 100644
--- a/tests/auto/declarative/xmlhttprequest/data/status.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/status.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/statusText.qml b/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml
index 8becc3b..8becc3b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/statusText.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/statusText.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/testdocument.html b/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html
index 8fe0f4b..8fe0f4b 100644
--- a/tests/auto/declarative/xmlhttprequest/data/testdocument.html
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/testdocument.html
diff --git a/tests/auto/declarative/xmlhttprequest/data/text.qml b/tests/auto/declarative/qmlxmlhttprequest/data/text.qml
index 4615a07..4615a07 100644
--- a/tests/auto/declarative/xmlhttprequest/data/text.qml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/text.qml
diff --git a/tests/auto/declarative/xmlhttprequest/data/text.xml b/tests/auto/declarative/qmlxmlhttprequest/data/text.xml
index e741688..e741688 100644
--- a/tests/auto/declarative/xmlhttprequest/data/text.xml
+++ b/tests/auto/declarative/qmlxmlhttprequest/data/text.xml
diff --git a/tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro b/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro
index 1da28e5..ed87b2a 100644
--- a/tests/auto/declarative/xmlhttprequest/xmlhttprequest.pro
+++ b/tests/auto/declarative/qmlxmlhttprequest/qmlxmlhttprequest.pro
@@ -5,7 +5,7 @@ macx:CONFIG -= app_bundle
 INCLUDEPATH += ../shared/
 HEADERS += ../shared/testhttpserver.h
 
-SOURCES += tst_xmlhttprequest.cpp \
+SOURCES += tst_qmlxmlhttprequest.cpp \
            ../shared/testhttpserver.cpp
 
 
diff --git a/tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp b/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp
index 253e041..253e041 100644
--- a/tests/auto/declarative/xmlhttprequest/tst_xmlhttprequest.cpp
+++ b/tests/auto/declarative/qmlxmlhttprequest/tst_qmlxmlhttprequest.cpp