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 similarity index 100% rename from tests/auto/moc/.gitattributes rename to tests/auto/tools/moc/.gitattributes diff --git a/tests/auto/moc/.gitignore b/tests/auto/tools/moc/.gitignore similarity index 100% rename from tests/auto/moc/.gitignore rename to tests/auto/tools/moc/.gitignore diff --git a/tests/auto/moc/Header b/tests/auto/tools/moc/Header similarity index 100% rename from tests/auto/moc/Header rename to 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 similarity index 100% rename from tests/auto/moc/Test.framework/Headers/testinterface.h rename to 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 similarity index 100% rename from tests/auto/moc/assign-namespace.h rename to tests/auto/tools/moc/assign-namespace.h diff --git a/tests/auto/moc/backslash-newlines.h b/tests/auto/tools/moc/backslash-newlines.h similarity index 100% rename from tests/auto/moc/backslash-newlines.h rename to tests/auto/tools/moc/backslash-newlines.h diff --git a/tests/auto/moc/c-comments.h b/tests/auto/tools/moc/c-comments.h similarity index 100% rename from tests/auto/moc/c-comments.h rename to tests/auto/tools/moc/c-comments.h diff --git a/tests/auto/moc/cstyle-enums.h b/tests/auto/tools/moc/cstyle-enums.h similarity index 100% rename from tests/auto/moc/cstyle-enums.h rename to 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 similarity index 100% rename from tests/auto/moc/dir-in-include-path.h rename to 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 similarity index 100% rename from tests/auto/moc/error-on-wrong-notify.h rename to 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 similarity index 100% rename from tests/auto/moc/escapes-in-string-literals.h rename to tests/auto/tools/moc/escapes-in-string-literals.h diff --git a/tests/auto/moc/extraqualification.h b/tests/auto/tools/moc/extraqualification.h similarity index 100% rename from tests/auto/moc/extraqualification.h rename to tests/auto/tools/moc/extraqualification.h diff --git a/tests/auto/moc/forgotten-qinterface.h b/tests/auto/tools/moc/forgotten-qinterface.h similarity index 100% rename from tests/auto/moc/forgotten-qinterface.h rename to tests/auto/tools/moc/forgotten-qinterface.h diff --git a/tests/auto/moc/gadgetwithnoenums.h b/tests/auto/tools/moc/gadgetwithnoenums.h similarity index 100% rename from tests/auto/moc/gadgetwithnoenums.h rename to 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 similarity index 100% rename from tests/auto/moc/interface-from-framework.h rename to 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 similarity index 100% rename from tests/auto/moc/macro-on-cmdline.h rename to tests/auto/tools/moc/macro-on-cmdline.h diff --git a/tests/auto/moc/moc.pro b/tests/auto/tools/moc/moc.pro similarity index 100% rename from tests/auto/moc/moc.pro rename to tests/auto/tools/moc/moc.pro diff --git a/tests/auto/moc/namespaced-flags.h b/tests/auto/tools/moc/namespaced-flags.h similarity index 100% rename from tests/auto/moc/namespaced-flags.h rename to tests/auto/tools/moc/namespaced-flags.h diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/tools/moc/no-keywords.h similarity index 100% rename from tests/auto/moc/no-keywords.h rename to tests/auto/tools/moc/no-keywords.h diff --git a/tests/auto/moc/oldstyle-casts.h b/tests/auto/tools/moc/oldstyle-casts.h similarity index 100% rename from tests/auto/moc/oldstyle-casts.h rename to tests/auto/tools/moc/oldstyle-casts.h diff --git a/tests/auto/moc/os9-newlines.h b/tests/auto/tools/moc/os9-newlines.h similarity index 100% rename from tests/auto/moc/os9-newlines.h rename to tests/auto/tools/moc/os9-newlines.h diff --git a/tests/auto/moc/parse-boost.h b/tests/auto/tools/moc/parse-boost.h similarity index 100% rename from tests/auto/moc/parse-boost.h rename to 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 similarity index 100% rename from tests/auto/moc/pure-virtual-signals.h rename to tests/auto/tools/moc/pure-virtual-signals.h diff --git a/tests/auto/moc/qinvokable.h b/tests/auto/tools/moc/qinvokable.h similarity index 100% rename from tests/auto/moc/qinvokable.h rename to tests/auto/tools/moc/qinvokable.h diff --git a/tests/auto/moc/qprivateslots.h b/tests/auto/tools/moc/qprivateslots.h similarity index 100% rename from tests/auto/moc/qprivateslots.h rename to 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 similarity index 100% rename from tests/auto/moc/single_function_keyword.h rename to 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 similarity index 100% rename from tests/auto/moc/slots-with-void-template.h rename to tests/auto/tools/moc/slots-with-void-template.h diff --git a/tests/auto/moc/task189996.h b/tests/auto/tools/moc/task189996.h similarity index 100% rename from tests/auto/moc/task189996.h rename to tests/auto/tools/moc/task189996.h diff --git a/tests/auto/moc/task192552.h b/tests/auto/tools/moc/task192552.h similarity index 100% rename from tests/auto/moc/task192552.h rename to tests/auto/tools/moc/task192552.h diff --git a/tests/auto/moc/task234909.h b/tests/auto/tools/moc/task234909.h similarity index 100% rename from tests/auto/moc/task234909.h rename to tests/auto/tools/moc/task234909.h diff --git a/tests/auto/moc/task240368.h b/tests/auto/tools/moc/task240368.h similarity index 100% rename from tests/auto/moc/task240368.h rename to tests/auto/tools/moc/task240368.h diff --git a/tests/auto/moc/task71021/dummy b/tests/auto/tools/moc/task71021/dummy similarity index 100% rename from tests/auto/moc/task71021/dummy rename to tests/auto/tools/moc/task71021/dummy diff --git a/tests/auto/moc/task87883.h b/tests/auto/tools/moc/task87883.h similarity index 100% rename from tests/auto/moc/task87883.h rename to tests/auto/tools/moc/task87883.h diff --git a/tests/auto/moc/template-gtgt.h b/tests/auto/tools/moc/template-gtgt.h similarity index 100% rename from tests/auto/moc/template-gtgt.h rename to 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 similarity index 100% rename from tests/auto/moc/testproject/Plugin/Plugin.h rename to 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 similarity index 100% rename from tests/auto/moc/testproject/include/Plugin rename to tests/auto/tools/moc/testproject/include/Plugin diff --git a/tests/auto/moc/trigraphs.h b/tests/auto/tools/moc/trigraphs.h similarity index 100% rename from tests/auto/moc/trigraphs.h rename to tests/auto/tools/moc/trigraphs.h diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp similarity index 100% rename from tests/auto/moc/tst_moc.cpp rename to tests/auto/tools/moc/tst_moc.cpp diff --git a/tests/auto/moc/using-namespaces.h b/tests/auto/tools/moc/using-namespaces.h similarity index 100% rename from tests/auto/moc/using-namespaces.h rename to 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 similarity index 100% rename from tests/auto/moc/warn-on-multiple-qobject-subclasses.h rename to 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 similarity index 100% rename from tests/auto/moc/warn-on-property-without-read.h rename to 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 similarity index 100% rename from tests/auto/moc/win-newlines.h rename to tests/auto/tools/moc/win-newlines.h diff --git a/tests/auto/qmake/.gitignore b/tests/auto/tools/qmake/.gitignore similarity index 100% rename from tests/auto/qmake/.gitignore rename to tests/auto/tools/qmake/.gitignore diff --git a/tests/auto/qmake/qmake.pro b/tests/auto/tools/qmake/qmake.pro similarity index 100% rename from tests/auto/qmake/qmake.pro rename to tests/auto/tools/qmake/qmake.pro diff --git a/tests/auto/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp similarity index 100% rename from tests/auto/qmake/testcompiler.cpp rename to tests/auto/tools/qmake/testcompiler.cpp diff --git a/tests/auto/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h similarity index 100% rename from tests/auto/qmake/testcompiler.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/bundle-spaces/bundle-spaces.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/bundle-spaces/existing file rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/bundle-spaces/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/bundle-spaces/some-file rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/comments/comments.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/duplicateLibraryEntries/duplib.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/export_across_file_boundaries/.qmake.cache rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/export_across_file_boundaries/features/default_pre.prf rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/export_across_file_boundaries/foo.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/export_across_file_boundaries/oink.pri rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/findDeps.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object1.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object2.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object3.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object4.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object5.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object6.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object7.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object8.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findDeps/object9.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/findMocs.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object1.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object2.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object3.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object4.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object5.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object6.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/findMocs/object7.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/func_export/func_export.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/func_variables/func_variables.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/1.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/2.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/functions.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/infiletest.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/one/1.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/one/2.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/three/wildcard21.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/three/wildcard22.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/two/1.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/two/2.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/wildcard21.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/functions/wildcard22.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_dir/foo.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_dir/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_dir/test_file.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_dir/test_file.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_dir/untitled.ui rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_dir_build/README rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_function/existing_file.pri rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_function/include_existing_file.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_function/include_missing_file.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_function/include_missing_file2.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/include_function/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/install_depends/foo.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/install_depends/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/install_depends/test1 rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/install_depends/test2 rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/install_depends/test_file.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/install_depends/test_file.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/one_space/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/one_space/one_space.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/operators/operators.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/prompt/prompt.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/quotedfilenames/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/quotedfilenames/quotedfilenames.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/quotedfilenames/rc folder/logo.png rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/quotedfilenames/rc folder/test.qrc rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files/foo.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files/test.txt rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files/test_file.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files/test_file.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files_build/README rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/shadow_files_build/foo.bar rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app/build/README rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app/simple_app.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app/test.qrc rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app/test_file.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app/test_file.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_app_build/README rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_dll/simple.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_dll/simple.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_dll/simple_dll.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_lib/simple.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_lib/simple.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/simple_lib/simple_lib.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_app/main.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_app/simple_app.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_app/test_file.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_app/test_file.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_dll/simple.cpp rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_dll/simple.h rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/simple_dll/simple_dll.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/subdirs/subdirs.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/substitutes/sub/test2.in rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/substitutes/test.in rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/substitutes/test.pro rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/substitutes/test3.txt rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/substitutes_build/README rename to 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 similarity index 100% rename from tests/auto/qmake/testdata/variables/variables.pro rename to 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 similarity index 100% rename from tests/auto/qmake/tst_qmake.cpp rename to tests/auto/tools/qmake/tst_qmake.cpp diff --git a/tests/auto/rcc/.gitignore b/tests/auto/tools/rcc/.gitignore similarity index 100% rename from tests/auto/rcc/.gitignore rename to tests/auto/tools/rcc/.gitignore diff --git a/tests/auto/rcc/data/images.bin.expected b/tests/auto/tools/rcc/data/images.bin.expected similarity index 100% rename from tests/auto/rcc/data/images.bin.expected rename to 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 similarity index 100% rename from tests/auto/rcc/data/images.expected rename to tests/auto/tools/rcc/data/images.expected diff --git a/tests/auto/rcc/data/images.qrc b/tests/auto/tools/rcc/data/images.qrc similarity index 100% rename from tests/auto/rcc/data/images.qrc rename to 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 similarity index 100% rename from tests/auto/rcc/data/images/circle.png rename to 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 similarity index 100% rename from tests/auto/rcc/data/images/square.png rename to 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 similarity index 100% rename from tests/auto/rcc/data/images/subdir/triangle.png rename to tests/auto/tools/rcc/data/images/subdir/triangle.png diff --git a/tests/auto/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro similarity index 100% rename from tests/auto/rcc/rcc.pro rename to tests/auto/tools/rcc/rcc.pro diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp similarity index 100% rename from tests/auto/rcc/tst_rcc.cpp rename to 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 similarity index 100% rename from tests/auto/uic/.gitignore rename to tests/auto/tools/uic/.gitignore diff --git a/tests/auto/uic/baseline/.gitattributes b/tests/auto/tools/uic/baseline/.gitattributes similarity index 100% rename from tests/auto/uic/baseline/.gitattributes rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Dialog_without_Buttons.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Dialog_without_Buttons.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Main_Window.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Main_Window.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Widget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/Widget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/addlinkdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/addlinkdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/addtorrentform.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/addtorrentform.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/authenticationdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/authenticationdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/backside.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/backside.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/batchtranslation.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/batchtranslation.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/bookmarkdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/bookmarkdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/bookwindow.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/bookwindow.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/browserwidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/browserwidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/calculator.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/calculator.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/calculatorform.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/calculatorform.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/certificateinfo.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/certificateinfo.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/chatdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/chatdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/chatmainwindow.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/chatmainwindow.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/chatsetnickname.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/chatsetnickname.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/config.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/config.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/connectdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/connectdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/controller.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/controller.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/cookies.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/cookies.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/cookiesexceptions.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/cookiesexceptions.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/default.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/default.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/dialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/dialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/downloaditem.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/downloaditem.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/downloads.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/downloads.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/embeddeddialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/embeddeddialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/filespage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/filespage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/filternamedialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/filternamedialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/filterpage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/filterpage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/finddialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/finddialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/form.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/form.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/formwindowsettings.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/formwindowsettings.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/generalpage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/generalpage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/gridalignment.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/gridalignment.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/gridpanel.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/gridpanel.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/helpdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/helpdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/history.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/history.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/icontheme.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/icontheme.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/identifierpage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/identifierpage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/imagedialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/imagedialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/inputpage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/inputpage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/installdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/installdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/languagesdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/languagesdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/listwidgeteditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/listwidgeteditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/mainwindow.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/mainwindow.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/mydialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/mydialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/myform.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/myform.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/newactiondialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/newactiondialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/newdynamicpropertydialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/newdynamicpropertydialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/newform.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/newform.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/orderdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/orderdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/outputpage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/outputpage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/pagefold.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/pagefold.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/paletteeditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/paletteeditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/passworddialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/passworddialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/pathpage.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/pathpage.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/phrasebookbox.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/phrasebookbox.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/plugindialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/plugindialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/preferencesdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/preferencesdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/previewconfigurationwidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/previewconfigurationwidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/previewdialogbase.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/previewdialogbase.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/previewwidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/previewwidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/proxy.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/proxy.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qfiledialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qfiledialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qpagesetupwidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qpagesetupwidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qprintpropertieswidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qprintpropertieswidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qprintsettingsoutput.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qprintsettingsoutput.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qprintwidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qprintwidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qsqlconnectiondialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qsqlconnectiondialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradientdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradientdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradienteditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradienteditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradientview.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradientview.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradientviewdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtgradientviewdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtresourceeditordialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qtresourceeditordialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qttoolbardialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/qttoolbardialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/querywidget.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/querywidget.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/remotecontrol.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/remotecontrol.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/saveformastemplate.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/saveformastemplate.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/settings.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/settings.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/signalslotdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/signalslotdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/sslclient.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/sslclient.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/sslerrors.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/sslerrors.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/statistics.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/statistics.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/stringlisteditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/stringlisteditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/stylesheeteditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/stylesheeteditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/tabbedbrowser.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/tabbedbrowser.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/tablewidgeteditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/tablewidgeteditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/tetrixwindow.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/tetrixwindow.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/textfinder.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/textfinder.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/topicchooser.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/topicchooser.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/translatedialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/translatedialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/translationsettings.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/translationsettings.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/treewidgeteditor.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/treewidgeteditor.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/trpreviewtool.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/trpreviewtool.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/validators.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/validators.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/baseline/wateringconfigdialog.ui rename to 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 similarity index 100% rename from tests/auto/uic/baseline/wateringconfigdialog.ui.h rename to 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 similarity index 100% rename from tests/auto/uic/generated_ui/placeholder rename to tests/auto/tools/uic/generated_ui/placeholder diff --git a/tests/auto/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp similarity index 100% rename from tests/auto/uic/tst_uic.cpp rename to tests/auto/tools/uic/tst_uic.cpp diff --git a/tests/auto/uic/uic.pro b/tests/auto/tools/uic/uic.pro similarity index 100% rename from tests/auto/uic/uic.pro rename to tests/auto/tools/uic/uic.pro