diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 16:25:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 16:31:56 +0200 |
| commit | 14eee567f1a496ea3735fb315c2ef57e39d78a50 (patch) | |
| tree | 07afd33b2f0717ff51b0561a22a971279bf735a9 /scripts | |
| parent | 009354898182e13810da7c08c594c8e4630382c5 (diff) | |
| download | qt-creator-14eee567f1a496ea3735fb315c2ef57e39d78a50.tar.gz | |
Fix deployqt for qt4
Don't try to deploy qt quick 2 imports if they aren't there.
Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index c11c56a2db..2d5af87ab8 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -189,11 +189,12 @@ def copy_qt_libs(install_dir, qt_libs_dir, qt_plugin_dir, qt_import_dir, qt_qml_ shutil.rmtree(target) shutil.copytree(os.path.join(qt_import_dir, qtimport), target, ignore=copy_ignore_func, symlinks=True) - print "Copying qt quick 2 imports" - target = os.path.join(install_dir, 'bin', 'qml') - if (os.path.exists(target)): - shutil.rmtree(target) - shutil.copytree(qt_qml_dir, target, ignore=copy_ignore_func, symlinks=True) + if (os.path.exists(qt_qml_dir)): + print "Copying qt quick 2 imports" + target = os.path.join(install_dir, 'bin', 'qml') + if (os.path.exists(target)): + shutil.rmtree(target) + shutil.copytree(qt_qml_dir, target, ignore=copy_ignore_func, symlinks=True) def add_qt_conf(install_dir): print "Creating qt.conf:" |