Skip to content
Permalink
Browse files

* fix pyuic wrapper on windows

* fix PyQt wrapper installation on precise
  • Loading branch information
jef-n committed Mar 17, 2016
1 parent 5c3c99c commit 09f6b918a58740fec7e205c45774bfaa882d0bbb
Showing with 3 additions and 2 deletions.
  1. +1 −1 python/PyQt/CMakeLists.txt
  2. +2 −1 scripts/pyuic-wrapper.bat
@@ -29,7 +29,7 @@ ELSE(ENABLE_QT5)
ENDIF(ENABLE_QT5)

FOREACH(pyfile ${PYQT_COMPAT_FILES})
GET_FILENAME_COMPONENT(_dir ${pyfile} DIRECTORY)
GET_FILENAME_COMPONENT(_dir ${pyfile} PATH)
SET(pyfile ${PYQT_PREFIX}/${pyfile})
LIST(APPEND PYQT_COMPAT_FILES_PREFIXED ${pyfile})
ADD_CUSTOM_COMMAND(TARGET pyqtcompat
@@ -2,4 +2,5 @@
set PYUIC4=%1
set PATH=%2;%PATH%
set PYTHONPATH=%3;%PYTHONPATH%
%PYUIC4% %5 %6 %7 %8 %9
set PYTHON=%4
%PYTHON% %~dp0\pyuic-wrapper.py %5 %6 %7 %8 %9

1 comment on commit 09f6b91

@m-kuhn

This comment has been minimized.

Copy link
Member

@m-kuhn m-kuhn commented on 09f6b91 Mar 17, 2016

@jef-n any opinion where the PyQt wrappers should be installed?
Toplevel python path?
As submodule of qgis?

Please sign in to comment.
You can’t perform that action at this time.