Do not try to deploy QtQuick1 imports

We don't ship them with Qt Creator since a longer time now, and in Qt6
they are completely gone.

Change-Id: I7c6b1da1782cb641e17b2d1c7ff764dd81e15ee6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

3 files changed, 5 insertions, 31 deletions

diff --git a/scripts/build.py b/scripts/build.py
index 50247030fd..b665a923c5 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -217,13 +217,11 @@ def deploy_qt(args, paths):
         qt_bins = os.path.join(paths.qt, 'bin')
         qt_translations = os.path.join(paths.qt, 'translations')
         qt_plugins = os.path.join(paths.qt, 'plugins')
-        qt_imports = os.path.join(paths.qt, 'imports')
         qt_qml = os.path.join(paths.qt, 'qml')
         env = dict(os.environ)
         if paths.llvm:
             env['LLVM_INSTALL_DIR'] = paths.llvm
-        common.check_print_call([script, app, qt_bins, qt_translations, qt_plugins,
-                                 qt_imports, qt_qml],
+        common.check_print_call([script, app, qt_bins, qt_translations, qt_plugins, qt_qml],
                                 paths.build,
                                 env=env)
     else:
diff --git a/scripts/deployqt.py b/scripts/deployqt.py
index 4aaea9b620..e0c8c7cdf5 100755
--- a/scripts/deployqt.py
+++ b/scripts/deployqt.py
@@ -129,7 +129,7 @@ def ignored_qt_lib_files(path, filenames):
         return []
     return [fn for fn in filenames if is_ignored_windows_file(debug_build, path, fn)]
 
-def copy_qt_libs(target_qt_prefix_path, qt_bin_dir, qt_libs_dir, qt_plugin_dir, qt_import_dir, qt_qml_dir, plugins, imports):
+def copy_qt_libs(target_qt_prefix_path, qt_bin_dir, qt_libs_dir, qt_plugin_dir, qt_qml_dir, plugins):
     print("copying Qt libraries...")
 
     if common.is_windows_platform():
@@ -169,16 +169,6 @@ def copy_qt_libs(target_qt_prefix_path, qt_bin_dir, qt_libs_dir, qt_plugin_dir,
             print('{0} -> {1}'.format(pluginPath, target))
             common.copytree(pluginPath, target, ignore=ignored_qt_lib_files, symlinks=True)
 
-    print("Copying imports:", imports)
-    for qtimport in imports:
-        target = os.path.join(target_qt_prefix_path, 'imports', qtimport)
-        if (os.path.exists(target)):
-            shutil.rmtree(target)
-        import_path = os.path.join(qt_import_dir, qtimport)
-        if os.path.exists(import_path):
-            print('{0} -> {1}'.format(import_path, target))
-            common.copytree(import_path, target, ignore=ignored_qt_lib_files, symlinks=True)
-
     if (os.path.exists(qt_qml_dir)):
         print("Copying qt quick 2 imports")
         target = os.path.join(target_qt_prefix_path, 'qml')
@@ -205,7 +195,6 @@ def add_qt_conf(target_path, qt_prefix_path):
     f.write('Binaries={0}\n'.format('bin' if common.is_linux_platform() else '.'))
     f.write('Libraries={0}\n'.format('lib' if common.is_linux_platform() else '.'))
     f.write('Plugins=plugins\n')
-    f.write('Imports=imports\n')
     f.write('Qml2Imports=qml\n')
     f.close()
 
@@ -365,7 +354,6 @@ def main():
     QT_INSTALL_LIBS = qt_install_info['QT_INSTALL_LIBS']
     QT_INSTALL_BINS = qt_install_info['QT_INSTALL_BINS']
     QT_INSTALL_PLUGINS = qt_install_info['QT_INSTALL_PLUGINS']
-    QT_INSTALL_IMPORTS = qt_install_info['QT_INSTALL_IMPORTS']
     QT_INSTALL_QML = qt_install_info['QT_INSTALL_QML']
     QT_INSTALL_TRANSLATIONS = qt_install_info['QT_INSTALL_TRANSLATIONS']
 
@@ -376,16 +364,15 @@ def main():
                'wayland-graphics-integration-client',
                'wayland-shell-integration',
                ]
-    imports = ['Qt', 'QtWebKit']
 
     if common.is_windows_platform():
         global debug_build
         debug_build = is_debug(args.qtcreator_binary)
 
     if common.is_windows_platform():
-        copy_qt_libs(qt_deploy_prefix, QT_INSTALL_BINS, QT_INSTALL_BINS, QT_INSTALL_PLUGINS, QT_INSTALL_IMPORTS, QT_INSTALL_QML, plugins, imports)
+        copy_qt_libs(qt_deploy_prefix, QT_INSTALL_BINS, QT_INSTALL_BINS, QT_INSTALL_PLUGINS, QT_INSTALL_QML, plugins)
     else:
-        copy_qt_libs(qt_deploy_prefix, QT_INSTALL_BINS, QT_INSTALL_LIBS, QT_INSTALL_PLUGINS, QT_INSTALL_IMPORTS, QT_INSTALL_QML, plugins, imports)
+        copy_qt_libs(qt_deploy_prefix, QT_INSTALL_BINS, QT_INSTALL_LIBS, QT_INSTALL_PLUGINS, QT_INSTALL_QML, plugins)
     copy_translations(install_dir, QT_INSTALL_TRANSLATIONS)
     if args.llvm_path:
         deploy_libclang(install_dir, args.llvm_path, chrpath_bin)
diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh
index b4b283289d..cc06c5e73a 100755
--- a/scripts/deployqtHelper_mac.sh
+++ b/scripts/deployqtHelper_mac.sh
@@ -25,7 +25,7 @@
 #
 ############################################################################
 
-[ $# -lt 5 ] && echo "Usage: $(basename $0) <app folder> <qt bin folder> <qt translations folder> <qt plugin folder> <qt quick imports folder> <qt quick 2 imports folder>" && exit 2
+[ $# -lt 5 ] && echo "Usage: $(basename $0) <app folder> <qt bin folder> <qt translations folder> <qt plugin folder> <qt quick 2 imports folder>" && exit 2
 [ $(uname -s) != "Darwin" ] && echo "Run this script on Mac OS X" && exit 2;
 
 app_path="$1"
@@ -68,17 +68,6 @@ if [ -d "$assetimporterSrcDir" ]; then
     fi
 fi
 
-# copy Qt Quick 1 imports
-importsDir="$app_path/Contents/Imports/qtquick1"
-if [ -d "$quick1_src" ]; then
-    if [ ! -d "$importsDir" ]; then
-        echo "- Copying Qt Quick 1 imports"
-        mkdir -p "$importsDir"
-        cp -R "$quick1_src"/ "$importsDir"/
-        find "$importsDir" -path "*.dylib.dSYM*" -delete
-    fi
-fi
-
 # copy Qt Quick 2 imports
 imports2Dir="$app_path/Contents/Imports/qtquick2"
 if [ -d "$quick2_src" ]; then