Skip to content
Permalink
Browse files

fix pyuic wrapper

  • Loading branch information
jef-n committed Mar 15, 2016
1 parent 96c60fd commit 4089ed8f01ae98000a061cd9c1eb341b86b2c79b
Showing with 6 additions and 7 deletions.
  1. +1 −1 cmake/PyQtMacros.cmake
  2. +5 −0 python/PyQt/PyQt4/uic/pyuic.py
  3. +0 −6 scripts/pyuic-wrapper.py
@@ -47,7 +47,7 @@ MACRO(PYQT_WRAP_UI outfiles )
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYUIC_WRAPPER} "${PYUIC_PROGRAM}" "${PYUIC_WRAPPER_PATH}" "${QGIS_OUTPUT_DIRECTORY}/python" "${PYTHON_EXECUTABLE}" ${infile} -o ${outfile}
MAIN_DEPENDENCY ${infile}
DEPENDS pygui pycore
DEPENDS pygui pycore pyqtcompat
)
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
@@ -23,4 +23,9 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'


import sip
for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
sip.setapi(api, 2)

from PyQt4.uic import pyuic
@@ -1,7 +1 @@
try:
import sip
sip.setapi("QVariant", 2)
except:
pass

import PyQt.uic.pyuic

0 comments on commit 4089ed8

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