diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-04-04 09:20:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-05 15:26:19 +0000 |
| commit | 53817339ad4d4d5580959bfa8d248c3954151559 (patch) | |
| tree | 99356c38ae133657a2fb36211f6512f5f46d2a8f /scripts/packagetesting/testwheel.py | |
| parent | 230783a5dc58989d19571246c9432bef51046a7a (diff) | |
| download | qtqa-master.tar.gz | |
testwheel.py: Fix examples for 6.5.1master
Use the new simple browser and the graph gallery with fixed path.
Amends d39b43602122bc963bd5a1eb1874bfd0bd05982c.
Task-number: PYSIDE-2247
Task-number: PYSIDE-2206
Change-Id: Ic78bb60b900e55282bd6e2535790e8666ebc2a0a
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 0d70150b785069b378fed6ec868b507affc1a128)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'scripts/packagetesting/testwheel.py')
| -rw-r--r-- | scripts/packagetesting/testwheel.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/scripts/packagetesting/testwheel.py b/scripts/packagetesting/testwheel.py index a1c311e..92f9564 100644 --- a/scripts/packagetesting/testwheel.py +++ b/scripts/packagetesting/testwheel.py @@ -47,7 +47,7 @@ PYINSTALLER_EXAMPLE_6 = "widgets/mainwindows/mdi/mdi.py" # Sth with "About Qt" PYINSTALLER_EXAMPLE_6_2 = "widgets/tetrix/tetrix.py" PYINSTALLER_EXAMPLE_2 = 'widgets/widgets/tetrix.py' OPCUAVIEWER = 'opcua/opcuaviewer/main.py' -WEBENGINE_EXAMPLE = 'webenginewidgets/tabbedbrowser/main.py' +WEBENGINE_TABBED_BROWSER = 'webenginewidgets/tabbedbrowser/main.py' PROJECT_TOOL = "pyside6-project" TOOLS = ["deploy", "genpyi", ("lrelease", "-help"), "lupdate", "metaobjectdump", "project", "qml", "qmlformat", ("qmlimportscanner", "-importPath", "."), "qmllint", @@ -133,7 +133,7 @@ def get_installed_wheels(examples_root): return InstalledWheels.AddOns # 6.4: Check existence of add-ons - if (examples_root / WEBENGINE_EXAMPLE).is_file(): + if (examples_root / WEBENGINE_TABBED_BROWSER).is_file(): return InstalledWheels.AddOns return InstalledWheels.Essentials @@ -149,12 +149,16 @@ def pyside2_examples(): def get_addon_examples(): - datavis_example = ('examples/datavisualization/graphgallery/main.py' - if VERSION >= (6, 5, 0) else - 'datavisualization/bars3d/bars3d.py') - return ['3d/simple3d/simple3d.py', 'charts/chartthemes/main.py', - datavis_example, 'multimedia/player/player.py', - WEBENGINE_EXAMPLE] + result = [] + if VERSION >= (6, 5, 1): + result.append('datavisualization/graphgallery/main.py') + result.append('webenginewidgets/simplebrowser/main.py') + else: + result.append('datavisualization/bars3d/bars3d.py') + result.append(WEBENGINE_TABBED_BROWSER) + result.extend(['3d/simple3d/simple3d.py', 'charts/chartthemes/main.py', + 'multimedia/player/player.py']) + return result def get_m2m_examples(): |