Permalink
7 comments
on commit
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
48 additions
and 18 deletions.
- +5 −5 python/CMakeLists.txt
- +1 −0 python/PyQt/CMakeLists.txt
- +29 −0 python/PyQt/PyQt5/sip.py
- +1 −1 python/plugins/processing/gui/NumberInputPanel.py
- +1 −1 src/python/qgspythonutilsimpl.cpp
- +1 −1 tests/src/python/test_core_additions.py
- +1 −1 tests/src/python/test_qgslayout.py
- +1 −1 tests/src/python/test_qgslayoutaligner.py
- +1 −1 tests/src/python/test_qgslayoutatlas.py
- +1 −1 tests/src/python/test_qgslayoutexporter.py
- +1 −1 tests/src/python/test_qgslayoutguides.py
- +1 −1 tests/src/python/test_qgslayoutpagecollection.py
- +1 −1 tests/src/python/test_qgslayoutview.py
- +1 −1 tests/src/python/test_qgslocator.py
- +1 −1 tests/src/python/test_qgsmaplayerstore.py
- +1 −1 tests/src/python/test_qgsproject.py
@@ -0,0 +1,29 @@ | ||
# -*- coding: utf-8 -*- | ||
|
||
""" | ||
*************************************************************************** | ||
sip.py | ||
--------------------- | ||
Date : October 2018 | ||
Copyright : (C) 2018 by Nyall Dawson | ||
Email : nyall dot dawson at gmail dot com | ||
*************************************************************************** | ||
* * | ||
* This program is free software; you can redistribute it and/or modify * | ||
* it under the terms of the GNU General Public License as published by * | ||
* the Free Software Foundation; either version 2 of the License, or * | ||
* (at your option) any later version. * | ||
* * | ||
*************************************************************************** | ||
""" | ||
|
||
__author__ = 'Nyall Dawson' | ||
__date__ = 'October 2017' | ||
__copyright__ = '(C) 2018, Nyall Dawson' | ||
# This will get replaced with a git SHA1 when you do a git archive | ||
__revision__ = '$Format:%H$' | ||
|
||
try: | ||
from PyQt5.sip import * | ||
except ModuleNotFoundError: | ||
from sip import * |
This comment has been minimized.
@nyalldawson , this broke python support when building on ubuntu 18.10. When launching QGIS, I get this error:
This comment has been minimized.
@nirvn You have to specify SIP_IMPORT=sip
This comment has been minimized.
@nirvn see also #8295
This comment has been minimized.
@jef-n , thanks, my system's SIP_IMPORT was wrongly set to PyQt5.sip. I've tried creating a new build directory and the initial cmake ../QGIS properly sets it to sip now.
This comment has been minimized.
@nirvn well, the default is PyQt5.sip, because that's PyQt5's default. PyQt5 in debian is patched to use sip.
This comment has been minimized.
@jef-n , OK; I'd expect us to fill the correct value based on the system within which a builder is creating a build directory via (c)cmake, whether it's PyQt5.sip or sip. I think it does so, since I did check that and our cmake scripts ended up selecting the right value to use there.
This comment has been minimized.
@nirvn auto-detecting version in 4464089