369 files changed, 8 insertions, 4 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 8319e4aa20..6e42c14362 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -10,6 +10,7 @@ SUBDIRS += \
     other \
 
 !cross_compile:                             SUBDIRS += host.pro
+!cross_compile:                             SUBDIRS += tools
 contains(QT_CONFIG, opengl):                SUBDIRS += opengl
 unix:!embedded:contains(QT_CONFIG, dbus):   SUBDIRS += dbus
 contains(QT_CONFIG, v8):                    SUBDIRS += v8.pro
diff --git a/tests/auto/host.pro b/tests/auto/host.pro
index d4cb8adb90..045490a352 100644
--- a/tests/auto/host.pro
+++ b/tests/auto/host.pro
@@ -1,8 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-           moc \
-           uic \
-           qmake \
-           rcc \
            #uiloader \      # QTBUG-19453: this test has hardcoded machine names etc.
 
diff --git a/tests/auto/moc/.gitattributes b/tests/auto/tools/moc/.gitattributes
index ccf34c31a4..ccf34c31a4 100644
--- a/tests/auto/moc/.gitattributes
+++ b/tests/auto/tools/moc/.gitattributes
diff --git a/tests/auto/moc/.gitignore b/tests/auto/tools/moc/.gitignore
index 86a604a776..86a604a776 100644
--- a/tests/auto/moc/.gitignore
+++ b/tests/auto/tools/moc/.gitignore
diff --git a/tests/auto/moc/Header b/tests/auto/tools/moc/Header
index b7066b7635..b7066b7635 100644
--- a/tests/auto/moc/Header
+++ b/tests/auto/tools/moc/Header
diff --git a/tests/auto/moc/Test.framework/Headers/testinterface.h b/tests/auto/tools/moc/Test.framework/Headers/testinterface.h
index 9662a02bc3..9662a02bc3 100644
--- a/tests/auto/moc/Test.framework/Headers/testinterface.h
+++ b/tests/auto/tools/moc/Test.framework/Headers/testinterface.h
diff --git a/tests/auto/moc/assign-namespace.h b/tests/auto/tools/moc/assign-namespace.h
index fc6631c18b..fc6631c18b 100644
--- a/tests/auto/moc/assign-namespace.h
+++ b/tests/auto/tools/moc/assign-namespace.h
diff --git a/tests/auto/moc/backslash-newlines.h b/tests/auto/tools/moc/backslash-newlines.h
index d65c15c6d5..d65c15c6d5 100644
--- a/tests/auto/moc/backslash-newlines.h
+++ b/tests/auto/tools/moc/backslash-newlines.h
diff --git a/tests/auto/moc/c-comments.h b/tests/auto/tools/moc/c-comments.h
index 8c0709338d..8c0709338d 100644
--- a/tests/auto/moc/c-comments.h
+++ b/tests/auto/tools/moc/c-comments.h
diff --git a/tests/auto/moc/cstyle-enums.h b/tests/auto/tools/moc/cstyle-enums.h
index 59076a535f..59076a535f 100644
--- a/tests/auto/moc/cstyle-enums.h
+++ b/tests/auto/tools/moc/cstyle-enums.h
diff --git a/tests/auto/moc/dir-in-include-path.h b/tests/auto/tools/moc/dir-in-include-path.h
index b69514ec74..b69514ec74 100644
--- a/tests/auto/moc/dir-in-include-path.h
+++ b/tests/auto/tools/moc/dir-in-include-path.h
diff --git a/tests/auto/moc/error-on-wrong-notify.h b/tests/auto/tools/moc/error-on-wrong-notify.h
index 381932a265..381932a265 100644
--- a/tests/auto/moc/error-on-wrong-notify.h
+++ b/tests/auto/tools/moc/error-on-wrong-notify.h
diff --git a/tests/auto/moc/escapes-in-string-literals.h b/tests/auto/tools/moc/escapes-in-string-literals.h
index 437ceae82b..437ceae82b 100644
--- a/tests/auto/moc/escapes-in-string-literals.h
+++ b/tests/auto/tools/moc/escapes-in-string-literals.h
diff --git a/tests/auto/moc/extraqualification.h b/tests/auto/tools/moc/extraqualification.h
index b2b028eb03..b2b028eb03 100644
--- a/tests/auto/moc/extraqualification.h
+++ b/tests/auto/tools/moc/extraqualification.h
diff --git a/tests/auto/moc/forgotten-qinterface.h b/tests/auto/tools/moc/forgotten-qinterface.h
index e52a63e4df..e52a63e4df 100644
--- a/tests/auto/moc/forgotten-qinterface.h
+++ b/tests/auto/tools/moc/forgotten-qinterface.h
diff --git a/tests/auto/moc/gadgetwithnoenums.h b/tests/auto/tools/moc/gadgetwithnoenums.h
index c5ec939b3a..c5ec939b3a 100644
--- a/tests/auto/moc/gadgetwithnoenums.h
+++ b/tests/auto/tools/moc/gadgetwithnoenums.h
diff --git a/tests/auto/moc/interface-from-framework.h b/tests/auto/tools/moc/interface-from-framework.h
index 242d9f2286..242d9f2286 100644
--- a/tests/auto/moc/interface-from-framework.h
+++ b/tests/auto/tools/moc/interface-from-framework.h
diff --git a/tests/auto/moc/macro-on-cmdline.h b/tests/auto/tools/moc/macro-on-cmdline.h
index a1c162d10b..a1c162d10b 100644
--- a/tests/auto/moc/macro-on-cmdline.h
+++ b/tests/auto/tools/moc/macro-on-cmdline.h
diff --git a/tests/auto/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index 056c6b0958..056c6b0958 100644
--- a/tests/auto/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
diff --git a/tests/auto/moc/namespaced-flags.h b/tests/auto/tools/moc/namespaced-flags.h
index b1c10792c1..b1c10792c1 100644
--- a/tests/auto/moc/namespaced-flags.h
+++ b/tests/auto/tools/moc/namespaced-flags.h
diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/tools/moc/no-keywords.h
index 2da7100aeb..2da7100aeb 100644
--- a/tests/auto/moc/no-keywords.h
+++ b/tests/auto/tools/moc/no-keywords.h
diff --git a/tests/auto/moc/oldstyle-casts.h b/tests/auto/tools/moc/oldstyle-casts.h
index 2754bb4e18..2754bb4e18 100644
--- a/tests/auto/moc/oldstyle-casts.h
+++ b/tests/auto/tools/moc/oldstyle-casts.h
diff --git a/tests/auto/moc/os9-newlines.h b/tests/auto/tools/moc/os9-newlines.h
index 335724d808..335724d808 100644
--- a/tests/auto/moc/os9-newlines.h
+++ b/tests/auto/tools/moc/os9-newlines.h
diff --git a/tests/auto/moc/parse-boost.h b/tests/auto/tools/moc/parse-boost.h
index 9453f7f2bf..9453f7f2bf 100644
--- a/tests/auto/moc/parse-boost.h
+++ b/tests/auto/tools/moc/parse-boost.h
diff --git a/tests/auto/moc/pure-virtual-signals.h b/tests/auto/tools/moc/pure-virtual-signals.h
index a70370c5bc..a70370c5bc 100644
--- a/tests/auto/moc/pure-virtual-signals.h
+++ b/tests/auto/tools/moc/pure-virtual-signals.h
diff --git a/tests/auto/moc/qinvokable.h b/tests/auto/tools/moc/qinvokable.h
index 313a49d7a8..313a49d7a8 100644
--- a/tests/auto/moc/qinvokable.h
+++ b/tests/auto/tools/moc/qinvokable.h
diff --git a/tests/auto/moc/qprivateslots.h b/tests/auto/tools/moc/qprivateslots.h
index 4713b41522..4713b41522 100644
--- a/tests/auto/moc/qprivateslots.h
+++ b/tests/auto/tools/moc/qprivateslots.h
diff --git a/tests/auto/moc/single_function_keyword.h b/tests/auto/tools/moc/single_function_keyword.h
index 1ce2517e4c..1ce2517e4c 100644
--- a/tests/auto/moc/single_function_keyword.h
+++ b/tests/auto/tools/moc/single_function_keyword.h
diff --git a/tests/auto/moc/slots-with-void-template.h b/tests/auto/tools/moc/slots-with-void-template.h
index 62eb42e13d..62eb42e13d 100644
--- a/tests/auto/moc/slots-with-void-template.h
+++ b/tests/auto/tools/moc/slots-with-void-template.h
diff --git a/tests/auto/moc/task189996.h b/tests/auto/tools/moc/task189996.h
index 6f8701f008..6f8701f008 100644
--- a/tests/auto/moc/task189996.h
+++ b/tests/auto/tools/moc/task189996.h
diff --git a/tests/auto/moc/task192552.h b/tests/auto/tools/moc/task192552.h
index 016d12a12a..016d12a12a 100644
--- a/tests/auto/moc/task192552.h
+++ b/tests/auto/tools/moc/task192552.h
diff --git a/tests/auto/moc/task234909.h b/tests/auto/tools/moc/task234909.h
index a24e0b301a..a24e0b301a 100644
--- a/tests/auto/moc/task234909.h
+++ b/tests/auto/tools/moc/task234909.h
diff --git a/tests/auto/moc/task240368.h b/tests/auto/tools/moc/task240368.h
index 320cad3ff8..320cad3ff8 100644
--- a/tests/auto/moc/task240368.h
+++ b/tests/auto/tools/moc/task240368.h
diff --git a/tests/auto/moc/task71021/dummy b/tests/auto/tools/moc/task71021/dummy
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/moc/task71021/dummy
+++ b/tests/auto/tools/moc/task71021/dummy
diff --git a/tests/auto/moc/task87883.h b/tests/auto/tools/moc/task87883.h
index aedbd386c9..aedbd386c9 100644
--- a/tests/auto/moc/task87883.h
+++ b/tests/auto/tools/moc/task87883.h
diff --git a/tests/auto/moc/template-gtgt.h b/tests/auto/tools/moc/template-gtgt.h
index 42aae6e633..42aae6e633 100644
--- a/tests/auto/moc/template-gtgt.h
+++ b/tests/auto/tools/moc/template-gtgt.h
diff --git a/tests/auto/moc/testproject/Plugin/Plugin.h b/tests/auto/tools/moc/testproject/Plugin/Plugin.h
index 6c8cffe7d9..6c8cffe7d9 100644
--- a/tests/auto/moc/testproject/Plugin/Plugin.h
+++ b/tests/auto/tools/moc/testproject/Plugin/Plugin.h
diff --git a/tests/auto/moc/testproject/include/Plugin b/tests/auto/tools/moc/testproject/include/Plugin
index d63149c930..d63149c930 100644
--- a/tests/auto/moc/testproject/include/Plugin
+++ b/tests/auto/tools/moc/testproject/include/Plugin
diff --git a/tests/auto/moc/trigraphs.h b/tests/auto/tools/moc/trigraphs.h
index cb074e7dcd..cb074e7dcd 100644
--- a/tests/auto/moc/trigraphs.h
+++ b/tests/auto/tools/moc/trigraphs.h
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index f3107b9c85..f3107b9c85 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
diff --git a/tests/auto/moc/using-namespaces.h b/tests/auto/tools/moc/using-namespaces.h
index 6be9c283a3..6be9c283a3 100644
--- a/tests/auto/moc/using-namespaces.h
+++ b/tests/auto/tools/moc/using-namespaces.h
diff --git a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h b/tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h
index a72f86a7cc..a72f86a7cc 100644
--- a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h
+++ b/tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h
diff --git a/tests/auto/moc/warn-on-property-without-read.h b/tests/auto/tools/moc/warn-on-property-without-read.h
index 77fbedab14..77fbedab14 100644
--- a/tests/auto/moc/warn-on-property-without-read.h
+++ b/tests/auto/tools/moc/warn-on-property-without-read.h
diff --git a/tests/auto/moc/win-newlines.h b/tests/auto/tools/moc/win-newlines.h
index 568cd300f7..568cd300f7 100644
--- a/tests/auto/moc/win-newlines.h
+++ b/tests/auto/tools/moc/win-newlines.h
diff --git a/tests/auto/qmake/.gitignore b/tests/auto/tools/qmake/.gitignore
index bac457d34d..bac457d34d 100644
--- a/tests/auto/qmake/.gitignore
+++ b/tests/auto/tools/qmake/.gitignore
diff --git a/tests/auto/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro
index d0faa872b8..d0faa872b8 100644
--- a/tests/auto/qmake/qmake.pro
+++ b/tests/auto/tools/qmake/qmake.pro
diff --git a/tests/auto/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp
index 1f21713b99..1f21713b99 100644
--- a/tests/auto/qmake/testcompiler.cpp
+++ b/tests/auto/tools/qmake/testcompiler.cpp
diff --git a/tests/auto/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h
index fa827685f7..fa827685f7 100644
--- a/tests/auto/qmake/testcompiler.h
+++ b/tests/auto/tools/qmake/testcompiler.h
diff --git a/tests/auto/qmake/testdata/bundle-spaces/bundle-spaces.pro b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro
index 644a817a8e..644a817a8e 100644
--- a/tests/auto/qmake/testdata/bundle-spaces/bundle-spaces.pro
+++ b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro
diff --git a/tests/auto/qmake/testdata/bundle-spaces/existing file b/tests/auto/tools/qmake/testdata/bundle-spaces/existing file
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/bundle-spaces/existing file
+++ b/tests/auto/tools/qmake/testdata/bundle-spaces/existing file
diff --git a/tests/auto/qmake/testdata/bundle-spaces/main.cpp b/tests/auto/tools/qmake/testdata/bundle-spaces/main.cpp
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/bundle-spaces/main.cpp
+++ b/tests/auto/tools/qmake/testdata/bundle-spaces/main.cpp
diff --git a/tests/auto/qmake/testdata/bundle-spaces/some-file b/tests/auto/tools/qmake/testdata/bundle-spaces/some-file
index 9975dba4ba..9975dba4ba 100644
--- a/tests/auto/qmake/testdata/bundle-spaces/some-file
+++ b/tests/auto/tools/qmake/testdata/bundle-spaces/some-file
diff --git a/tests/auto/qmake/testdata/comments/comments.pro b/tests/auto/tools/qmake/testdata/comments/comments.pro
index 5f1ac083fa..5f1ac083fa 100644
--- a/tests/auto/qmake/testdata/comments/comments.pro
+++ b/tests/auto/tools/qmake/testdata/comments/comments.pro
diff --git a/tests/auto/qmake/testdata/duplicateLibraryEntries/duplib.pro b/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro
index 3c30bbbdcd..3c30bbbdcd 100644
--- a/tests/auto/qmake/testdata/duplicateLibraryEntries/duplib.pro
+++ b/tests/auto/tools/qmake/testdata/duplicateLibraryEntries/duplib.pro
diff --git a/tests/auto/qmake/testdata/export_across_file_boundaries/.qmake.cache b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/.qmake.cache
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/export_across_file_boundaries/.qmake.cache
+++ b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/.qmake.cache
diff --git a/tests/auto/qmake/testdata/export_across_file_boundaries/features/default_pre.prf b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/features/default_pre.prf
index 123f9bc53d..123f9bc53d 100644
--- a/tests/auto/qmake/testdata/export_across_file_boundaries/features/default_pre.prf
+++ b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/features/default_pre.prf
diff --git a/tests/auto/qmake/testdata/export_across_file_boundaries/foo.pro b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/foo.pro
index c3196cbceb..c3196cbceb 100644
--- a/tests/auto/qmake/testdata/export_across_file_boundaries/foo.pro
+++ b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/foo.pro
diff --git a/tests/auto/qmake/testdata/export_across_file_boundaries/oink.pri b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri
index cbd2d0f7d0..cbd2d0f7d0 100644
--- a/tests/auto/qmake/testdata/export_across_file_boundaries/oink.pri
+++ b/tests/auto/tools/qmake/testdata/export_across_file_boundaries/oink.pri
diff --git a/tests/auto/qmake/testdata/findDeps/findDeps.pro b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro
index 43577b5122..43577b5122 100644
--- a/tests/auto/qmake/testdata/findDeps/findDeps.pro
+++ b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro
diff --git a/tests/auto/qmake/testdata/findDeps/main.cpp b/tests/auto/tools/qmake/testdata/findDeps/main.cpp
index f203909aa4..f203909aa4 100644
--- a/tests/auto/qmake/testdata/findDeps/main.cpp
+++ b/tests/auto/tools/qmake/testdata/findDeps/main.cpp
diff --git a/tests/auto/qmake/testdata/findDeps/object1.h b/tests/auto/tools/qmake/testdata/findDeps/object1.h
index fe29c9d5d8..fe29c9d5d8 100644
--- a/tests/auto/qmake/testdata/findDeps/object1.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object1.h
diff --git a/tests/auto/qmake/testdata/findDeps/object2.h b/tests/auto/tools/qmake/testdata/findDeps/object2.h
index c03434a7a7..c03434a7a7 100644
--- a/tests/auto/qmake/testdata/findDeps/object2.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object2.h
diff --git a/tests/auto/qmake/testdata/findDeps/object3.h b/tests/auto/tools/qmake/testdata/findDeps/object3.h
index 63fd98248a..63fd98248a 100644
--- a/tests/auto/qmake/testdata/findDeps/object3.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object3.h
diff --git a/tests/auto/qmake/testdata/findDeps/object4.h b/tests/auto/tools/qmake/testdata/findDeps/object4.h
index d1191b72cb..d1191b72cb 100644
--- a/tests/auto/qmake/testdata/findDeps/object4.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object4.h
diff --git a/tests/auto/qmake/testdata/findDeps/object5.h b/tests/auto/tools/qmake/testdata/findDeps/object5.h
index 3bce90fa0b..3bce90fa0b 100644
--- a/tests/auto/qmake/testdata/findDeps/object5.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object5.h
diff --git a/tests/auto/qmake/testdata/findDeps/object6.h b/tests/auto/tools/qmake/testdata/findDeps/object6.h
index 1c4bbd22b5..1c4bbd22b5 100644
--- a/tests/auto/qmake/testdata/findDeps/object6.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object6.h
diff --git a/tests/auto/qmake/testdata/findDeps/object7.h b/tests/auto/tools/qmake/testdata/findDeps/object7.h
index 8b0f328a30..8b0f328a30 100644
--- a/tests/auto/qmake/testdata/findDeps/object7.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object7.h
diff --git a/tests/auto/qmake/testdata/findDeps/object8.h b/tests/auto/tools/qmake/testdata/findDeps/object8.h
index d768e1d9b5..d768e1d9b5 100644
--- a/tests/auto/qmake/testdata/findDeps/object8.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object8.h
diff --git a/tests/auto/qmake/testdata/findDeps/object9.h b/tests/auto/tools/qmake/testdata/findDeps/object9.h
index 734437ad6f..734437ad6f 100644
--- a/tests/auto/qmake/testdata/findDeps/object9.h
+++ b/tests/auto/tools/qmake/testdata/findDeps/object9.h
diff --git a/tests/auto/qmake/testdata/findMocs/findMocs.pro b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro
index 1469b4c5c3..1469b4c5c3 100644
--- a/tests/auto/qmake/testdata/findMocs/findMocs.pro
+++ b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro
diff --git a/tests/auto/qmake/testdata/findMocs/main.cpp b/tests/auto/tools/qmake/testdata/findMocs/main.cpp
index 2413dcc2a1..2413dcc2a1 100644
--- a/tests/auto/qmake/testdata/findMocs/main.cpp
+++ b/tests/auto/tools/qmake/testdata/findMocs/main.cpp
diff --git a/tests/auto/qmake/testdata/findMocs/object1.h b/tests/auto/tools/qmake/testdata/findMocs/object1.h
index c62b314e14..c62b314e14 100644
--- a/tests/auto/qmake/testdata/findMocs/object1.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object1.h
diff --git a/tests/auto/qmake/testdata/findMocs/object2.h b/tests/auto/tools/qmake/testdata/findMocs/object2.h
index 8a873c3875..8a873c3875 100644
--- a/tests/auto/qmake/testdata/findMocs/object2.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object2.h
diff --git a/tests/auto/qmake/testdata/findMocs/object3.h b/tests/auto/tools/qmake/testdata/findMocs/object3.h
index 6e61f1cb5f..6e61f1cb5f 100644
--- a/tests/auto/qmake/testdata/findMocs/object3.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object3.h
diff --git a/tests/auto/qmake/testdata/findMocs/object4.h b/tests/auto/tools/qmake/testdata/findMocs/object4.h
index 2e51228476..2e51228476 100644
--- a/tests/auto/qmake/testdata/findMocs/object4.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object4.h
diff --git a/tests/auto/qmake/testdata/findMocs/object5.h b/tests/auto/tools/qmake/testdata/findMocs/object5.h
index d3addb2ddf..d3addb2ddf 100644
--- a/tests/auto/qmake/testdata/findMocs/object5.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object5.h
diff --git a/tests/auto/qmake/testdata/findMocs/object6.h b/tests/auto/tools/qmake/testdata/findMocs/object6.h
index 17b56ac2ed..17b56ac2ed 100644
--- a/tests/auto/qmake/testdata/findMocs/object6.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object6.h
diff --git a/tests/auto/qmake/testdata/findMocs/object7.h b/tests/auto/tools/qmake/testdata/findMocs/object7.h
index 981a3d5689..981a3d5689 100644
--- a/tests/auto/qmake/testdata/findMocs/object7.h
+++ b/tests/auto/tools/qmake/testdata/findMocs/object7.h
diff --git a/tests/auto/qmake/testdata/func_export/func_export.pro b/tests/auto/tools/qmake/testdata/func_export/func_export.pro
index 0cff1f830e..0cff1f830e 100644
--- a/tests/auto/qmake/testdata/func_export/func_export.pro
+++ b/tests/auto/tools/qmake/testdata/func_export/func_export.pro
diff --git a/tests/auto/qmake/testdata/func_variables/func_variables.pro b/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro
index 9b786f7eda..9b786f7eda 100644
--- a/tests/auto/qmake/testdata/func_variables/func_variables.pro
+++ b/tests/auto/tools/qmake/testdata/func_variables/func_variables.pro
diff --git a/tests/auto/qmake/testdata/functions/1.cpp b/tests/auto/tools/qmake/testdata/functions/1.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/1.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/1.cpp
diff --git a/tests/auto/qmake/testdata/functions/2.cpp b/tests/auto/tools/qmake/testdata/functions/2.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/2.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/2.cpp
diff --git a/tests/auto/qmake/testdata/functions/functions.pro b/tests/auto/tools/qmake/testdata/functions/functions.pro
index ad66ee863d..ad66ee863d 100644
--- a/tests/auto/qmake/testdata/functions/functions.pro
+++ b/tests/auto/tools/qmake/testdata/functions/functions.pro
diff --git a/tests/auto/qmake/testdata/functions/infiletest.pro b/tests/auto/tools/qmake/testdata/functions/infiletest.pro
index b2492e19d9..b2492e19d9 100644
--- a/tests/auto/qmake/testdata/functions/infiletest.pro
+++ b/tests/auto/tools/qmake/testdata/functions/infiletest.pro
diff --git a/tests/auto/qmake/testdata/functions/one/1.cpp b/tests/auto/tools/qmake/testdata/functions/one/1.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/one/1.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/one/1.cpp
diff --git a/tests/auto/qmake/testdata/functions/one/2.cpp b/tests/auto/tools/qmake/testdata/functions/one/2.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/one/2.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/one/2.cpp
diff --git a/tests/auto/qmake/testdata/functions/three/wildcard21.cpp b/tests/auto/tools/qmake/testdata/functions/three/wildcard21.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/three/wildcard21.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/three/wildcard21.cpp
diff --git a/tests/auto/qmake/testdata/functions/three/wildcard22.cpp b/tests/auto/tools/qmake/testdata/functions/three/wildcard22.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/three/wildcard22.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/three/wildcard22.cpp
diff --git a/tests/auto/qmake/testdata/functions/two/1.cpp b/tests/auto/tools/qmake/testdata/functions/two/1.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/two/1.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/two/1.cpp
diff --git a/tests/auto/qmake/testdata/functions/two/2.cpp b/tests/auto/tools/qmake/testdata/functions/two/2.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/two/2.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/two/2.cpp
diff --git a/tests/auto/qmake/testdata/functions/wildcard21.cpp b/tests/auto/tools/qmake/testdata/functions/wildcard21.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/wildcard21.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/wildcard21.cpp
diff --git a/tests/auto/qmake/testdata/functions/wildcard22.cpp b/tests/auto/tools/qmake/testdata/functions/wildcard22.cpp
index df92035b61..df92035b61 100644
--- a/tests/auto/qmake/testdata/functions/wildcard22.cpp
+++ b/tests/auto/tools/qmake/testdata/functions/wildcard22.cpp
diff --git a/tests/auto/qmake/testdata/include_dir/foo.pro b/tests/auto/tools/qmake/testdata/include_dir/foo.pro
index ff4a5cd158..ff4a5cd158 100644
--- a/tests/auto/qmake/testdata/include_dir/foo.pro
+++ b/tests/auto/tools/qmake/testdata/include_dir/foo.pro
diff --git a/tests/auto/qmake/testdata/include_dir/main.cpp b/tests/auto/tools/qmake/testdata/include_dir/main.cpp
index 8471e367e9..8471e367e9 100644
--- a/tests/auto/qmake/testdata/include_dir/main.cpp
+++ b/tests/auto/tools/qmake/testdata/include_dir/main.cpp
diff --git a/tests/auto/qmake/testdata/include_dir/test_file.cpp b/tests/auto/tools/qmake/testdata/include_dir/test_file.cpp
index 43807d0867..43807d0867 100644
--- a/tests/auto/qmake/testdata/include_dir/test_file.cpp
+++ b/tests/auto/tools/qmake/testdata/include_dir/test_file.cpp
diff --git a/tests/auto/qmake/testdata/include_dir/test_file.h b/tests/auto/tools/qmake/testdata/include_dir/test_file.h
index 994874284e..994874284e 100644
--- a/tests/auto/qmake/testdata/include_dir/test_file.h
+++ b/tests/auto/tools/qmake/testdata/include_dir/test_file.h
diff --git a/tests/auto/qmake/testdata/include_dir/untitled.ui b/tests/auto/tools/qmake/testdata/include_dir/untitled.ui
index 2aecd3c943..2aecd3c943 100644
--- a/tests/auto/qmake/testdata/include_dir/untitled.ui
+++ b/tests/auto/tools/qmake/testdata/include_dir/untitled.ui
diff --git a/tests/auto/qmake/testdata/include_dir_build/README b/tests/auto/tools/qmake/testdata/include_dir_build/README
index 46017fc43e..46017fc43e 100644
--- a/tests/auto/qmake/testdata/include_dir_build/README
+++ b/tests/auto/tools/qmake/testdata/include_dir_build/README
diff --git a/tests/auto/qmake/testdata/include_function/existing_file.pri b/tests/auto/tools/qmake/testdata/include_function/existing_file.pri
index 8b9aaca340..8b9aaca340 100644
--- a/tests/auto/qmake/testdata/include_function/existing_file.pri
+++ b/tests/auto/tools/qmake/testdata/include_function/existing_file.pri
diff --git a/tests/auto/qmake/testdata/include_function/include_existing_file.pro b/tests/auto/tools/qmake/testdata/include_function/include_existing_file.pro
index 424062a9ac..424062a9ac 100644
--- a/tests/auto/qmake/testdata/include_function/include_existing_file.pro
+++ b/tests/auto/tools/qmake/testdata/include_function/include_existing_file.pro
diff --git a/tests/auto/qmake/testdata/include_function/include_missing_file.pro b/tests/auto/tools/qmake/testdata/include_function/include_missing_file.pro
index 0b59981240..0b59981240 100644
--- a/tests/auto/qmake/testdata/include_function/include_missing_file.pro
+++ b/tests/auto/tools/qmake/testdata/include_function/include_missing_file.pro
diff --git a/tests/auto/qmake/testdata/include_function/include_missing_file2.pro b/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro
index 542b9ff516..542b9ff516 100644
--- a/tests/auto/qmake/testdata/include_function/include_missing_file2.pro
+++ b/tests/auto/tools/qmake/testdata/include_function/include_missing_file2.pro
diff --git a/tests/auto/qmake/testdata/include_function/main.cpp b/tests/auto/tools/qmake/testdata/include_function/main.cpp
index 67224bf860..67224bf860 100644
--- a/tests/auto/qmake/testdata/include_function/main.cpp
+++ b/tests/auto/tools/qmake/testdata/include_function/main.cpp
diff --git a/tests/auto/qmake/testdata/install_depends/foo.pro b/tests/auto/tools/qmake/testdata/install_depends/foo.pro
index 357216bff8..357216bff8 100644
--- a/tests/auto/qmake/testdata/install_depends/foo.pro
+++ b/tests/auto/tools/qmake/testdata/install_depends/foo.pro
diff --git a/tests/auto/qmake/testdata/install_depends/main.cpp b/tests/auto/tools/qmake/testdata/install_depends/main.cpp
index 8471e367e9..8471e367e9 100644
--- a/tests/auto/qmake/testdata/install_depends/main.cpp
+++ b/tests/auto/tools/qmake/testdata/install_depends/main.cpp
diff --git a/tests/auto/qmake/testdata/install_depends/test1 b/tests/auto/tools/qmake/testdata/install_depends/test1
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/install_depends/test1
+++ b/tests/auto/tools/qmake/testdata/install_depends/test1
diff --git a/tests/auto/qmake/testdata/install_depends/test2 b/tests/auto/tools/qmake/testdata/install_depends/test2
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/install_depends/test2
+++ b/tests/auto/tools/qmake/testdata/install_depends/test2
diff --git a/tests/auto/qmake/testdata/install_depends/test_file.cpp b/tests/auto/tools/qmake/testdata/install_depends/test_file.cpp
index 0dc2d5b263..0dc2d5b263 100644
--- a/tests/auto/qmake/testdata/install_depends/test_file.cpp
+++ b/tests/auto/tools/qmake/testdata/install_depends/test_file.cpp
diff --git a/tests/auto/qmake/testdata/install_depends/test_file.h b/tests/auto/tools/qmake/testdata/install_depends/test_file.h
index d7f12ddbad..d7f12ddbad 100644
--- a/tests/auto/qmake/testdata/install_depends/test_file.h
+++ b/tests/auto/tools/qmake/testdata/install_depends/test_file.h
diff --git a/tests/auto/qmake/testdata/one_space/main.cpp b/tests/auto/tools/qmake/testdata/one_space/main.cpp
index 52daa0ed03..52daa0ed03 100644
--- a/tests/auto/qmake/testdata/one_space/main.cpp
+++ b/tests/auto/tools/qmake/testdata/one_space/main.cpp
diff --git a/tests/auto/qmake/testdata/one_space/one_space.pro b/tests/auto/tools/qmake/testdata/one_space/one_space.pro
index 247bd27096..247bd27096 100644
--- a/tests/auto/qmake/testdata/one_space/one_space.pro
+++ b/tests/auto/tools/qmake/testdata/one_space/one_space.pro
diff --git a/tests/auto/qmake/testdata/operators/operators.pro b/tests/auto/tools/qmake/testdata/operators/operators.pro
index 5285c1a982..5285c1a982 100644
--- a/tests/auto/qmake/testdata/operators/operators.pro
+++ b/tests/auto/tools/qmake/testdata/operators/operators.pro
diff --git a/tests/auto/qmake/testdata/prompt/prompt.pro b/tests/auto/tools/qmake/testdata/prompt/prompt.pro
index 238022c755..238022c755 100644
--- a/tests/auto/qmake/testdata/prompt/prompt.pro
+++ b/tests/auto/tools/qmake/testdata/prompt/prompt.pro
diff --git a/tests/auto/qmake/testdata/quotedfilenames/main.cpp b/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp
index d1d1144c4f..d1d1144c4f 100644
--- a/tests/auto/qmake/testdata/quotedfilenames/main.cpp
+++ b/tests/auto/tools/qmake/testdata/quotedfilenames/main.cpp
diff --git a/tests/auto/qmake/testdata/quotedfilenames/quotedfilenames.pro b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
index 7f22f437c2..7f22f437c2 100644
--- a/tests/auto/qmake/testdata/quotedfilenames/quotedfilenames.pro
+++ b/tests/auto/tools/qmake/testdata/quotedfilenames/quotedfilenames.pro
diff --git a/tests/auto/qmake/testdata/quotedfilenames/rc folder/logo.png b/tests/auto/tools/qmake/testdata/quotedfilenames/rc folder/logo.png
index bb07d76816..bb07d76816 100644
--- a/tests/auto/qmake/testdata/quotedfilenames/rc folder/logo.png
+++ b/tests/auto/tools/qmake/testdata/quotedfilenames/rc folder/logo.png
diff --git a/tests/auto/qmake/testdata/quotedfilenames/rc folder/test.qrc b/tests/auto/tools/qmake/testdata/quotedfilenames/rc folder/test.qrc
index 54ec5dcfc5..54ec5dcfc5 100644
--- a/tests/auto/qmake/testdata/quotedfilenames/rc folder/test.qrc
+++ b/tests/auto/tools/qmake/testdata/quotedfilenames/rc folder/test.qrc
diff --git a/tests/auto/qmake/testdata/shadow_files/foo.pro b/tests/auto/tools/qmake/testdata/shadow_files/foo.pro
index fc1e7e586d..fc1e7e586d 100644
--- a/tests/auto/qmake/testdata/shadow_files/foo.pro
+++ b/tests/auto/tools/qmake/testdata/shadow_files/foo.pro
diff --git a/tests/auto/qmake/testdata/shadow_files/main.cpp b/tests/auto/tools/qmake/testdata/shadow_files/main.cpp
index 8471e367e9..8471e367e9 100644
--- a/tests/auto/qmake/testdata/shadow_files/main.cpp
+++ b/tests/auto/tools/qmake/testdata/shadow_files/main.cpp
diff --git a/tests/auto/qmake/testdata/shadow_files/test.txt b/tests/auto/tools/qmake/testdata/shadow_files/test.txt
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/shadow_files/test.txt
+++ b/tests/auto/tools/qmake/testdata/shadow_files/test.txt
diff --git a/tests/auto/qmake/testdata/shadow_files/test_file.cpp b/tests/auto/tools/qmake/testdata/shadow_files/test_file.cpp
index 0dc2d5b263..0dc2d5b263 100644
--- a/tests/auto/qmake/testdata/shadow_files/test_file.cpp
+++ b/tests/auto/tools/qmake/testdata/shadow_files/test_file.cpp
diff --git a/tests/auto/qmake/testdata/shadow_files/test_file.h b/tests/auto/tools/qmake/testdata/shadow_files/test_file.h
index d7f12ddbad..d7f12ddbad 100644
--- a/tests/auto/qmake/testdata/shadow_files/test_file.h
+++ b/tests/auto/tools/qmake/testdata/shadow_files/test_file.h
diff --git a/tests/auto/qmake/testdata/shadow_files_build/README b/tests/auto/tools/qmake/testdata/shadow_files_build/README
index 15e48c043e..15e48c043e 100644
--- a/tests/auto/qmake/testdata/shadow_files_build/README
+++ b/tests/auto/tools/qmake/testdata/shadow_files_build/README
diff --git a/tests/auto/qmake/testdata/shadow_files_build/foo.bar b/tests/auto/tools/qmake/testdata/shadow_files_build/foo.bar
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qmake/testdata/shadow_files_build/foo.bar
+++ b/tests/auto/tools/qmake/testdata/shadow_files_build/foo.bar
diff --git a/tests/auto/qmake/testdata/simple_app/build/README b/tests/auto/tools/qmake/testdata/simple_app/build/README
index acfd9d9226..acfd9d9226 100644
--- a/tests/auto/qmake/testdata/simple_app/build/README
+++ b/tests/auto/tools/qmake/testdata/simple_app/build/README
diff --git a/tests/auto/qmake/testdata/simple_app/main.cpp b/tests/auto/tools/qmake/testdata/simple_app/main.cpp
index 9ce4f108e5..9ce4f108e5 100644
--- a/tests/auto/qmake/testdata/simple_app/main.cpp
+++ b/tests/auto/tools/qmake/testdata/simple_app/main.cpp
diff --git a/tests/auto/qmake/testdata/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
index a8c4ad613d..a8c4ad613d 100644
--- a/tests/auto/qmake/testdata/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
diff --git a/tests/auto/qmake/testdata/simple_app/test.qrc b/tests/auto/tools/qmake/testdata/simple_app/test.qrc
index decde3dd24..decde3dd24 100644
--- a/tests/auto/qmake/testdata/simple_app/test.qrc
+++ b/tests/auto/tools/qmake/testdata/simple_app/test.qrc
diff --git a/tests/auto/qmake/testdata/simple_app/test_file.cpp b/tests/auto/tools/qmake/testdata/simple_app/test_file.cpp
index 0dc2d5b263..0dc2d5b263 100644
--- a/tests/auto/qmake/testdata/simple_app/test_file.cpp
+++ b/tests/auto/tools/qmake/testdata/simple_app/test_file.cpp
diff --git a/tests/auto/qmake/testdata/simple_app/test_file.h b/tests/auto/tools/qmake/testdata/simple_app/test_file.h
index d7f12ddbad..d7f12ddbad 100644
--- a/tests/auto/qmake/testdata/simple_app/test_file.h
+++ b/tests/auto/tools/qmake/testdata/simple_app/test_file.h
diff --git a/tests/auto/qmake/testdata/simple_app_build/README b/tests/auto/tools/qmake/testdata/simple_app_build/README
index 81dc596e5b..81dc596e5b 100644
--- a/tests/auto/qmake/testdata/simple_app_build/README
+++ b/tests/auto/tools/qmake/testdata/simple_app_build/README
diff --git a/tests/auto/qmake/testdata/simple_dll/simple.cpp b/tests/auto/tools/qmake/testdata/simple_dll/simple.cpp
index 539725eb0b..539725eb0b 100644
--- a/tests/auto/qmake/testdata/simple_dll/simple.cpp
+++ b/tests/auto/tools/qmake/testdata/simple_dll/simple.cpp
diff --git a/tests/auto/qmake/testdata/simple_dll/simple.h b/tests/auto/tools/qmake/testdata/simple_dll/simple.h
index 1a76482985..1a76482985 100644
--- a/tests/auto/qmake/testdata/simple_dll/simple.h
+++ b/tests/auto/tools/qmake/testdata/simple_dll/simple.h
diff --git a/tests/auto/qmake/testdata/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
index 9af38ecce6..9af38ecce6 100644
--- a/tests/auto/qmake/testdata/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro
diff --git a/tests/auto/qmake/testdata/simple_lib/simple.cpp b/tests/auto/tools/qmake/testdata/simple_lib/simple.cpp
index 539725eb0b..539725eb0b 100644
--- a/tests/auto/qmake/testdata/simple_lib/simple.cpp
+++ b/tests/auto/tools/qmake/testdata/simple_lib/simple.cpp
diff --git a/tests/auto/qmake/testdata/simple_lib/simple.h b/tests/auto/tools/qmake/testdata/simple_lib/simple.h
index 912f028ced..912f028ced 100644
--- a/tests/auto/qmake/testdata/simple_lib/simple.h
+++ b/tests/auto/tools/qmake/testdata/simple_lib/simple.h
diff --git a/tests/auto/qmake/testdata/simple_lib/simple_lib.pro b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
index 209bba6348..209bba6348 100644
--- a/tests/auto/qmake/testdata/simple_lib/simple_lib.pro
+++ b/tests/auto/tools/qmake/testdata/simple_lib/simple_lib.pro
diff --git a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp
index 5597ef22cc..5597ef22cc 100644
--- a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp
+++ b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp
diff --git a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro
index 2db08a29af..2db08a29af 100644
--- a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro
+++ b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro
diff --git a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro
index be0d80adf0..be0d80adf0 100644
--- a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro
+++ b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro
diff --git a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro
index 7c07859ae4..7c07859ae4 100644
--- a/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro
+++ b/tests/auto/tools/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp b/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp
index 9ce4f108e5..9ce4f108e5 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/main.cpp
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/main.cpp
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
index f496d5bb8e..f496d5bb8e 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/simple_app.pro
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp b/tests/auto/tools/qmake/testdata/subdirs/simple_app/test_file.cpp
index 0dc2d5b263..0dc2d5b263 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/test_file.cpp
diff --git a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h b/tests/auto/tools/qmake/testdata/subdirs/simple_app/test_file.h
index d7f12ddbad..d7f12ddbad 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_app/test_file.h
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_app/test_file.h
diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.cpp
index 539725eb0b..539725eb0b 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.cpp
diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.h
index 1a76482985..1a76482985 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple.h
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple.h
diff --git a/tests/auto/qmake/testdata/subdirs/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
index a54a07a0e7..a54a07a0e7 100644
--- a/tests/auto/qmake/testdata/subdirs/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
diff --git a/tests/auto/qmake/testdata/subdirs/subdirs.pro b/tests/auto/tools/qmake/testdata/subdirs/subdirs.pro
index 5da200eabb..5da200eabb 100644
--- a/tests/auto/qmake/testdata/subdirs/subdirs.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/subdirs.pro
diff --git a/tests/auto/qmake/testdata/substitutes/sub/test2.in b/tests/auto/tools/qmake/testdata/substitutes/sub/test2.in
index 78a60695ae..78a60695ae 100644
--- a/tests/auto/qmake/testdata/substitutes/sub/test2.in
+++ b/tests/auto/tools/qmake/testdata/substitutes/sub/test2.in
diff --git a/tests/auto/qmake/testdata/substitutes/test.in b/tests/auto/tools/qmake/testdata/substitutes/test.in
index 2fa05e0110..2fa05e0110 100644
--- a/tests/auto/qmake/testdata/substitutes/test.in
+++ b/tests/auto/tools/qmake/testdata/substitutes/test.in
diff --git a/tests/auto/qmake/testdata/substitutes/test.pro b/tests/auto/tools/qmake/testdata/substitutes/test.pro
index 26b02722e8..26b02722e8 100644
--- a/tests/auto/qmake/testdata/substitutes/test.pro
+++ b/tests/auto/tools/qmake/testdata/substitutes/test.pro
diff --git a/tests/auto/qmake/testdata/substitutes/test3.txt b/tests/auto/tools/qmake/testdata/substitutes/test3.txt
index ce01362503..ce01362503 100644
--- a/tests/auto/qmake/testdata/substitutes/test3.txt
+++ b/tests/auto/tools/qmake/testdata/substitutes/test3.txt
diff --git a/tests/auto/qmake/testdata/substitutes_build/README b/tests/auto/tools/qmake/testdata/substitutes_build/README
index 81dc596e5b..81dc596e5b 100644
--- a/tests/auto/qmake/testdata/substitutes_build/README
+++ b/tests/auto/tools/qmake/testdata/substitutes_build/README
diff --git a/tests/auto/qmake/testdata/variables/variables.pro b/tests/auto/tools/qmake/testdata/variables/variables.pro
index cefcddf0fb..cefcddf0fb 100644
--- a/tests/auto/qmake/testdata/variables/variables.pro
+++ b/tests/auto/tools/qmake/testdata/variables/variables.pro
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 2775b5380b..2775b5380b 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
diff --git a/tests/auto/rcc/.gitignore b/tests/auto/tools/rcc/.gitignore
index 1da39dbd88..1da39dbd88 100644
--- a/tests/auto/rcc/.gitignore
+++ b/tests/auto/tools/rcc/.gitignore
diff --git a/tests/auto/rcc/data/images.bin.expected b/tests/auto/tools/rcc/data/images.bin.expected
index cb67a25477..cb67a25477 100644
--- a/tests/auto/rcc/data/images.bin.expected
+++ b/tests/auto/tools/rcc/data/images.bin.expected
diff --git a/tests/auto/rcc/data/images.expected b/tests/auto/tools/rcc/data/images.expected
index 71be819310..71be819310 100644
--- a/tests/auto/rcc/data/images.expected
+++ b/tests/auto/tools/rcc/data/images.expected
diff --git a/tests/auto/rcc/data/images.qrc b/tests/auto/tools/rcc/data/images.qrc
index 773baef3e5..773baef3e5 100644
--- a/tests/auto/rcc/data/images.qrc
+++ b/tests/auto/tools/rcc/data/images.qrc
diff --git a/tests/auto/rcc/data/images/circle.png b/tests/auto/tools/rcc/data/images/circle.png
index dc392cb3f7..dc392cb3f7 100644
--- a/tests/auto/rcc/data/images/circle.png
+++ b/tests/auto/tools/rcc/data/images/circle.png
diff --git a/tests/auto/rcc/data/images/square.png b/tests/auto/tools/rcc/data/images/square.png
index c0fd2d540a..c0fd2d540a 100644
--- a/tests/auto/rcc/data/images/square.png
+++ b/tests/auto/tools/rcc/data/images/square.png
diff --git a/tests/auto/rcc/data/images/subdir/triangle.png b/tests/auto/tools/rcc/data/images/subdir/triangle.png
index 2ee15f8f1f..2ee15f8f1f 100644
--- a/tests/auto/rcc/data/images/subdir/triangle.png
+++ b/tests/auto/tools/rcc/data/images/subdir/triangle.png
diff --git a/tests/auto/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro
index 1759b48a0e..1759b48a0e 100644
--- a/tests/auto/rcc/rcc.pro
+++ b/tests/auto/tools/rcc/rcc.pro
diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp
index 90baf36b35..90baf36b35 100644
--- a/tests/auto/rcc/tst_rcc.cpp
+++ b/tests/auto/tools/rcc/tst_rcc.cpp
diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro
new file mode 100644
index 0000000000..6bf6ddf64f
--- /dev/null
+++ b/tests/auto/tools/tools.pro
@@ -0,0 +1,7 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qmake \
+   uic \
+   moc \
+   rcc \
+
diff --git a/tests/auto/uic/.gitignore b/tests/auto/tools/uic/.gitignore
index e77c4d05a3..e77c4d05a3 100644
--- a/tests/auto/uic/.gitignore
+++ b/tests/auto/tools/uic/.gitignore
diff --git a/tests/auto/uic/baseline/.gitattributes b/tests/auto/tools/uic/baseline/.gitattributes
index 4ea9d0282a..4ea9d0282a 100644
--- a/tests/auto/uic/baseline/.gitattributes
+++ b/tests/auto/tools/uic/baseline/.gitattributes
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui
index 18d31ab915..18d31ab915 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui
+++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
index ecbfd30a34..ecbfd30a34 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
+++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui
index 703d594f4f..703d594f4f 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui
+++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui
diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h
index aa42d5cd7d..aa42d5cd7d 100644
--- a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h
+++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h
diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui
index 1be629818c..1be629818c 100644
--- a/tests/auto/uic/baseline/Dialog_without_Buttons.ui
+++ b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui
diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h
index 7d876e146c..7d876e146c 100644
--- a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h
+++ b/tests/auto/tools/uic/baseline/Dialog_without_Buttons.ui.h
diff --git a/tests/auto/uic/baseline/Main_Window.ui b/tests/auto/tools/uic/baseline/Main_Window.ui
index e324db8292..e324db8292 100644
--- a/tests/auto/uic/baseline/Main_Window.ui
+++ b/tests/auto/tools/uic/baseline/Main_Window.ui
diff --git a/tests/auto/uic/baseline/Main_Window.ui.h b/tests/auto/tools/uic/baseline/Main_Window.ui.h
index b54e4a6302..b54e4a6302 100644
--- a/tests/auto/uic/baseline/Main_Window.ui.h
+++ b/tests/auto/tools/uic/baseline/Main_Window.ui.h
diff --git a/tests/auto/uic/baseline/Widget.ui b/tests/auto/tools/uic/baseline/Widget.ui
index ab94733dcc..ab94733dcc 100644
--- a/tests/auto/uic/baseline/Widget.ui
+++ b/tests/auto/tools/uic/baseline/Widget.ui
diff --git a/tests/auto/uic/baseline/Widget.ui.h b/tests/auto/tools/uic/baseline/Widget.ui.h
index 362d283039..362d283039 100644
--- a/tests/auto/uic/baseline/Widget.ui.h
+++ b/tests/auto/tools/uic/baseline/Widget.ui.h
diff --git a/tests/auto/uic/baseline/addlinkdialog.ui b/tests/auto/tools/uic/baseline/addlinkdialog.ui
index 3171159f97..3171159f97 100644
--- a/tests/auto/uic/baseline/addlinkdialog.ui
+++ b/tests/auto/tools/uic/baseline/addlinkdialog.ui
diff --git a/tests/auto/uic/baseline/addlinkdialog.ui.h b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
index 230bc5daec..230bc5daec 100644
--- a/tests/auto/uic/baseline/addlinkdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h
diff --git a/tests/auto/uic/baseline/addtorrentform.ui b/tests/auto/tools/uic/baseline/addtorrentform.ui
index 950bb67119..950bb67119 100644
--- a/tests/auto/uic/baseline/addtorrentform.ui
+++ b/tests/auto/tools/uic/baseline/addtorrentform.ui
diff --git a/tests/auto/uic/baseline/addtorrentform.ui.h b/tests/auto/tools/uic/baseline/addtorrentform.ui.h
index c075e8a28b..c075e8a28b 100644
--- a/tests/auto/uic/baseline/addtorrentform.ui.h
+++ b/tests/auto/tools/uic/baseline/addtorrentform.ui.h
diff --git a/tests/auto/uic/baseline/authenticationdialog.ui b/tests/auto/tools/uic/baseline/authenticationdialog.ui
index 82d908cffb..82d908cffb 100644
--- a/tests/auto/uic/baseline/authenticationdialog.ui
+++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui
diff --git a/tests/auto/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
index 9f35586ee3..9f35586ee3 100644
--- a/tests/auto/uic/baseline/authenticationdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
diff --git a/tests/auto/uic/baseline/backside.ui b/tests/auto/tools/uic/baseline/backside.ui
index afa488c6f4..afa488c6f4 100644
--- a/tests/auto/uic/baseline/backside.ui
+++ b/tests/auto/tools/uic/baseline/backside.ui
diff --git a/tests/auto/uic/baseline/backside.ui.h b/tests/auto/tools/uic/baseline/backside.ui.h
index 0fd710af6f..0fd710af6f 100644
--- a/tests/auto/uic/baseline/backside.ui.h
+++ b/tests/auto/tools/uic/baseline/backside.ui.h
diff --git a/tests/auto/uic/baseline/batchtranslation.ui b/tests/auto/tools/uic/baseline/batchtranslation.ui
index 6cb2943606..6cb2943606 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui
+++ b/tests/auto/tools/uic/baseline/batchtranslation.ui
diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/tools/uic/baseline/batchtranslation.ui.h
index 4071b5055c..4071b5055c 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/tools/uic/baseline/batchtranslation.ui.h
diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui b/tests/auto/tools/uic/baseline/bookmarkdialog.ui
index 2d6470c54c..2d6470c54c 100644
--- a/tests/auto/uic/baseline/bookmarkdialog.ui
+++ b/tests/auto/tools/uic/baseline/bookmarkdialog.ui
diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui.h b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
index 098614c409..098614c409 100644
--- a/tests/auto/uic/baseline/bookmarkdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h
diff --git a/tests/auto/uic/baseline/bookwindow.ui b/tests/auto/tools/uic/baseline/bookwindow.ui
index 659d324564..659d324564 100644
--- a/tests/auto/uic/baseline/bookwindow.ui
+++ b/tests/auto/tools/uic/baseline/bookwindow.ui
diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/tools/uic/baseline/bookwindow.ui.h
index e6c9280965..e6c9280965 100644
--- a/tests/auto/uic/baseline/bookwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/bookwindow.ui.h
diff --git a/tests/auto/uic/baseline/browserwidget.ui b/tests/auto/tools/uic/baseline/browserwidget.ui
index 20946f0ede..20946f0ede 100644
--- a/tests/auto/uic/baseline/browserwidget.ui
+++ b/tests/auto/tools/uic/baseline/browserwidget.ui
diff --git a/tests/auto/uic/baseline/browserwidget.ui.h b/tests/auto/tools/uic/baseline/browserwidget.ui.h
index 556d672e47..556d672e47 100644
--- a/tests/auto/uic/baseline/browserwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/browserwidget.ui.h
diff --git a/tests/auto/uic/baseline/calculator.ui b/tests/auto/tools/uic/baseline/calculator.ui
index bb519ba2a6..bb519ba2a6 100644
--- a/tests/auto/uic/baseline/calculator.ui
+++ b/tests/auto/tools/uic/baseline/calculator.ui
diff --git a/tests/auto/uic/baseline/calculator.ui.h b/tests/auto/tools/uic/baseline/calculator.ui.h
index b2cf2363b9..b2cf2363b9 100644
--- a/tests/auto/uic/baseline/calculator.ui.h
+++ b/tests/auto/tools/uic/baseline/calculator.ui.h
diff --git a/tests/auto/uic/baseline/calculatorform.ui b/tests/auto/tools/uic/baseline/calculatorform.ui
index dda0e62ddd..dda0e62ddd 100644
--- a/tests/auto/uic/baseline/calculatorform.ui
+++ b/tests/auto/tools/uic/baseline/calculatorform.ui
diff --git a/tests/auto/uic/baseline/calculatorform.ui.h b/tests/auto/tools/uic/baseline/calculatorform.ui.h
index f2cf2531d6..f2cf2531d6 100644
--- a/tests/auto/uic/baseline/calculatorform.ui.h
+++ b/tests/auto/tools/uic/baseline/calculatorform.ui.h
diff --git a/tests/auto/uic/baseline/certificateinfo.ui b/tests/auto/tools/uic/baseline/certificateinfo.ui
index 3761fe8f50..3761fe8f50 100644
--- a/tests/auto/uic/baseline/certificateinfo.ui
+++ b/tests/auto/tools/uic/baseline/certificateinfo.ui
diff --git a/tests/auto/uic/baseline/certificateinfo.ui.h b/tests/auto/tools/uic/baseline/certificateinfo.ui.h
index 53d54c4930..53d54c4930 100644
--- a/tests/auto/uic/baseline/certificateinfo.ui.h
+++ b/tests/auto/tools/uic/baseline/certificateinfo.ui.h
diff --git a/tests/auto/uic/baseline/chatdialog.ui b/tests/auto/tools/uic/baseline/chatdialog.ui
index c85e0d0f55..c85e0d0f55 100644
--- a/tests/auto/uic/baseline/chatdialog.ui
+++ b/tests/auto/tools/uic/baseline/chatdialog.ui
diff --git a/tests/auto/uic/baseline/chatdialog.ui.h b/tests/auto/tools/uic/baseline/chatdialog.ui.h
index 4152d3652e..4152d3652e 100644
--- a/tests/auto/uic/baseline/chatdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/chatdialog.ui.h
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui b/tests/auto/tools/uic/baseline/chatmainwindow.ui
index 0616dcb137..0616dcb137 100644
--- a/tests/auto/uic/baseline/chatmainwindow.ui
+++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h
index 932f1dd1a2..932f1dd1a2 100644
--- a/tests/auto/uic/baseline/chatmainwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui b/tests/auto/tools/uic/baseline/chatsetnickname.ui
index fb9894e09f..fb9894e09f 100644
--- a/tests/auto/uic/baseline/chatsetnickname.ui
+++ b/tests/auto/tools/uic/baseline/chatsetnickname.ui
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui.h b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h
index 9a52aa5355..9a52aa5355 100644
--- a/tests/auto/uic/baseline/chatsetnickname.ui.h
+++ b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h
diff --git a/tests/auto/uic/baseline/config.ui b/tests/auto/tools/uic/baseline/config.ui
index bebe17b41f..bebe17b41f 100644
--- a/tests/auto/uic/baseline/config.ui
+++ b/tests/auto/tools/uic/baseline/config.ui
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h
index ed756ab918..ed756ab918 100644
--- a/tests/auto/uic/baseline/config.ui.h
+++ b/tests/auto/tools/uic/baseline/config.ui.h
diff --git a/tests/auto/uic/baseline/connectdialog.ui b/tests/auto/tools/uic/baseline/connectdialog.ui
index bd062ebaaf..bd062ebaaf 100644
--- a/tests/auto/uic/baseline/connectdialog.ui
+++ b/tests/auto/tools/uic/baseline/connectdialog.ui
diff --git a/tests/auto/uic/baseline/connectdialog.ui.h b/tests/auto/tools/uic/baseline/connectdialog.ui.h
index ceafddc28b..ceafddc28b 100644
--- a/tests/auto/uic/baseline/connectdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/connectdialog.ui.h
diff --git a/tests/auto/uic/baseline/controller.ui b/tests/auto/tools/uic/baseline/controller.ui
index 379015bf30..379015bf30 100644
--- a/tests/auto/uic/baseline/controller.ui
+++ b/tests/auto/tools/uic/baseline/controller.ui
diff --git a/tests/auto/uic/baseline/controller.ui.h b/tests/auto/tools/uic/baseline/controller.ui.h
index 583a3537b2..583a3537b2 100644
--- a/tests/auto/uic/baseline/controller.ui.h
+++ b/tests/auto/tools/uic/baseline/controller.ui.h
diff --git a/tests/auto/uic/baseline/cookies.ui b/tests/auto/tools/uic/baseline/cookies.ui
index c4bccc5483..c4bccc5483 100644
--- a/tests/auto/uic/baseline/cookies.ui
+++ b/tests/auto/tools/uic/baseline/cookies.ui
diff --git a/tests/auto/uic/baseline/cookies.ui.h b/tests/auto/tools/uic/baseline/cookies.ui.h
index 83946bbeca..83946bbeca 100644
--- a/tests/auto/uic/baseline/cookies.ui.h
+++ b/tests/auto/tools/uic/baseline/cookies.ui.h
diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui b/tests/auto/tools/uic/baseline/cookiesexceptions.ui
index 3d9ef62414..3d9ef62414 100644
--- a/tests/auto/uic/baseline/cookiesexceptions.ui
+++ b/tests/auto/tools/uic/baseline/cookiesexceptions.ui
diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui.h b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
index 2f4a7fbdfe..2f4a7fbdfe 100644
--- a/tests/auto/uic/baseline/cookiesexceptions.ui.h
+++ b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h
diff --git a/tests/auto/uic/baseline/default.ui b/tests/auto/tools/uic/baseline/default.ui
index 431a40956e..431a40956e 100644
--- a/tests/auto/uic/baseline/default.ui
+++ b/tests/auto/tools/uic/baseline/default.ui
diff --git a/tests/auto/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h
index 4c6b489f83..4c6b489f83 100644
--- a/tests/auto/uic/baseline/default.ui.h
+++ b/tests/auto/tools/uic/baseline/default.ui.h
diff --git a/tests/auto/uic/baseline/dialog.ui b/tests/auto/tools/uic/baseline/dialog.ui
index e99d6fb3c4..e99d6fb3c4 100644
--- a/tests/auto/uic/baseline/dialog.ui
+++ b/tests/auto/tools/uic/baseline/dialog.ui
diff --git a/tests/auto/uic/baseline/dialog.ui.h b/tests/auto/tools/uic/baseline/dialog.ui.h
index cd92679488..cd92679488 100644
--- a/tests/auto/uic/baseline/dialog.ui.h
+++ b/tests/auto/tools/uic/baseline/dialog.ui.h
diff --git a/tests/auto/uic/baseline/downloaditem.ui b/tests/auto/tools/uic/baseline/downloaditem.ui
index 4a0a0fd9aa..4a0a0fd9aa 100644
--- a/tests/auto/uic/baseline/downloaditem.ui
+++ b/tests/auto/tools/uic/baseline/downloaditem.ui
diff --git a/tests/auto/uic/baseline/downloaditem.ui.h b/tests/auto/tools/uic/baseline/downloaditem.ui.h
index d856e2099e..d856e2099e 100644
--- a/tests/auto/uic/baseline/downloaditem.ui.h
+++ b/tests/auto/tools/uic/baseline/downloaditem.ui.h
diff --git a/tests/auto/uic/baseline/downloads.ui b/tests/auto/tools/uic/baseline/downloads.ui
index a2e256935b..a2e256935b 100644
--- a/tests/auto/uic/baseline/downloads.ui
+++ b/tests/auto/tools/uic/baseline/downloads.ui
diff --git a/tests/auto/uic/baseline/downloads.ui.h b/tests/auto/tools/uic/baseline/downloads.ui.h
index dd960d2ced..dd960d2ced 100644
--- a/tests/auto/uic/baseline/downloads.ui.h
+++ b/tests/auto/tools/uic/baseline/downloads.ui.h
diff --git a/tests/auto/uic/baseline/embeddeddialog.ui b/tests/auto/tools/uic/baseline/embeddeddialog.ui
index f967b10085..f967b10085 100644
--- a/tests/auto/uic/baseline/embeddeddialog.ui
+++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui
diff --git a/tests/auto/uic/baseline/embeddeddialog.ui.h b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
index a6cfbb1a73..a6cfbb1a73 100644
--- a/tests/auto/uic/baseline/embeddeddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/embeddeddialog.ui.h
diff --git a/tests/auto/uic/baseline/filespage.ui b/tests/auto/tools/uic/baseline/filespage.ui
index d308b96646..d308b96646 100644
--- a/tests/auto/uic/baseline/filespage.ui
+++ b/tests/auto/tools/uic/baseline/filespage.ui
diff --git a/tests/auto/uic/baseline/filespage.ui.h b/tests/auto/tools/uic/baseline/filespage.ui.h
index 12d8554ff8..12d8554ff8 100644
--- a/tests/auto/uic/baseline/filespage.ui.h
+++ b/tests/auto/tools/uic/baseline/filespage.ui.h
diff --git a/tests/auto/uic/baseline/filternamedialog.ui b/tests/auto/tools/uic/baseline/filternamedialog.ui
index be6f17dfb6..be6f17dfb6 100644
--- a/tests/auto/uic/baseline/filternamedialog.ui
+++ b/tests/auto/tools/uic/baseline/filternamedialog.ui
diff --git a/tests/auto/uic/baseline/filternamedialog.ui.h b/tests/auto/tools/uic/baseline/filternamedialog.ui.h
index 163a6d2954..163a6d2954 100644
--- a/tests/auto/uic/baseline/filternamedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/filternamedialog.ui.h
diff --git a/tests/auto/uic/baseline/filterpage.ui b/tests/auto/tools/uic/baseline/filterpage.ui
index 7cda3d9bed..7cda3d9bed 100644
--- a/tests/auto/uic/baseline/filterpage.ui
+++ b/tests/auto/tools/uic/baseline/filterpage.ui
diff --git a/tests/auto/uic/baseline/filterpage.ui.h b/tests/auto/tools/uic/baseline/filterpage.ui.h
index f3a2268556..f3a2268556 100644
--- a/tests/auto/uic/baseline/filterpage.ui.h
+++ b/tests/auto/tools/uic/baseline/filterpage.ui.h
diff --git a/tests/auto/uic/baseline/finddialog.ui b/tests/auto/tools/uic/baseline/finddialog.ui
index 913a868ad1..913a868ad1 100644
--- a/tests/auto/uic/baseline/finddialog.ui
+++ b/tests/auto/tools/uic/baseline/finddialog.ui
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h
index fb6d120d46..fb6d120d46 100644
--- a/tests/auto/uic/baseline/finddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/finddialog.ui.h
diff --git a/tests/auto/uic/baseline/form.ui b/tests/auto/tools/uic/baseline/form.ui
index e5be1d911f..e5be1d911f 100644
--- a/tests/auto/uic/baseline/form.ui
+++ b/tests/auto/tools/uic/baseline/form.ui
diff --git a/tests/auto/uic/baseline/form.ui.h b/tests/auto/tools/uic/baseline/form.ui.h
index da2cecbb73..da2cecbb73 100644
--- a/tests/auto/uic/baseline/form.ui.h
+++ b/tests/auto/tools/uic/baseline/form.ui.h
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui b/tests/auto/tools/uic/baseline/formwindowsettings.ui
index fea18fe873..fea18fe873 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui
+++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h
index da8657b5e3..da8657b5e3 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h
diff --git a/tests/auto/uic/baseline/generalpage.ui b/tests/auto/tools/uic/baseline/generalpage.ui
index 9c2babb0ae..9c2babb0ae 100644
--- a/tests/auto/uic/baseline/generalpage.ui
+++ b/tests/auto/tools/uic/baseline/generalpage.ui
diff --git a/tests/auto/uic/baseline/generalpage.ui.h b/tests/auto/tools/uic/baseline/generalpage.ui.h
index ecad72393d..ecad72393d 100644
--- a/tests/auto/uic/baseline/generalpage.ui.h
+++ b/tests/auto/tools/uic/baseline/generalpage.ui.h
diff --git a/tests/auto/uic/baseline/gridalignment.ui b/tests/auto/tools/uic/baseline/gridalignment.ui
index 11c28b1372..11c28b1372 100644
--- a/tests/auto/uic/baseline/gridalignment.ui
+++ b/tests/auto/tools/uic/baseline/gridalignment.ui
diff --git a/tests/auto/uic/baseline/gridalignment.ui.h b/tests/auto/tools/uic/baseline/gridalignment.ui.h
index b49a5aa74d..b49a5aa74d 100644
--- a/tests/auto/uic/baseline/gridalignment.ui.h
+++ b/tests/auto/tools/uic/baseline/gridalignment.ui.h
diff --git a/tests/auto/uic/baseline/gridpanel.ui b/tests/auto/tools/uic/baseline/gridpanel.ui
index adfdd3684a..adfdd3684a 100644
--- a/tests/auto/uic/baseline/gridpanel.ui
+++ b/tests/auto/tools/uic/baseline/gridpanel.ui
diff --git a/tests/auto/uic/baseline/gridpanel.ui.h b/tests/auto/tools/uic/baseline/gridpanel.ui.h
index e60e22d31c..e60e22d31c 100644
--- a/tests/auto/uic/baseline/gridpanel.ui.h
+++ b/tests/auto/tools/uic/baseline/gridpanel.ui.h
diff --git a/tests/auto/uic/baseline/helpdialog.ui b/tests/auto/tools/uic/baseline/helpdialog.ui
index 133f3d2af4..133f3d2af4 100644
--- a/tests/auto/uic/baseline/helpdialog.ui
+++ b/tests/auto/tools/uic/baseline/helpdialog.ui
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/tools/uic/baseline/helpdialog.ui.h
index f89af71caf..f89af71caf 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/helpdialog.ui.h
diff --git a/tests/auto/uic/baseline/history.ui b/tests/auto/tools/uic/baseline/history.ui
index 0944940e74..0944940e74 100644
--- a/tests/auto/uic/baseline/history.ui
+++ b/tests/auto/tools/uic/baseline/history.ui
diff --git a/tests/auto/uic/baseline/history.ui.h b/tests/auto/tools/uic/baseline/history.ui.h
index 8787279919..8787279919 100644
--- a/tests/auto/uic/baseline/history.ui.h
+++ b/tests/auto/tools/uic/baseline/history.ui.h
diff --git a/tests/auto/uic/baseline/icontheme.ui b/tests/auto/tools/uic/baseline/icontheme.ui
index a21463561b..a21463561b 100644
--- a/tests/auto/uic/baseline/icontheme.ui
+++ b/tests/auto/tools/uic/baseline/icontheme.ui
diff --git a/tests/auto/uic/baseline/icontheme.ui.h b/tests/auto/tools/uic/baseline/icontheme.ui.h
index e51be85bfb..e51be85bfb 100644
--- a/tests/auto/uic/baseline/icontheme.ui.h
+++ b/tests/auto/tools/uic/baseline/icontheme.ui.h
diff --git a/tests/auto/uic/baseline/identifierpage.ui b/tests/auto/tools/uic/baseline/identifierpage.ui
index cd0df75638..cd0df75638 100644
--- a/tests/auto/uic/baseline/identifierpage.ui
+++ b/tests/auto/tools/uic/baseline/identifierpage.ui
diff --git a/tests/auto/uic/baseline/identifierpage.ui.h b/tests/auto/tools/uic/baseline/identifierpage.ui.h
index d7e9cee42c..d7e9cee42c 100644
--- a/tests/auto/uic/baseline/identifierpage.ui.h
+++ b/tests/auto/tools/uic/baseline/identifierpage.ui.h
diff --git a/tests/auto/uic/baseline/imagedialog.ui b/tests/auto/tools/uic/baseline/imagedialog.ui
index 1c5e546f2c..1c5e546f2c 100644
--- a/tests/auto/uic/baseline/imagedialog.ui
+++ b/tests/auto/tools/uic/baseline/imagedialog.ui
diff --git a/tests/auto/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h
index 8011a2204e..8011a2204e 100644
--- a/tests/auto/uic/baseline/imagedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/imagedialog.ui.h
diff --git a/tests/auto/uic/baseline/inputpage.ui b/tests/auto/tools/uic/baseline/inputpage.ui
index e7cd3a0fad..e7cd3a0fad 100644
--- a/tests/auto/uic/baseline/inputpage.ui
+++ b/tests/auto/tools/uic/baseline/inputpage.ui
diff --git a/tests/auto/uic/baseline/inputpage.ui.h b/tests/auto/tools/uic/baseline/inputpage.ui.h
index 0ca3cce87e..0ca3cce87e 100644
--- a/tests/auto/uic/baseline/inputpage.ui.h
+++ b/tests/auto/tools/uic/baseline/inputpage.ui.h
diff --git a/tests/auto/uic/baseline/installdialog.ui b/tests/auto/tools/uic/baseline/installdialog.ui
index 21a05da77e..21a05da77e 100644
--- a/tests/auto/uic/baseline/installdialog.ui
+++ b/tests/auto/tools/uic/baseline/installdialog.ui
diff --git a/tests/auto/uic/baseline/installdialog.ui.h b/tests/auto/tools/uic/baseline/installdialog.ui.h
index 9228e08632..9228e08632 100644
--- a/tests/auto/uic/baseline/installdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/installdialog.ui.h
diff --git a/tests/auto/uic/baseline/languagesdialog.ui b/tests/auto/tools/uic/baseline/languagesdialog.ui
index 93b490e9ed..93b490e9ed 100644
--- a/tests/auto/uic/baseline/languagesdialog.ui
+++ b/tests/auto/tools/uic/baseline/languagesdialog.ui
diff --git a/tests/auto/uic/baseline/languagesdialog.ui.h b/tests/auto/tools/uic/baseline/languagesdialog.ui.h
index 5062775944..5062775944 100644
--- a/tests/auto/uic/baseline/languagesdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/languagesdialog.ui.h
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui b/tests/auto/tools/uic/baseline/listwidgeteditor.ui
index fa7d962bdb..fa7d962bdb 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui
+++ b/tests/auto/tools/uic/baseline/listwidgeteditor.ui
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
index 3fe00d40ad..3fe00d40ad 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h
diff --git a/tests/auto/uic/baseline/mainwindow.ui b/tests/auto/tools/uic/baseline/mainwindow.ui
index f6eda4fdd6..f6eda4fdd6 100644
--- a/tests/auto/uic/baseline/mainwindow.ui
+++ b/tests/auto/tools/uic/baseline/mainwindow.ui
diff --git a/tests/auto/uic/baseline/mainwindow.ui.h b/tests/auto/tools/uic/baseline/mainwindow.ui.h
index ae0a45d696..ae0a45d696 100644
--- a/tests/auto/uic/baseline/mainwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/mainwindow.ui.h
diff --git a/tests/auto/uic/baseline/mydialog.ui b/tests/auto/tools/uic/baseline/mydialog.ui
index d765b30760..d765b30760 100644
--- a/tests/auto/uic/baseline/mydialog.ui
+++ b/tests/auto/tools/uic/baseline/mydialog.ui
diff --git a/tests/auto/uic/baseline/mydialog.ui.h b/tests/auto/tools/uic/baseline/mydialog.ui.h
index 474684988e..474684988e 100644
--- a/tests/auto/uic/baseline/mydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/mydialog.ui.h
diff --git a/tests/auto/uic/baseline/myform.ui b/tests/auto/tools/uic/baseline/myform.ui
index 00702e860a..00702e860a 100644
--- a/tests/auto/uic/baseline/myform.ui
+++ b/tests/auto/tools/uic/baseline/myform.ui
diff --git a/tests/auto/uic/baseline/myform.ui.h b/tests/auto/tools/uic/baseline/myform.ui.h
index 99e1cdae99..99e1cdae99 100644
--- a/tests/auto/uic/baseline/myform.ui.h
+++ b/tests/auto/tools/uic/baseline/myform.ui.h
diff --git a/tests/auto/uic/baseline/newactiondialog.ui b/tests/auto/tools/uic/baseline/newactiondialog.ui
index ae6212f868..ae6212f868 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui
+++ b/tests/auto/tools/uic/baseline/newactiondialog.ui
diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/tools/uic/baseline/newactiondialog.ui.h
index 77ab64ca00..77ab64ca00 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newactiondialog.ui.h
diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui
index 2aa91f3e9e..2aa91f3e9e 100644
--- a/tests/auto/uic/baseline/newdynamicpropertydialog.ui
+++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui
diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
index 9aafed487f..9aafed487f 100644
--- a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h
+++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h
diff --git a/tests/auto/uic/baseline/newform.ui b/tests/auto/tools/uic/baseline/newform.ui
index 3f0a92dfb1..3f0a92dfb1 100644
--- a/tests/auto/uic/baseline/newform.ui
+++ b/tests/auto/tools/uic/baseline/newform.ui
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/tools/uic/baseline/newform.ui.h
index bb443f9650..bb443f9650 100644
--- a/tests/auto/uic/baseline/newform.ui.h
+++ b/tests/auto/tools/uic/baseline/newform.ui.h
diff --git a/tests/auto/uic/baseline/orderdialog.ui b/tests/auto/tools/uic/baseline/orderdialog.ui
index b44824778f..b44824778f 100644
--- a/tests/auto/uic/baseline/orderdialog.ui
+++ b/tests/auto/tools/uic/baseline/orderdialog.ui
diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/tools/uic/baseline/orderdialog.ui.h
index b54c256dc0..b54c256dc0 100644
--- a/tests/auto/uic/baseline/orderdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/orderdialog.ui.h
diff --git a/tests/auto/uic/baseline/outputpage.ui b/tests/auto/tools/uic/baseline/outputpage.ui
index 755f818085..755f818085 100644
--- a/tests/auto/uic/baseline/outputpage.ui
+++ b/tests/auto/tools/uic/baseline/outputpage.ui
diff --git a/tests/auto/uic/baseline/outputpage.ui.h b/tests/auto/tools/uic/baseline/outputpage.ui.h
index b10101fa1b..b10101fa1b 100644
--- a/tests/auto/uic/baseline/outputpage.ui.h
+++ b/tests/auto/tools/uic/baseline/outputpage.ui.h
diff --git a/tests/auto/uic/baseline/pagefold.ui b/tests/auto/tools/uic/baseline/pagefold.ui
index 7ae313c331..7ae313c331 100644
--- a/tests/auto/uic/baseline/pagefold.ui
+++ b/tests/auto/tools/uic/baseline/pagefold.ui
diff --git a/tests/auto/uic/baseline/pagefold.ui.h b/tests/auto/tools/uic/baseline/pagefold.ui.h
index 3efad22aad..3efad22aad 100644
--- a/tests/auto/uic/baseline/pagefold.ui.h
+++ b/tests/auto/tools/uic/baseline/pagefold.ui.h
diff --git a/tests/auto/uic/baseline/paletteeditor.ui b/tests/auto/tools/uic/baseline/paletteeditor.ui
index 1cc6a18583..1cc6a18583 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui
+++ b/tests/auto/tools/uic/baseline/paletteeditor.ui
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/tools/uic/baseline/paletteeditor.ui.h
index bafd0ee0d9..bafd0ee0d9 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/tools/uic/baseline/paletteeditor.ui.h
diff --git a/tests/auto/uic/baseline/passworddialog.ui b/tests/auto/tools/uic/baseline/passworddialog.ui
index 7c1665867a..7c1665867a 100644
--- a/tests/auto/uic/baseline/passworddialog.ui
+++ b/tests/auto/tools/uic/baseline/passworddialog.ui
diff --git a/tests/auto/uic/baseline/passworddialog.ui.h b/tests/auto/tools/uic/baseline/passworddialog.ui.h
index 1cf2efc443..1cf2efc443 100644
--- a/tests/auto/uic/baseline/passworddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/passworddialog.ui.h
diff --git a/tests/auto/uic/baseline/pathpage.ui b/tests/auto/tools/uic/baseline/pathpage.ui
index 89083915dd..89083915dd 100644
--- a/tests/auto/uic/baseline/pathpage.ui
+++ b/tests/auto/tools/uic/baseline/pathpage.ui
diff --git a/tests/auto/uic/baseline/pathpage.ui.h b/tests/auto/tools/uic/baseline/pathpage.ui.h
index cc7a99045f..cc7a99045f 100644
--- a/tests/auto/uic/baseline/pathpage.ui.h
+++ b/tests/auto/tools/uic/baseline/pathpage.ui.h
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui b/tests/auto/tools/uic/baseline/phrasebookbox.ui
index 66558ea28a..66558ea28a 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui
+++ b/tests/auto/tools/uic/baseline/phrasebookbox.ui
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h
index 21e1a4a74d..21e1a4a74d 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/tools/uic/baseline/phrasebookbox.ui.h
diff --git a/tests/auto/uic/baseline/plugindialog.ui b/tests/auto/tools/uic/baseline/plugindialog.ui
index d4bec98834..d4bec98834 100644
--- a/tests/auto/uic/baseline/plugindialog.ui
+++ b/tests/auto/tools/uic/baseline/plugindialog.ui
diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/tools/uic/baseline/plugindialog.ui.h
index b5e34b7ade..b5e34b7ade 100644
--- a/tests/auto/uic/baseline/plugindialog.ui.h
+++ b/tests/auto/tools/uic/baseline/plugindialog.ui.h
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui b/tests/auto/tools/uic/baseline/preferencesdialog.ui
index 3092fcb53c..3092fcb53c 100644
--- a/tests/auto/uic/baseline/preferencesdialog.ui
+++ b/tests/auto/tools/uic/baseline/preferencesdialog.ui
diff --git a/tests/auto/uic/baseline/preferencesdialog.ui.h b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h
index 33b7e6880c..33b7e6880c 100644
--- a/tests/auto/uic/baseline/preferencesdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h
diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui
index 2f18766ff7..2f18766ff7 100644
--- a/tests/auto/uic/baseline/previewconfigurationwidget.ui
+++ b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui
diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
index 951792dd44..951792dd44 100644
--- a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui b/tests/auto/tools/uic/baseline/previewdialogbase.ui
index 593ee33577..593ee33577 100644
--- a/tests/auto/uic/baseline/previewdialogbase.ui
+++ b/tests/auto/tools/uic/baseline/previewdialogbase.ui
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui.h b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
index 4fe450153b..4fe450153b 100644
--- a/tests/auto/uic/baseline/previewdialogbase.ui.h
+++ b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h
diff --git a/tests/auto/uic/baseline/previewwidget.ui b/tests/auto/tools/uic/baseline/previewwidget.ui
index d38ab7cf30..d38ab7cf30 100644
--- a/tests/auto/uic/baseline/previewwidget.ui
+++ b/tests/auto/tools/uic/baseline/previewwidget.ui
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/tools/uic/baseline/previewwidget.ui.h
index 02786f152c..02786f152c 100644
--- a/tests/auto/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/previewwidget.ui.h
diff --git a/tests/auto/uic/baseline/proxy.ui b/tests/auto/tools/uic/baseline/proxy.ui
index 62a8be6273..62a8be6273 100644
--- a/tests/auto/uic/baseline/proxy.ui
+++ b/tests/auto/tools/uic/baseline/proxy.ui
diff --git a/tests/auto/uic/baseline/proxy.ui.h b/tests/auto/tools/uic/baseline/proxy.ui.h
index 19822a805e..19822a805e 100644
--- a/tests/auto/uic/baseline/proxy.ui.h
+++ b/tests/auto/tools/uic/baseline/proxy.ui.h
diff --git a/tests/auto/uic/baseline/qfiledialog.ui b/tests/auto/tools/uic/baseline/qfiledialog.ui
index 85f5991722..85f5991722 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui
+++ b/tests/auto/tools/uic/baseline/qfiledialog.ui
diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h
index 3bebe74c12..3bebe74c12 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui
index ace2ab8f44..ace2ab8f44 100644
--- a/tests/auto/uic/baseline/qpagesetupwidget.ui
+++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
index 6d0a3b4483..6d0a3b4483 100644
--- a/tests/auto/uic/baseline/qpagesetupwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/qpagesetupwidget.ui.h
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui
index 26fa09599e..26fa09599e 100644
--- a/tests/auto/uic/baseline/qprintpropertieswidget.ui
+++ b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h
index 512fcecb66..512fcecb66 100644
--- a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
+++ b/tests/auto/tools/uic/baseline/qprintpropertieswidget.ui.h
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui
index de8f4faeeb..de8f4faeeb 100644
--- a/tests/auto/uic/baseline/qprintsettingsoutput.ui
+++ b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
index 13ee6eec7d..13ee6eec7d 100644
--- a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
+++ b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h
diff --git a/tests/auto/uic/baseline/qprintwidget.ui b/tests/auto/tools/uic/baseline/qprintwidget.ui
index 8a4f3bde0a..8a4f3bde0a 100644
--- a/tests/auto/uic/baseline/qprintwidget.ui
+++ b/tests/auto/tools/uic/baseline/qprintwidget.ui
diff --git a/tests/auto/uic/baseline/qprintwidget.ui.h b/tests/auto/tools/uic/baseline/qprintwidget.ui.h
index 4437935efb..4437935efb 100644
--- a/tests/auto/uic/baseline/qprintwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/qprintwidget.ui.h
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui
index 91a8700579..91a8700579 100644
--- a/tests/auto/uic/baseline/qsqlconnectiondialog.ui
+++ b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
index ed428fdcc7..ed428fdcc7 100644
--- a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui b/tests/auto/tools/uic/baseline/qtgradientdialog.ui
index 0c5578fd0b..0c5578fd0b 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui
+++ b/tests/auto/tools/uic/baseline/qtgradientdialog.ui
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
index de7690d87a..de7690d87a 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui b/tests/auto/tools/uic/baseline/qtgradienteditor.ui
index 472066b7fa..472066b7fa 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui
+++ b/tests/auto/tools/uic/baseline/qtgradienteditor.ui
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
index ff46126ea4..ff46126ea4 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradienteditor.ui.h
diff --git a/tests/auto/uic/baseline/qtgradientview.ui b/tests/auto/tools/uic/baseline/qtgradientview.ui
index af7267ea2b..af7267ea2b 100644
--- a/tests/auto/uic/baseline/qtgradientview.ui
+++ b/tests/auto/tools/uic/baseline/qtgradientview.ui
diff --git a/tests/auto/uic/baseline/qtgradientview.ui.h b/tests/auto/tools/uic/baseline/qtgradientview.ui.h
index 6787c8d60b..6787c8d60b 100644
--- a/tests/auto/uic/baseline/qtgradientview.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradientview.ui.h
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui
index c84907289b..c84907289b 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui
+++ b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h
index b07cd4ca68..b07cd4ca68 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h
diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui
index 2205da4d50..2205da4d50 100644
--- a/tests/auto/uic/baseline/qtresourceeditordialog.ui
+++ b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui
diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
index d434af782d..d434af782d 100644
--- a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui b/tests/auto/tools/uic/baseline/qttoolbardialog.ui
index c4ad934f80..c4ad934f80 100644
--- a/tests/auto/uic/baseline/qttoolbardialog.ui
+++ b/tests/auto/tools/uic/baseline/qttoolbardialog.ui
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui.h b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h
index 35a40c3340..35a40c3340 100644
--- a/tests/auto/uic/baseline/qttoolbardialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h
diff --git a/tests/auto/uic/baseline/querywidget.ui b/tests/auto/tools/uic/baseline/querywidget.ui
index 53fa62227b..53fa62227b 100644
--- a/tests/auto/uic/baseline/querywidget.ui
+++ b/tests/auto/tools/uic/baseline/querywidget.ui
diff --git a/tests/auto/uic/baseline/querywidget.ui.h b/tests/auto/tools/uic/baseline/querywidget.ui.h
index c628457368..c628457368 100644
--- a/tests/auto/uic/baseline/querywidget.ui.h
+++ b/tests/auto/tools/uic/baseline/querywidget.ui.h
diff --git a/tests/auto/uic/baseline/remotecontrol.ui b/tests/auto/tools/uic/baseline/remotecontrol.ui
index 1cfc7f5400..1cfc7f5400 100644
--- a/tests/auto/uic/baseline/remotecontrol.ui
+++ b/tests/auto/tools/uic/baseline/remotecontrol.ui
diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/tools/uic/baseline/remotecontrol.ui.h
index b970fca2a0..b970fca2a0 100644
--- a/tests/auto/uic/baseline/remotecontrol.ui.h
+++ b/tests/auto/tools/uic/baseline/remotecontrol.ui.h
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui b/tests/auto/tools/uic/baseline/saveformastemplate.ui
index 81d55d3b63..81d55d3b63 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui
+++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
index 64a3c78907..64a3c78907 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h
diff --git a/tests/auto/uic/baseline/settings.ui b/tests/auto/tools/uic/baseline/settings.ui
index fcf698ba85..fcf698ba85 100644
--- a/tests/auto/uic/baseline/settings.ui
+++ b/tests/auto/tools/uic/baseline/settings.ui
diff --git a/tests/auto/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h
index e09b7df6e7..e09b7df6e7 100644
--- a/tests/auto/uic/baseline/settings.ui.h
+++ b/tests/auto/tools/uic/baseline/settings.ui.h
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui b/tests/auto/tools/uic/baseline/signalslotdialog.ui
index 1a8a8d9219..1a8a8d9219 100644
--- a/tests/auto/uic/baseline/signalslotdialog.ui
+++ b/tests/auto/tools/uic/baseline/signalslotdialog.ui
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui.h b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h
index 7bbe74ce14..7bbe74ce14 100644
--- a/tests/auto/uic/baseline/signalslotdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h
diff --git a/tests/auto/uic/baseline/sslclient.ui b/tests/auto/tools/uic/baseline/sslclient.ui
index 5a24751168..5a24751168 100644
--- a/tests/auto/uic/baseline/sslclient.ui
+++ b/tests/auto/tools/uic/baseline/sslclient.ui
diff --git a/tests/auto/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h
index ef324627c7..ef324627c7 100644
--- a/tests/auto/uic/baseline/sslclient.ui.h
+++ b/tests/auto/tools/uic/baseline/sslclient.ui.h
diff --git a/tests/auto/uic/baseline/sslerrors.ui b/tests/auto/tools/uic/baseline/sslerrors.ui
index 4aac18cddb..4aac18cddb 100644
--- a/tests/auto/uic/baseline/sslerrors.ui
+++ b/tests/auto/tools/uic/baseline/sslerrors.ui
diff --git a/tests/auto/uic/baseline/sslerrors.ui.h b/tests/auto/tools/uic/baseline/sslerrors.ui.h
index ef83595025..ef83595025 100644
--- a/tests/auto/uic/baseline/sslerrors.ui.h
+++ b/tests/auto/tools/uic/baseline/sslerrors.ui.h
diff --git a/tests/auto/uic/baseline/statistics.ui b/tests/auto/tools/uic/baseline/statistics.ui
index ba752e386a..ba752e386a 100644
--- a/tests/auto/uic/baseline/statistics.ui
+++ b/tests/auto/tools/uic/baseline/statistics.ui
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/tools/uic/baseline/statistics.ui.h
index a7d256866f..a7d256866f 100644
--- a/tests/auto/uic/baseline/statistics.ui.h
+++ b/tests/auto/tools/uic/baseline/statistics.ui.h
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui b/tests/auto/tools/uic/baseline/stringlisteditor.ui
index 96fff1c3ea..96fff1c3ea 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui
+++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h
index db5d4417c1..db5d4417c1 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui b/tests/auto/tools/uic/baseline/stylesheeteditor.ui
index 34cd7f6d04..34cd7f6d04 100644
--- a/tests/auto/uic/baseline/stylesheeteditor.ui
+++ b/tests/auto/tools/uic/baseline/stylesheeteditor.ui
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui.h b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h
index ea635a14f2..ea635a14f2 100644
--- a/tests/auto/uic/baseline/stylesheeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/stylesheeteditor.ui.h
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui b/tests/auto/tools/uic/baseline/tabbedbrowser.ui
index 6bb608f79f..6bb608f79f 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui
+++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
index 73f7af75a6..73f7af75a6 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/tools/uic/baseline/tabbedbrowser.ui.h
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui
index ebd15a2f80..ebd15a2f80 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui
+++ b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h
index 080fd209c1..080fd209c1 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui b/tests/auto/tools/uic/baseline/tetrixwindow.ui
index a13f538aa8..a13f538aa8 100644
--- a/tests/auto/uic/baseline/tetrixwindow.ui
+++ b/tests/auto/tools/uic/baseline/tetrixwindow.ui
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui.h b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h
index cd2f2cf11c..cd2f2cf11c 100644
--- a/tests/auto/uic/baseline/tetrixwindow.ui.h
+++ b/tests/auto/tools/uic/baseline/tetrixwindow.ui.h
diff --git a/tests/auto/uic/baseline/textfinder.ui b/tests/auto/tools/uic/baseline/textfinder.ui
index af05192dbd..af05192dbd 100644
--- a/tests/auto/uic/baseline/textfinder.ui
+++ b/tests/auto/tools/uic/baseline/textfinder.ui
diff --git a/tests/auto/uic/baseline/textfinder.ui.h b/tests/auto/tools/uic/baseline/textfinder.ui.h
index 2b2141281e..2b2141281e 100644
--- a/tests/auto/uic/baseline/textfinder.ui.h
+++ b/tests/auto/tools/uic/baseline/textfinder.ui.h
diff --git a/tests/auto/uic/baseline/topicchooser.ui b/tests/auto/tools/uic/baseline/topicchooser.ui
index d4c90bb4b3..d4c90bb4b3 100644
--- a/tests/auto/uic/baseline/topicchooser.ui
+++ b/tests/auto/tools/uic/baseline/topicchooser.ui
diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/tools/uic/baseline/topicchooser.ui.h
index 04ceede911..04ceede911 100644
--- a/tests/auto/uic/baseline/topicchooser.ui.h
+++ b/tests/auto/tools/uic/baseline/topicchooser.ui.h
diff --git a/tests/auto/uic/baseline/translatedialog.ui b/tests/auto/tools/uic/baseline/translatedialog.ui
index b1cd99cbe7..b1cd99cbe7 100644
--- a/tests/auto/uic/baseline/translatedialog.ui
+++ b/tests/auto/tools/uic/baseline/translatedialog.ui
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/tools/uic/baseline/translatedialog.ui.h
index 737fe1e196..737fe1e196 100644
--- a/tests/auto/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/translatedialog.ui.h
diff --git a/tests/auto/uic/baseline/translationsettings.ui b/tests/auto/tools/uic/baseline/translationsettings.ui
index 4bd4be9e09..4bd4be9e09 100644
--- a/tests/auto/uic/baseline/translationsettings.ui
+++ b/tests/auto/tools/uic/baseline/translationsettings.ui
diff --git a/tests/auto/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h
index 2105b09ede..2105b09ede 100644
--- a/tests/auto/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/tools/uic/baseline/translationsettings.ui.h
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui b/tests/auto/tools/uic/baseline/treewidgeteditor.ui
index 1256a0a2fa..1256a0a2fa 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui
+++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h
index 4a3a48c145..4a3a48c145 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui.h
+++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui b/tests/auto/tools/uic/baseline/trpreviewtool.ui
index 03441139ed..03441139ed 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui
+++ b/tests/auto/tools/uic/baseline/trpreviewtool.ui
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h
index da1d268d82..da1d268d82 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/tools/uic/baseline/trpreviewtool.ui.h
diff --git a/tests/auto/uic/baseline/validators.ui b/tests/auto/tools/uic/baseline/validators.ui
index f05b96fbe0..f05b96fbe0 100644
--- a/tests/auto/uic/baseline/validators.ui
+++ b/tests/auto/tools/uic/baseline/validators.ui
diff --git a/tests/auto/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h
index 27b5482627..27b5482627 100644
--- a/tests/auto/uic/baseline/validators.ui.h
+++ b/tests/auto/tools/uic/baseline/validators.ui.h
diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui
index a7f5349d78..a7f5349d78 100644
--- a/tests/auto/uic/baseline/wateringconfigdialog.ui
+++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui
diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h
index 9e586f02b6..9e586f02b6 100644
--- a/tests/auto/uic/baseline/wateringconfigdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h
diff --git a/tests/auto/uic/generated_ui/placeholder b/tests/auto/tools/uic/generated_ui/placeholder
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/uic/generated_ui/placeholder
+++ b/tests/auto/tools/uic/generated_ui/placeholder
diff --git a/tests/auto/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index 754fa6e01b..754fa6e01b 100644
--- a/tests/auto/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
diff --git a/tests/auto/uic/uic.pro b/tests/auto/tools/uic/uic.pro
index 0045015457..0045015457 100644
--- a/tests/auto/uic/uic.pro
+++ b/tests/auto/tools/uic/uic.pro