5 files changed, 8 insertions, 56 deletions
diff --git a/.gitignore b/.gitignore
index f133a2124e..b9188d84f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,7 +98,6 @@ qt*-config.pri
 /bin/qhelpgenerator
 /bin/qlalr
 /bin/qml
-/bin/qml1plugindump
 /bin/qmleasing
 /bin/qmlimportscanner
 /bin/qmljs
diff --git a/mkspecs/features/qml1_module.prf b/mkspecs/features/qml1_module.prf
deleted file mode 100644
index 33c3e44808..0000000000
--- a/mkspecs/features/qml1_module.prf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  W A R N I N G
-#  -------------
-#
-# This file is not part of the Qt API.  It exists purely as an
-# implementation detail.  It may change from version to version
-# without notice, or even be removed.
-#
-# We mean it.
-#
-
-CONFIG += qml1_target
-load(qml_module)
diff --git a/mkspecs/features/qml1_plugin.prf b/mkspecs/features/qml1_plugin.prf
deleted file mode 100644
index cb1f0ce267..0000000000
--- a/mkspecs/features/qml1_plugin.prf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#  W A R N I N G
-#  -------------
-#
-# This file is not part of the Qt API.  It exists purely as an
-# implementation detail.  It may change from version to version
-# without notice, or even be removed.
-#
-# We mean it.
-#
-
-CONFIG += qml1_target
-load(qml_plugin)
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 65212b2abf..bd84ce597a 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -23,15 +23,9 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL
 
 load(qt_build_paths)
 
-qml1_target {
-    DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
-    instbase = $$[QT_INSTALL_IMPORTS]
-} else {
-    DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
-    instbase = $$[QT_INSTALL_QML]
-}
+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
 
-!qml1_target:static: \
+static: \
     CONFIG += builtin_resources
 else: \
     CONFIG += install_qml_files
@@ -52,7 +46,7 @@ qmldir.base = $$_PRO_FILE_PWD_
 # Tools need qmldir and plugins.qmltypes always installed on the file system
 qmldir.files = $$qmldir_file $$fq_aux_qml_files
 install_qml_files: qmldir.files += $$fq_qml_files
-qmldir.path = $$instbase/$$TARGETPATH
+qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 INSTALLS += qmldir
 
 !debug_and_release|!build_all|CONFIG(release, debug|release) {
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index cd6377dcc6..ad8ecdf5f1 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -48,15 +48,9 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE
 
 load(qt_build_paths)
 
-qml1_target {
-    DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
-    instbase = $$[QT_INSTALL_IMPORTS]
-} else {
-    DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
-    instbase = $$[QT_INSTALL_QML]
-}
+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
 
-target.path = $$instbase/$$TARGETPATH
+target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
 INSTALLS += target
 
 # Some final setup
@@ -75,20 +69,11 @@ load(qt_common)
 # directory.  Then review and commit the changes made to plugins.qmltypes.
 #
 !cross_compile {
-    qml1_target {
-        qmlplugindump = qml1plugindump
-        importpath.name = QML_IMPORT_PATH
-    } else {
-        qmlplugindump = qmlplugindump
-        importpath.name = QML2_IMPORT_PATH
-    }
+    qmlplugindump = qmlplugindump
+    importpath.name = QML2_IMPORT_PATH
     importpath.value =
     for(qmod, QTREPOS) {
-        qml1_target: \
-            qmod = $$qmod/imports
-        else: \
-            qmod = $$qmod/qml
-        exists($$qmod): importpath.value += $$shell_path($$qmod)
+        exists($$qmod/qml): importpath.value += $$shell_path($$qmod/qml)
     }
     importpath.value = $$unique(importpath.value)
     QT_TOOL_ENV = importpath