Fix customwidgets build for Qt4

m-kuhn · m-kuhn · commit 8294a22d40fc · 2015-01-06T17:22:36.000+01:00
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -96,7 +96,8 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/
   ${GEOS_INCLUDE_DIR}
-  ${Qt5Designer_INCLUDE_DIRS}
+  ${Qt5Designer_INCLUDE_DIRS} # For Qt5
+  ${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4
 )
 
 QT4_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ INCLUDE_DIRECTORIES(`
`96`	`96`	`${CMAKE_CURRENT_SOURCE_DIR}/../gui/editorwidgets/`
`97`	`97`	`${CMAKE_CURRENT_BINARY_DIR}/../ui/`
`98`	`98`	`${GEOS_INCLUDE_DIR}`
`99`		`- ${Qt5Designer_INCLUDE_DIRS}`
	`99`	`+ ${Qt5Designer_INCLUDE_DIRS} # For Qt5`
	`100`	`+ ${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4`
`100`	`101`	`)`
`101`	`102`
`102`	`103`	`QT4_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})`