From 4089ed8f01ae98000a061cd9c1eb341b86b2c79b Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Wed, 16 Mar 2016 00:34:06 +0100
Subject: [PATCH] fix pyuic wrapper

---
 cmake/PyQtMacros.cmake         | 2 +-
 python/PyQt/PyQt4/uic/pyuic.py | 5 +++++
 scripts/pyuic-wrapper.py       | 6 ------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
index 431b094e1f6..39e8d40dcf5 100644
--- 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
index 06fec46caee..68a0cb878b8 100644
--- a/python/PyQt/PyQt4/uic/pyuic.py
+++ b/python/PyQt/PyQt4/uic/pyuic.py
@@ -23,4 +23,9 @@ __copyright__ = '(C) 2016, Jürgen E. Fischer'
 # 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
index 5e6df82de1c..5549b7b4670 100644
--- 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