Skip to content

Commit 3d53e29

Browse files
committed
adding a touch mode if qt >=4.6 (allows qt5) this defaults to on for android and to off for the rest. can be requested by -DWITH_TOUCH
allow qt 5
1 parent 1077410 commit 3d53e29

File tree

1 file changed

+20
-3
lines changed

1 file changed

+20
-3
lines changed

CMakeLists.txt

+20-3
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,30 @@ IF (ANDROID)
8787
ELSE (ANDROID)
8888
SET (DEFAULT_WITH_QTMOBILITY FALSE)
8989
ENDIF (ANDROID)
90-
SET (WITH_QTMOBILITY ${DEFAULT_WITH_QTMOBILITY} CACHE BOOL "Determines QtMobility related code should be build (for example internal GPS)")
90+
SET (WITH_QTMOBILITY ${DEFAULT_WITH_QTMOBILITY} CACHE BOOL "Determines if QtMobility related code should be build (for example internal GPS)")
9191
IF (WITH_QTMOBILITY)
9292
FIND_PACKAGE(QtMobility 1.1.0)
9393
ENDIF (WITH_QTMOBILITY)
9494

95+
IF (ANDROID)
96+
SET (DEFAULT_WITH_TOUCH TRUE)
97+
ELSE (ANDROID)
98+
SET (DEFAULT_WITH_TOUCH FALSE)
99+
ENDIF (ANDROID)
100+
#Add a touch mode if Qt has Qt Gestures (starting from 4.6)
101+
IF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
102+
SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
103+
ELSE ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
104+
SET (WITH_TOUCH FALSE)
105+
ENDIF ( (QT_VERSION_MAJOR EQUAL 4 AND QT_VERSION_MINOR GREATER 5) OR QT_VERSION_MAJOR GREATER 4 )
106+
IF (WITH_TOUCH)
107+
ADD_DEFINITIONS(-DHAVE_TOUCH)
108+
MESSAGE (STATUS "Touch support enabled")
109+
ELSE (WITH_TOUCH)
110+
MESSAGE (STATUS "Touch support disabled")
111+
ENDIF (WITH_TOUCH)
112+
113+
95114
SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
96115
IF (WITH_GLOBE)
97116
SET(QT_USE_QTOPENGL 1)
@@ -472,9 +491,7 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/gui)
472491

473492
#############################################################
474493
# create qgsversion.h
475-
476494
FIND_FILE(GIT_MARKER index PATHS ${CMAKE_SOURCE_DIR}/.git)
477-
478495
IF (GIT_MARKER)
479496
FIND_PROGRAM(GIT git PATHS c:/cygwin/bin)
480497
IF(GIT)

0 commit comments

Comments
 (0)