Skip to content

Commit 981ea28

Browse files
committed
fix #6191
1 parent 84d4196 commit 981ea28

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

CMakeLists.txt

+13-18
Original file line numberDiff line numberDiff line change
@@ -196,36 +196,31 @@ SET(QT_USE_QTXML 1)
196196
SET(QT_USE_QTNETWORK 1)
197197
SET(QT_USE_QTSVG 1)
198198
SET(QT_USE_QTSQL 1)
199+
SET(QT_USE_QTWEBKIT 1)
199200

200-
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
201+
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND)
201202
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
202-
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
203-
204-
IF(WITH_DESKTOP)
205-
SET(QT_USE_QTWEBKIT 1)
206-
207-
IF(NOT QT_QTWEBKIT_FOUND)
208-
MESSAGE(SEND_ERROR "Qt Webkit module required for QGIS Desktop!")
209-
ENDIF(NOT QT_QTWEBKIT_FOUND)
210-
ENDIF(WITH_DESKTOP)
203+
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND)
211204

212205
IF (ANDROID)
213-
SET (DEFAULT_WITH_TOUCH TRUE)
206+
SET (DEFAULT_WITH_TOUCH TRUE)
214207
ELSE (ANDROID)
215-
SET (DEFAULT_WITH_TOUCH FALSE)
208+
SET (DEFAULT_WITH_TOUCH FALSE)
216209
ENDIF (ANDROID)
210+
217211
#Add a touch mode if Qt has Qt Gestures (starting from 4.6)
218212
IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
219-
SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
213+
SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
220214
ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
221-
SET (WITH_TOUCH FALSE)
215+
SET (WITH_TOUCH FALSE)
222216
ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
217+
223218
IF (WITH_TOUCH)
224-
# following variable is used in qgsconfig.h
225-
SET (HAVE_TOUCH TRUE)
226-
MESSAGE (STATUS "Touch support enabled")
219+
# following variable is used in qgsconfig.h
220+
SET (HAVE_TOUCH TRUE)
221+
MESSAGE (STATUS "Touch support enabled")
227222
ELSE (WITH_TOUCH)
228-
MESSAGE (STATUS "Touch support disabled")
223+
MESSAGE (STATUS "Touch support disabled")
229224
ENDIF (WITH_TOUCH)
230225

231226
IF (ENABLE_TESTS)

0 commit comments

Comments
 (0)