sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-15 00:06:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56953 from t0b3/fix--build-without-qtserialport

Browse Source 
Fix:  build with `QTSERIALPORT=false`
This commit is contained in:
Matthias Kuhn 2024-03-24 21:36:18 +01:00 committed by GitHub
commit fdefdf9c27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/run-tests.yml vendored
View File

@ -116,7 +116,7 @@ jobs:
echo QT_VERSION: ${QT_VERSION} echo QT_VERSION: ${QT_VERSION}
- name: Login to Docker Hub - name: Login to Docker Hub
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
@ -129,7 +129,7 @@ jobs:
context: . context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }} tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' }} push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
pull: true pull: true
build-args: build-args:
DISTRO_VERSION=${{ matrix.distro-version }} DISTRO_VERSION=${{ matrix.distro-version }}
@ -347,7 +347,7 @@ jobs:
echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME} echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
- name: Login to Docker Hub - name: Login to Docker Hub
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
@ -360,7 +360,7 @@ jobs:
context: . context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }} tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' }} push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
pull: true pull: true
target: ${{ matrix.docker-target }} target: ${{ matrix.docker-target }}
build-args: build-args:
@ -458,7 +458,7 @@ jobs:
fetch-depth: 2 fetch-depth: 2
- name: Login to Docker Hub - name: Login to Docker Hub
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
@ -471,7 +471,7 @@ jobs:
context: . context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }} tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' }} push: ${{ github.event_name == 'push' && github.actor == 'qgis' }}
pull: true pull: true
target: ${{ matrix.docker-target }} target: ${{ matrix.docker-target }}
build-args: build-args:

21
python/PyQt6/core/core.sip.in
View File

@ -91,15 +91,6 @@ done:
%End %End
%Import QtXml/QtXmlmod.sip
%Import QtNetwork/QtNetworkmod.sip
%Import QtSql/QtSqlmod.sip
%Import QtPrintSupport/QtPrintSupportmod.sip
%Import QtWidgets/QtWidgetsmod.sip
%Import QtPositioning/QtPositioningmod.sip
%Import QtSerialPort/QtSerialPortmod.sip
%Feature HAVE_GUI %Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT %Feature HAVE_QTSERIALPORT
%Feature HAVE_QTPRINTER %Feature HAVE_QTPRINTER
@ -108,6 +99,18 @@ done:
%Feature HAVE_WEBENGINE_SIP %Feature HAVE_WEBENGINE_SIP
%Feature PYQT6 %Feature PYQT6
%Import QtXml/QtXmlmod.sip
%Import QtNetwork/QtNetworkmod.sip
%Import QtSql/QtSqlmod.sip
%Import QtPrintSupport/QtPrintSupportmod.sip
%Import QtWidgets/QtWidgetsmod.sip
%Import QtPositioning/QtPositioningmod.sip
%If (HAVE_QTSERIALPORT)
%Import QtSerialPort/QtSerialPortmod.sip
%End
%Include conversions.sip %Include conversions.sip
%Include qgsexception.sip %Include qgsexception.sip
%Include typedefs.sip %Include typedefs.sip

17
python/core/core.sip.in
View File

@ -91,6 +91,13 @@ done:
%End %End
%Feature HAVE_GUI
%Feature HAVE_QTSERIALPORT
%Feature HAVE_QTPRINTER
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Feature HAVE_WEBENGINE_SIP
%Import QtXml/QtXmlmod.sip %Import QtXml/QtXmlmod.sip
%Import QtNetwork/QtNetworkmod.sip %Import QtNetwork/QtNetworkmod.sip
%Import QtSql/QtSqlmod.sip %Import QtSql/QtSqlmod.sip
@ -98,14 +105,10 @@ done:
%Import QtPrintSupport/QtPrintSupportmod.sip %Import QtPrintSupport/QtPrintSupportmod.sip
%Import QtWidgets/QtWidgetsmod.sip %Import QtWidgets/QtWidgetsmod.sip
%Import QtPositioning/QtPositioningmod.sip %Import QtPositioning/QtPositioningmod.sip
%Import QtSerialPort/QtSerialPortmod.sip
%Feature HAVE_GUI %If (HAVE_QTSERIALPORT)
%Feature HAVE_QTSERIALPORT %Import QtSerialPort/QtSerialPortmod.sip
%Feature HAVE_QTPRINTER %End
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Feature HAVE_WEBENGINE_SIP
%Include conversions.sip %Include conversions.sip
%Include qgsexception.sip %Include qgsexception.sip