diff --git a/CMakeLists.txt b/CMakeLists.txt index 36cc0b477c7..ff103cc4142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,7 +219,7 @@ SET (HAVE_MSSQL TRUE) ############################################################# # search for Qt4 -SET(QT_MIN_VERSION 4.5.0) +SET(QT_MIN_VERSION 4.7.0) FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED) MESSAGE(STATUS "Found Qt version: ${QTVERSION}") SET(QT_USE_QTXML 1) @@ -242,12 +242,8 @@ ELSE (ANDROID) 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") -ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) - SET (WITH_TOUCH FALSE) -ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 ) +#Add a touch mode if Qt has Qt Gestures +SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build") IF (WITH_TOUCH) # following variable is used in qgsconfig.h diff --git a/INSTALL b/INSTALL index a15cba528f6..7038893cdee 100644 --- a/INSTALL +++ b/INSTALL @@ -1,10 +1,10 @@ QGIS Building QGIS from source - step by step -Thursday November 21, 2013 +Saturday November 30, 2013 -Last Updated: Thursday November 21, 2013 -Last Change : Thursday November 21, 2013 +Last Updated: Saturday November 30, 2013 +Last Change : Saturday November 30, 2013 1. Introduction @@ -98,7 +98,7 @@ Required build tools: Required build deps: -- Qt >= 4.5.0 +- Qt >= 4.7.0 - Proj >= 4.4.x - GEOS >= 3.0 - Sqlite3 >= 3.0.0 diff --git a/doc/INSTALL.html b/doc/INSTALL.html index 117cf58abf3..956faea6302 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -5,7 +5,7 @@ QGIS - +