Move QtQuickUltralite items directly to compatibility

This shortens the path and avoids building issues on Windows.
Removing QtAndroidAutomotive for now.

Change-Id: I76a4ba4269b626ec9ae31d735bc2eef244760d1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

35 files changed, 3 insertions, 5 deletions

diff --git a/src/imports/compatibility/CMakeLists.txt b/src/imports/compatibility/CMakeLists.txt
index dcd7319..d35facf 100644
--- a/src/imports/compatibility/CMakeLists.txt
+++ b/src/imports/compatibility/CMakeLists.txt
@@ -1,2 +1,3 @@
-add_subdirectory(QtAndroidAutomotive)
-add_subdirectory(QtQuickUltralite)
+add_subdirectory(Extras)
+add_subdirectory(Layers)
+
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/CMakeLists.txt b/src/imports/compatibility/Extras/CMakeLists.txt
index 32b4306..32b4306 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/CMakeLists.txt
+++ b/src/imports/compatibility/Extras/CMakeLists.txt
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/ColorizedImage.qml b/src/imports/compatibility/Extras/ColorizedImage.qml
index ee509d4..ee509d4 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/ColorizedImage.qml
+++ b/src/imports/compatibility/Extras/ColorizedImage.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/StaticText.qml b/src/imports/compatibility/Extras/StaticText.qml
index 47483e3..47483e3 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/StaticText.qml
+++ b/src/imports/compatibility/Extras/StaticText.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/CMakeLists.txt b/src/imports/compatibility/Extras/designer/CMakeLists.txt
index 19ad43d..19ad43d 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/CMakeLists.txt
+++ b/src/imports/compatibility/Extras/designer/CMakeLists.txt
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml b/src/imports/compatibility/Extras/designer/ColorizedImageSpecifics.qml
index c0e9ce5..c0e9ce5 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/ColorizedImageSpecifics.qml
+++ b/src/imports/compatibility/Extras/designer/ColorizedImageSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo b/src/imports/compatibility/Extras/designer/QtQuickUltraliteExtras.metainfo
index ab5716c..ab5716c 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/QtQuickUltraliteExtras.metainfo
+++ b/src/imports/compatibility/Extras/designer/QtQuickUltraliteExtras.metainfo
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/StaticTextSpecifics.qml b/src/imports/compatibility/Extras/designer/StaticTextSpecifics.qml
index e75bbfa..e75bbfa 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/StaticTextSpecifics.qml
+++ b/src/imports/compatibility/Extras/designer/StaticTextSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon.png b/src/imports/compatibility/Extras/designer/images/image-icon.png
index 318ce08..318ce08 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon.png
+++ b/src/imports/compatibility/Extras/designer/images/image-icon.png
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon@2x.png b/src/imports/compatibility/Extras/designer/images/image-icon@2x.png
index cc84918..cc84918 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/image-icon@2x.png
+++ b/src/imports/compatibility/Extras/designer/images/image-icon@2x.png
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon.png b/src/imports/compatibility/Extras/designer/images/text-icon.png
index 29a81f5..29a81f5 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon.png
+++ b/src/imports/compatibility/Extras/designer/images/text-icon.png
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon@2x.png b/src/imports/compatibility/Extras/designer/images/text-icon@2x.png
index 1df8f76..1df8f76 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/designer/images/text-icon@2x.png
+++ b/src/imports/compatibility/Extras/designer/images/text-icon@2x.png
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes b/src/imports/compatibility/Extras/plugins.qmltypes
index 6a6c815..6a6c815 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/plugins.qmltypes
+++ b/src/imports/compatibility/Extras/plugins.qmltypes
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir b/src/imports/compatibility/Extras/qmldir
index fec69a2..fec69a2 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/qmldir
+++ b/src/imports/compatibility/Extras/qmldir
diff --git a/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp b/src/imports/compatibility/Extras/studiocompatibilityqulextras.cpp
index 8b2804d..8b2804d 100644
--- a/src/imports/compatibility/QtQuickUltralite/Extras/studiocompatibilityqulextras.cpp
+++ b/src/imports/compatibility/Extras/studiocompatibilityqulextras.cpp
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml b/src/imports/compatibility/Layers/+DesignMode/Screen.qml
index f86c272..f86c272 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/+DesignMode/Screen.qml
+++ b/src/imports/compatibility/Layers/+DesignMode/Screen.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/Application.qml b/src/imports/compatibility/Layers/Application.qml
index f13f25e..f13f25e 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/Application.qml
+++ b/src/imports/compatibility/Layers/Application.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/CMakeLists.txt b/src/imports/compatibility/Layers/CMakeLists.txt
index 1903505..1903505 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/CMakeLists.txt
+++ b/src/imports/compatibility/Layers/CMakeLists.txt
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml b/src/imports/compatibility/Layers/ImageLayer.qml
index f4c0647..f4c0647 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/ImageLayer.qml
+++ b/src/imports/compatibility/Layers/ImageLayer.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml b/src/imports/compatibility/Layers/ItemLayer.qml
index 231c3d3..231c3d3 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/ItemLayer.qml
+++ b/src/imports/compatibility/Layers/ItemLayer.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml b/src/imports/compatibility/Layers/Screen.qml
index ad50a8d..ad50a8d 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/Screen.qml
+++ b/src/imports/compatibility/Layers/Screen.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml b/src/imports/compatibility/Layers/SpriteLayer.qml
index 29f3db9..29f3db9 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/SpriteLayer.qml
+++ b/src/imports/compatibility/Layers/SpriteLayer.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml b/src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml
index 58374ef..58374ef 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ApplicationSpecifics.qml
+++ b/src/imports/compatibility/Layers/designer/ApplicationSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/CMakeLists.txt b/src/imports/compatibility/Layers/designer/CMakeLists.txt
index 508a4ea..508a4ea 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/CMakeLists.txt
+++ b/src/imports/compatibility/Layers/designer/CMakeLists.txt
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml b/src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml
index ac60034..ac60034 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ImageLayerSpecifics.qml
+++ b/src/imports/compatibility/Layers/designer/ImageLayerSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml b/src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml
index d36486c..d36486c 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ItemLayerSpecifics.qml
+++ b/src/imports/compatibility/Layers/designer/ItemLayerSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo b/src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo
index 649154b..649154b 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/QtQuickUltraliteLayers.metainfo
+++ b/src/imports/compatibility/Layers/designer/QtQuickUltraliteLayers.metainfo
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml b/src/imports/compatibility/Layers/designer/ScreenSpecifics.qml
index 80c7357..80c7357 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/ScreenSpecifics.qml
+++ b/src/imports/compatibility/Layers/designer/ScreenSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml b/src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml
index c13054d..c13054d 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/SpriteLayerSpecifics.qml
+++ b/src/imports/compatibility/Layers/designer/SpriteLayerSpecifics.qml
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon.png b/src/imports/compatibility/Layers/designer/images/item-icon.png
index af81cdf..af81cdf 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon.png
+++ b/src/imports/compatibility/Layers/designer/images/item-icon.png
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon@2x.png b/src/imports/compatibility/Layers/designer/images/item-icon@2x.png
index f05aa57..f05aa57 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/designer/images/item-icon@2x.png
+++ b/src/imports/compatibility/Layers/designer/images/item-icon@2x.png
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes b/src/imports/compatibility/Layers/plugins.qmltypes
index 05873fb..05873fb 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/plugins.qmltypes
+++ b/src/imports/compatibility/Layers/plugins.qmltypes
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir b/src/imports/compatibility/Layers/qmldir
index 8d0a4b2..8d0a4b2 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/qmldir
+++ b/src/imports/compatibility/Layers/qmldir
diff --git a/src/imports/compatibility/QtQuickUltralite/Layers/studiocompatibilityqullayers.cpp b/src/imports/compatibility/Layers/studiocompatibilityqullayers.cpp
index 762371a..762371a 100644
--- a/src/imports/compatibility/QtQuickUltralite/Layers/studiocompatibilityqullayers.cpp
+++ b/src/imports/compatibility/Layers/studiocompatibilityqullayers.cpp
diff --git a/src/imports/compatibility/QtQuickUltralite/CMakeLists.txt b/src/imports/compatibility/QtQuickUltralite/CMakeLists.txt
deleted file mode 100644
index d35facf..0000000
--- a/src/imports/compatibility/QtQuickUltralite/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(Extras)
-add_subdirectory(Layers)
-