diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-09 16:38:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-07-09 14:39:30 +0000 |
| commit | f6cc098e523c2f0a77d420ae690d02726cebce38 (patch) | |
| tree | 6b68d2508e1dad58ae8a6ac139b96739cc1a8ba1 /scripts | |
| parent | 2f017c071edd35dd19cfb8c2d49c70b99a50760e (diff) | |
Deployqt: Make Qt Quick 1 imports optional
Since we do not need Qt Quick 1 to compile Qt Creator anymore,
and it is a separate component in Qt now
Change-Id: I1bd35ceca7d4bd3261221a8607a35a658bc857e5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index f7bf539f2f1..f09ceafa184 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -188,7 +188,9 @@ def copy_qt_libs(install_dir, qt_libs_dir, qt_plugin_dir, qt_import_dir, qt_qml_ target = os.path.join(install_dir, 'bin', 'imports', qtimport) if (os.path.exists(target)): shutil.rmtree(target) - shutil.copytree(os.path.join(qt_import_dir, qtimport), target, ignore=copy_ignore_func, symlinks=True) + import_path = os.path.join(qt_import_dir, qtimport) + if os.path.exists(import_path): + shutil.copytree(import_path, target, ignore=copy_ignore_func, symlinks=True) if (os.path.exists(qt_qml_dir)): print "Copying qt quick 2 imports" |