diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-16 09:49:21 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-17 10:26:14 +0200 |
| commit | ba96669d4ad0c31b8703231a9346218c6b92df70 (patch) | |
| tree | 0bf7d504c74902a13fe199a6d56cae90791fe407 /sources/pyside-tools | |
| parent | e392613181ef5d8592989addbd01f96dbebf65e8 (diff) | |
PySide6: Add assistant executable
[ChangeLog][PySide6] Assistant is now shipped along with PySide.
Fixes: PYSIDE-1378
Change-Id: Ie08778964f47378acf4e570b9a6dc3690257e411
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside-tools')
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | sources/pyside-tools/pyside_tool.py | 4 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 559c9faa1..8ff6de3a8 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -15,8 +15,10 @@ if(NOT NO_QT_TOOLS STREQUAL "yes") set(UIC_PATH "${LIBEXEC_PATH}/uic${CMAKE_EXECUTABLE_SUFFIX}") set(RCC_PATH "${LIBEXEC_PATH}/rcc${CMAKE_EXECUTABLE_SUFFIX}") if (APPLE) + set(ASSISTANT_PATH "${TOOLS_PATH}/Assistant.app") set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") else() + set(ASSISTANT_PATH "${TOOLS_PATH}/assistant${CMAKE_EXECUTABLE_SUFFIX}") set(DESIGNER_PATH "${TOOLS_PATH}/designer${CMAKE_EXECUTABLE_SUFFIX}") endif() @@ -34,6 +36,24 @@ if(NOT NO_QT_TOOLS STREQUAL "yes") GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) + if (EXISTS ${ASSISTANT_PATH}) + if (APPLE) + install(DIRECTORY "${ASSISTANT_PATH}" + DESTINATION bin + FILE_PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + else() + install(FILES "${ASSISTANT_PATH}" + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + endif() + endif() + if (EXISTS ${DESIGNER_PATH}) if (APPLE) install(DIRECTORY "${DESIGNER_PATH}" diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py index 6a47d3632..1819a3ffb 100644 --- a/sources/pyside-tools/pyside_tool.py +++ b/sources/pyside-tools/pyside_tool.py @@ -81,6 +81,10 @@ def rcc(): qt_tool_wrapper("rcc", ['-g', 'python'] + sys.argv[1:]) +def assistant(): + qt_tool_wrapper("assistant", sys.argv[1:]) + + def _append_to_path_var(var, value): env_value = os.environ.get(var) if env_value: |