5 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index f50f2f69f5..c33aad5cc4 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from qtqml.pro.
 
 set(module_dynamic_qml_imports
-    QtQml.Models
+    QtQml.Models/auto
 )
 
 if (QT_FEATURE_qml_worker_script)
     list(APPEND module_dynamic_qml_imports
-        QtQml.WorkerScript
+        QtQml.WorkerScript/auto
     )
 endif()
 
diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro
index eac19954b6..ca162e65a9 100644
--- a/src/imports/qtqml/qtqml.pro
+++ b/src/imports/qtqml/qtqml.pro
@@ -15,9 +15,9 @@ DYNAMIC_QMLDIR = \
     "classname QtQmlPlugin" \
     "typeinfo plugins.qmltypes" \
     "designersupported" \
-    "import QtQml.Models"
+    "import QtQml.Models auto"
 
 qtConfig(qml-worker-script): DYNAMIC_QMLDIR += \
-    "import QtQml.WorkerScript"
+    "import QtQml.WorkerScript auto"
 
 load(qml_plugin)
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index e007c476f8..1da9bad480 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -11,7 +11,7 @@ qt_add_qml_module(qtquick2plugin
     CLASSNAME QtQuick2Plugin
     SKIP_TYPE_REGISTRATION
     IMPORTS
-        QtQml
+        QtQml/auto
     SOURCES
         plugin.cpp
     PUBLIC_LIBRARIES
diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir
index d74aabd9e9..b5c754a36f 100644
--- a/src/imports/qtquick2/qmldir
+++ b/src/imports/qtquick2/qmldir
@@ -3,4 +3,4 @@ plugin qtquick2plugin
 classname QtQuick2Plugin
 typeinfo plugins.qmltypes
 designersupported
-import QtQml
+import QtQml auto
diff --git a/src/imports/window/qmldir b/src/imports/window/qmldir
index 859cd341a1..c1cc5d89b7 100644
--- a/src/imports/window/qmldir
+++ b/src/imports/window/qmldir
@@ -1,2 +1,2 @@
 module QtQuick.Window
-import QtQuick
+import QtQuick auto