aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2017-11-09 13:57:09 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-11-15 15:47:07 +0000
commit49fb9494ba6589cacda3c9e76fc354650a9fd87e (patch)
tree00d9e9410ddfbc4a78855d95894df88ac4fe449c
parentf970327f8d40a81d4801918d3e6cb1fc44ff2292 (diff)
Make standalone option work on Windows
Change-Id: Ib2429a3cefb9ecc8804d384f9560e15d27d48198 Task-number: PYSIDE-558 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--setup.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 5d525226e..55b7676d8 100644
--- a/setup.py
+++ b/setup.py
@@ -1210,6 +1210,8 @@ class pyside_build(_build):
"{site_packages_dir}/PySide2",
"{dist_dir}/PySide2",
vars=vars)
+ built_modules = self.get_built_pyside_modules(vars)
+
if self.debug or self.build_type == 'RelWithDebInfo':
# <build>/pyside2/PySide2/*.pdb -> <setup>/PySide2
copydir(
@@ -1353,8 +1355,26 @@ class pyside_build(_build):
# <qt>/translations/* -> <setup>/PySide2/translations
copydir("{qt_translations_dir}", "{dist_dir}/PySide2/translations",
filter=["*.qm"],
+ force=False,
+ vars=vars)
+
+ # <qt>/qml/* -> <setup>/PySide2/qml
+ copydir("{qt_qml_dir}", "{dist_dir}/PySide2/qml",
+ filter=None,
+ force=False,
+ recursive=True,
vars=vars)
+ if 'WebEngineWidgets' in built_modules:
+ copydir("{qt_prefix_dir}/resources", "{dist_dir}/PySide2/resources",
+ filter=None,
+ recursive=False,
+ vars=vars)
+
+ copydir("{qt_bin_dir}", "{dist_dir}/PySide2",
+ filter=["QtWebEngineProcess*.exe"],
+ recursive=False, vars=vars)
+
# pdb files for libshiboken and libpyside
if self.debug or self.build_type == 'RelWithDebInfo':
# XXX dbgPostfix gives problems - the structure in shiboken2/data should be re-written!