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

[PyQt5] make pyuic4-wrapper PyQt5 aware

Browse Source
This commit is contained in:
Matthias Kuhn 2016-03-10 18:35:47 +01:00
parent aa293704f3
commit 264527a495
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/PyQtMacros.cmake
View File

@ -45,7 +45,7 @@ MACRO(PYQT_WRAP_UI outfiles )
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py) SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile} ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYUIC_WRAPPER} "${PYUIC_PROGRAM}" "${PYUIC_WRAPPER_PATH}" "${QGIS_OUTPUT_DIRECTORY}/python" ${infile} -o ${outfile} COMMAND ${PYUIC_WRAPPER} "${PYUIC_PROGRAM}" "${PYUIC_WRAPPER_PATH}" "${QGIS_OUTPUT_DIRECTORY}/python" "${PYTHON_EXECUTABLE}" ${infile} -o ${outfile}
MAIN_DEPENDENCY ${infile} MAIN_DEPENDENCY ${infile}
DEPENDS pygui pycore DEPENDS pygui pycore
) )

2
scripts/pyuic4-wrapper.bat
View File

@ -2,4 +2,4 @@
set PYUIC4=%1 set PYUIC4=%1
set PATH=%2;%PATH% set PATH=%2;%PATH%
set PYTHONPATH=%3;%PYTHONPATH% set PYTHONPATH=%3;%PYTHONPATH%
%PYUIC4% %4 %5 %6 %7 %8 %9 %PYUIC4% %5 %6 %7 %8 %9

5
scripts/pyuic4-wrapper.py
View File

@ -4,4 +4,7 @@ try:
except: except:
pass pass
import PyQt4.uic.pyuic try:
import PyQt4.uic.pyuic
except ImportError:
import PyQt5.uic.pyuic

5
scripts/pyuic4-wrapper.sh
View File

@ -3,8 +3,9 @@
PYUIC4=$1 PYUIC4=$1
LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
PYTHONPATH=$3:$PYTHONPATH PYTHONPATH=$3:$PYTHONPATH
shift 3 PYTHON=$4
shift 4
export LD_LIBRARY_PATH PYTHONPATH export LD_LIBRARY_PATH PYTHONPATH
exec python $(dirname $0)/pyuic4-wrapper.py $@ exec $PYTHON $(dirname $0)/pyuic4-wrapper.py $@