fix #6191

qgis · Aug 13, 2012 · 981ea28 · 981ea28
1 parent 84d4196
commit 981ea28
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,36 +196,31 @@ SET(QT_USE_QTXML 1)
 SET(QT_USE_QTNETWORK 1)
 SET(QT_USE_QTSVG 1)
 SET(QT_USE_QTSQL 1)
+SET(QT_USE_QTWEBKIT 1)
 
-IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
+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)
   MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
-ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
-
-IF(WITH_DESKTOP)
-  SET(QT_USE_QTWEBKIT 1)
-
-  IF(NOT QT_QTWEBKIT_FOUND)
-    MESSAGE(SEND_ERROR "Qt Webkit module required for QGIS Desktop!")
-  ENDIF(NOT QT_QTWEBKIT_FOUND)
-ENDIF(WITH_DESKTOP)
+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)
 
 IF (ANDROID)
-    SET (DEFAULT_WITH_TOUCH TRUE)
+  SET (DEFAULT_WITH_TOUCH TRUE)
 ELSE (ANDROID)
-    SET (DEFAULT_WITH_TOUCH FALSE)
+  SET (DEFAULT_WITH_TOUCH FALSE)
 ENDIF (ANDROID)
+
 #Add a touch mode if Qt has Qt Gestures (starting from 4.6)
 IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
-    SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
+  SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
 ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
-    SET (WITH_TOUCH FALSE)
+  SET (WITH_TOUCH FALSE)
 ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
+
 IF (WITH_TOUCH)
-    # following variable is used in qgsconfig.h
-    SET (HAVE_TOUCH TRUE)
-    MESSAGE (STATUS "Touch support enabled")
+  # following variable is used in qgsconfig.h
+  SET (HAVE_TOUCH TRUE)
+  MESSAGE (STATUS "Touch support enabled")
 ELSE (WITH_TOUCH)
-    MESSAGE (STATUS "Touch support disabled")
+  MESSAGE (STATUS "Touch support disabled")
 ENDIF (WITH_TOUCH)
 
 IF (ENABLE_TESTS)