Merge branch 'master' into drc-kissing-corners

This commit is contained in:
Matthias Koefferlein 2024-02-11 10:42:47 +01:00
commit 2dd6bbc3fc
3 changed files with 21 additions and 4 deletions

View File

@ -37,7 +37,7 @@ jobs:
large-packages: false # not working currently large-packages: false # not working currently
- uses: hmarr/debug-action@v2 - uses: hmarr/debug-action@v2
- name: Cancel Workflow Action - name: Cancel Workflow Action
uses: styfle/cancel-workflow-action@0.12.0 uses: styfle/cancel-workflow-action@0.12.1
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: ccache - name: ccache
uses: hendrikmuhs/ccache-action@v1.2 uses: hendrikmuhs/ccache-action@v1.2
@ -52,7 +52,7 @@ jobs:
HOST_CCACHE_DIR="$(ccache -k cache_dir)" HOST_CCACHE_DIR="$(ccache -k cache_dir)"
mkdir -p $HOST_CCACHE_DIR mkdir -p $HOST_CCACHE_DIR
- name: Build wheels # check https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions - name: Build wheels # check https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions
uses: pypa/cibuildwheel@v2.16.2 uses: pypa/cibuildwheel@v2.16.5
# to supply options, put them in 'env', like: # to supply options, put them in 'env', like:
# env: # env:
# CIBW_SOME_OPTION: value # CIBW_SOME_OPTION: value

View File

@ -548,6 +548,23 @@
<header>layWidgets.h</header> <header>layWidgets.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>lib_cbx</tabstop>
<tabstop>browse_pb</tabstop>
<tabstop>cell_le</tabstop>
<tabstop>place_origin_cb</tabstop>
<tabstop>scale_le</tabstop>
<tabstop>angle_le</tabstop>
<tabstop>mirror_cbx</tabstop>
<tabstop>array_grp</tabstop>
<tabstop>rows_le</tabstop>
<tabstop>columns_le</tabstop>
<tabstop>row_x_le</tabstop>
<tabstop>row_y_le</tabstop>
<tabstop>column_x_le</tabstop>
<tabstop>column_y_le</tabstop>
</tabstops>
<resources> <resources>
<include location="../../icons/icons.qrc"/> <include location="../../icons/icons.qrc"/>
</resources> </resources>

View File

@ -290,9 +290,9 @@ PythonInterpreter::PythonInterpreter (bool embedded)
} }
} }
} Py_SetPath (tl::to_wstring (path).c_str ());
Py_SetPath (tl::to_wstring (path).c_str ()); }
} catch (tl::Exception &ex) { } catch (tl::Exception &ex) {
tl::error << tl::to_string (tr ("Evaluation of Python path expression failed")) << ": " << ex.msg (); tl::error << tl::to_string (tr ("Evaluation of Python path expression failed")) << ": " << ex.msg ();