fix pyuic wrapper

qgis · Mar 15, 2016 · 4089ed8 · 4089ed8
1 parent 96c60fd
commit 4089ed8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
@@ -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)

diff --git a/python/PyQt/PyQt4/uic/pyuic.py b/python/PyQt/PyQt4/uic/pyuic.py
@@ -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
diff --git a/scripts/pyuic-wrapper.py b/scripts/pyuic-wrapper.py
@@ -1,7 +1 @@
-try:
-    import sip
-    sip.setapi("QVariant", 2)
-except:
-    pass
-
 import PyQt.uic.pyuic