support custom widgets in PYQT4_WRAP_UI

qgis · May 22, 2014 · 581e67e · 581e67e
1 parent 442a3c1
commit 581e67e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/cmake/PyQt4Macros.cmake b/cmake/PyQt4Macros.cmake
@@ -22,12 +22,21 @@ ENDIF(NOT PYUIC4_PROGRAM)
 
 # Adapted from QT4_WRAP_UI
 MACRO(PYQT4_WRAP_UI outfiles )
+  IF(WIN32)
+    SET(PYUIC4_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic4-wrapper.bat")
+    SET(PYUIC4_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}")
+  ELSE(WIN32)
+    # TODO osx
+    SET(PYUIC4_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic4-wrapper.sh")
+    SET(PYUIC4_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
+  ENDIF(WIN32)
+
   FOREACH(it ${ARGN})
     GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
     SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-      COMMAND ${PYUIC4_PROGRAM} ${infile} -o ${outfile}
+      COMMAND ${PYUIC4_WRAPPER} "${PYUIC4_PROGRAM}" "${PYUIC4_WRAPPER_PATH}" "${QGIS_OUTPUT_DIRECTORY}/python" ${infile} -o ${outfile}
       MAIN_DEPENDENCY ${infile}                       
     )
     SET(${outfiles} ${${outfiles}} ${outfile})

diff --git a/scripts/pyuic4-wrapper.bat b/scripts/pyuic4-wrapper.bat
@@ -0,0 +1,5 @@
+@echo off
+set PYUIC4=%1
+set PATH=%2;%PATH%
+set PYTHONPATH=%3;%PYTHONPATH%
+%PYUIC4% %4 %5 %6 %7 %8 %9
diff --git a/scripts/pyuic4-wrapper.sh b/scripts/pyuic4-wrapper.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+PYUIC4=$1
+LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
+PYTHONPATH=$3:$PYTHONPATH
+shift 3
+
+export LD_LIBRARY_PATH PYTHONPATH
+
+$PYUIC4 $@
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -528,7 +528,6 @@
                  </layout>
                  <zorder>txtSubsetSQL</zorder>
                  <zorder>pbnQueryBuilder</zorder>
-                 <zorder>collapseButton</zorder>
                 </widget>
                </item>
                <item>