SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-10 19:55:52 +00:00
parent fe544edb8c
commit f1ffc4a8ab
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qad/cmake/QtWraps.cmake
View File

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

2
qad/graphic/graphic.cpp
View File

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