git-svn-id: svn://db.shs.com.ru/libs@942 a8b55f48-bf90-11e4-a774-851b48703e85

qad/cmake/QtWraps.cmake

@@ -104,9 +104,13 @@
 
 cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
 cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows
+if (POLICY CMP0057)
+	cmake_policy(SET CMP0057 NEW) # Support if() IN_LIST
+endif()
 if (POLICY CMP0074)
 	cmake_policy(SET CMP0074 OLD) # ignore <PackageName>_ROOT variables
 endif()
+set(__qt_bug_modules "UiTools")
 
 
 set(_QT_VERSIONS_ 4 5)
@@ -195,9 +199,13 @@ macro(find_qt)
 			set(_Qt5Modules)
 			foreach(m ${_QCOMP})
 				if (${Qt5${m}_FOUND})
+					set(__lib ${Qt5${m}_LIBRARIES})
+					if (m IN_LIST __qt_bug_modules)
+						get_target_property(__lib Qt5::${m} LOCATION)
+					endif()
 					list(APPEND _Qt5Modules ${m})
 					list(APPEND Qt5_INCLUDES ${Qt5${m}_INCLUDE_DIRS})
-					list(APPEND Qt5_LIBRARIES ${Qt5${m}_LIBRARIES})
+					list(APPEND Qt5_LIBRARIES ${__lib})
 				endif()
 			endforeach()
 			#get_property(_up_dir TARGET Qt5::UiPlugin PROPERTY INTERFACE_INCLUDE_DIRECTORIES)

qad/graphic/graphic.cpp

@@ -11,7 +11,7 @@
 #  include <QPinchGesture>
 #endif
 #ifndef Q_OS_ANDROID
-#  define HAS_GL
+//#  define HAS_GL
 #endif
 #ifdef HAS_GL
 #  ifndef GL_MULTISAMPLE