Commit 14eee567 authored by Eike Ziller's avatar Eike Ziller

Fix deployqt for qt4

Don't try to deploy qt quick 2 imports if they aren't there.

Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 00935489
...@@ -189,11 +189,12 @@ def copy_qt_libs(install_dir, qt_libs_dir, qt_plugin_dir, qt_import_dir, qt_qml_ ...@@ -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.rmtree(target)
shutil.copytree(os.path.join(qt_import_dir, qtimport), target, ignore=copy_ignore_func, symlinks=True) shutil.copytree(os.path.join(qt_import_dir, qtimport), target, ignore=copy_ignore_func, symlinks=True)
print "Copying qt quick 2 imports" if (os.path.exists(qt_qml_dir)):
target = os.path.join(install_dir, 'bin', 'qml') print "Copying qt quick 2 imports"
if (os.path.exists(target)): target = os.path.join(install_dir, 'bin', 'qml')
shutil.rmtree(target) if (os.path.exists(target)):
shutil.copytree(qt_qml_dir, target, ignore=copy_ignore_func, symlinks=True) shutil.rmtree(target)
shutil.copytree(qt_qml_dir, target, ignore=copy_ignore_func, symlinks=True)
def add_qt_conf(install_dir): def add_qt_conf(install_dir):
print "Creating qt.conf:" print "Creating qt.conf:"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment