1- From c8c554e4b8306ee18e5e1819ef7aacbdd2a0f6ac Mon Sep 17 00:00:00 2001
1+ From 71f2d86a8b786503b93f4d6114573d0829c5d76d Mon Sep 17 00:00:00 2001
22From: Jacob Oursland <
[email protected] >
3- Date: Mon, 16 Sep 2024 10:15:49 -0700
3+ Date: Wed, 18 Sep 2024 00:20:33 -0700
44Subject: [PATCH] X
55
66---
7- CMakeLists.txt | 1 +
8- cmake/pyproject.toml.in | 25 ++++++
9- cmake/sip_configure.py | 1 +
10- cmake/sip_helper.cmake | 130 ++++++++++++++++++++++++------
11- src/python_qt_binding/__init__.py | 8 ++
12- 5 files changed, 141 insertions(+), 24 deletions(-)
7+ CMakeLists.txt | 1 +
8+ cmake/pyproject.toml.in | 28 +++++
9+ cmake/sip_configure.py | 1 +
10+ cmake/sip_helper.cmake | 130 +++++++++++++++++++-----
11+ src/python_qt_binding/__init__.py | 8 ++
12+ src/python_qt_binding/binding_helper.py | 6 +-
13+ 6 files changed, 145 insertions(+), 29 deletions(-)
1314 create mode 100644 cmake/pyproject.toml.in
1415
1516diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +27,7 @@ index 919969e..2bf015a 100644
2627 if(BUILD_TESTING)
2728diff --git a/cmake/pyproject.toml.in b/cmake/pyproject.toml.in
2829new file mode 100644
29- index 0000000..87c4527
30+ index 0000000..cf4f57f
3031--- /dev/null
3132+++ b/cmake/pyproject.toml.in
3233@@ -0,0 +1,28 @@
@@ -71,7 +72,7 @@ index 5210ee5..7bafe73 100644
7172 makefile.extra_cxxflags.append('-std=c++17')
7273
7374diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake
74- index a5ac3c2..a1f145c 100644
75+ index a5ac3c2..fdc9c18 100644
7576--- a/cmake/sip_helper.cmake
7677+++ b/cmake/sip_helper.cmake
7778@@ -31,7 +31,7 @@ execute_process(
@@ -246,5 +247,22 @@ index 1e209de..6b55f35 100644
246247+ QIcon.setThemeSearchPaths(current_theme_path + [os.path.join(conda_path, 'share/icons/')])
247248+ QIcon.setThemeName('Adwaita')
248249+ del os
250+ diff --git a/src/python_qt_binding/binding_helper.py b/src/python_qt_binding/binding_helper.py
251+ index 27c3237..781fe62 100644
252+ --- a/src/python_qt_binding/binding_helper.py
253+ +++ b/src/python_qt_binding/binding_helper.py
254+ @@ -50,11 +50,7 @@ QT_BINDING_VERSION = None
255+ def _select_qt_binding(binding_name=None, binding_order=None):
256+ global QT_BINDING, QT_BINDING_VERSION
257+
258+ - # order of default bindings can be changed here
259+ - if platform.system() == 'Darwin':
260+ - DEFAULT_BINDING_ORDER = ['pyside']
261+ - else:
262+ - DEFAULT_BINDING_ORDER = ['pyqt', 'pyside']
263+ + DEFAULT_BINDING_ORDER = ['pyqt', 'pyside']
264+
265+ binding_order = binding_order or DEFAULT_BINDING_ORDER
266+
249267- -
2502682.46.1
0 commit comments