15 years ago · 2122cde787
parent b0ab2ef16d
commit 2122cde787
1 changed files with 11 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -516,14 +516,20 @@ if (WITH_QT)
    find_package(Qt4)
    if (QT4_FOUND)
        set(HAVE_QT 1)
+        find_package (OpenGL QUIET)
+        #Qt 4.6 is the minimum for OpenGL
+        if (QT_QTOPENGL_FOUND AND OPENGL_FOUND AND QT_VERSION_MINOR GREATER 5)
+			set(HAVE_QT_OPENGL 1)
+			add_definitions(-DHAVE_QT_OPENGL)
+        endif()
        #add_definitions(-DHAVE_QT)
        set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT")
        
-        #find_package (OpenGL QUIET)
-        #if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
-		#	set(HAVE_QT_OPENGL 1)
-		#	add_definitions(-DHAVE_QT_OPENGL)
-        #endif()
+        find_package (OpenGL QUIET)
+        if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+			set(HAVE_QT_OPENGL 1)
+			add_definitions(-DHAVE_QT_OPENGL)
+        endif()
    endif()
 endif()