Add ENABLE_MODELTEST cmake variable/define, default to false

CMakeLists.txt

@@ -294,6 +294,9 @@ ENDIF (WITH_TOUCH)
 # search for QScintilla2 (C++ lib)
 FIND_PACKAGE(QScintilla REQUIRED)
 
+# ModelTest
+SET(ENABLE_MODELTEST FALSE CACHE BOOL "Enable QT ModelTest (not for production)")
+
 IF (ENABLE_TESTS)
   SET( QT_USE_QTTEST  TRUE )
   ENABLE_TESTING()

cmake_templates/qgsconfig.h.in

@@ -58,5 +58,7 @@
 
 #cmakedefine HAVE_SERVER_PYTHON_PLUGINS
 
+#cmakedefine ENABLE_MODELTEST
+
 #endif
 

src/app/CMakeLists.txt

@@ -450,6 +450,10 @@ INCLUDE_DIRECTORIES(
   openstreetmap
   )
 
+IF(ENABLE_MODELTEST)
+  INCLUDE_DIRECTORIES(../../tests/qt_modeltest)
+ENDIF(ENABLE_MODELTEST)
+
 IF (ANDROID)
   INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
 ENDIF (ANDROID)

src/core/CMakeLists.txt

@@ -270,6 +270,21 @@ SET(QGIS_CORE_SRCS
   raster/qgshuesaturationfilter.cpp  
 )
 
+IF(ENABLE_MODELTEST)
+  SET(MODELTEST_SRCS
+    ../../tests/qt_modeltest/modeltest.cpp
+    ../../tests/qt_modeltest/dynamictreemodel.cpp
+  )
+  SET(MODELTEST_MOC_HDRS
+    ../../tests/qt_modeltest/modeltest.h
+    ../../tests/qt_modeltest/dynamictreemodel.h
+  )
+  QT4_WRAP_CPP(MODELTEST_MOC_SRCS ${MODELTEST_MOC_HDRS})
+  SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
+    ${MODELTEST_SRCS} ${MODELTEST_MOC_SRCS}
+  )
+ENDIF(ENABLE_MODELTEST)
+
 IF (NOT QT5_BUILD)
   SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
     qgshttptransaction.cpp
@@ -733,6 +748,10 @@ ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
 
 ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS})
 
+IF(ENABLE_MODELTEST)
+  TARGET_LINK_LIBRARIES(qgis_core ${QT_QTTEST_LIBRARY})
+ENDIF(ENABLE_MODELTEST)
+
 IF(NOT APPLE)
   INSTALL(FILES ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
 ELSE(NOT APPLE)