some fixes

MapView add contrast property
MapView fix plugin

.clang-format

@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto

CMakeLists.txt

@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 cmake_policy(SET CMP0072 NEW) #  FindOpenGL prefers GLVND by default
 project(QAD)
 set(QAD_MAJOR    2)
-set(QAD_MINOR    21)
-set(QAD_REVISION 1)
+set(QAD_MINOR    32)
+set(QAD_REVISION 2)
 set(QAD_SUFFIX   )
 set(QAD_COMPANY  SHS)
 set(QAD_DOMAIN   org.SHS)

cmake/FindQAD.cmake

@@ -11,6 +11,7 @@ Create imported targets:
   * QAD::SQLTable
   * QAD::TouchWidgets
   * QAD::Doc
+  * QAD::VirtualKeyboard
   * QAD::PIQt
   * QAD::PIQtUtils
 
@@ -46,7 +47,7 @@ if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION)
 	message(FATAL_ERROR "QAD version ${QAD_VERSION} is available, but ${QAD_FIND_VERSION} requested!")
 endif()
 
-set(__libs "utils;widgets;application;blockview;graphic;graphic_analysis;graphic3d;sql;sql_table;touch_widgets;doc;map")
+set(__libs "utils;widgets;application;blockview;graphic;graphic_analysis;graphic3d;sql;sql_table;touch_widgets;doc;map;virtual_keyboard")
 if (PIP_FOUND OR BUILDING_PIP)
 	list(APPEND __libs "piqt;piqt_utils")
 endif()
@@ -65,6 +66,7 @@ set(__module_doc              Doc            )
 set(__module_map              Map            )
 set(__module_piqt             PIQt           )
 set(__module_piqt_utils       PIQtUtils      )
+set(__module_virtual_keyboard VirtualKeyboard)
 
 foreach (_l ${__libs})
 	set( __inc_${_l} "")
@@ -77,11 +79,11 @@ set(__deps_application      "QAD::Widgets")
 set(__deps_blockview        "QAD::Widgets")
 set(__deps_graphic          "QAD::Widgets")
 set(__deps_graphic_analysis "QAD::Graphic;PIP::FFTW")
-set(__deps_sql              "QAD::Utils")
 set(__deps_sql_table        "QAD::Widgets")
 set(__deps_map              "QAD::Utils;QAD::PIQt")
 set(__deps_piqt             "QAD::Widgets;PIP")
 set(__deps_piqt_utils       "QAD::Blockview;QAD::PIQt")
+set(__deps_virtual_keyboard "QAD::PIQt")
 
 #message("find QAD ${BUILDING_QAD}")
 

cmake/QtWraps.cmake

@@ -137,6 +137,9 @@ endif()
 if (POLICY CMP0074)
 	cmake_policy(SET CMP0074 NEW) # ignore <PackageName>_ROOT variables
 endif()
+if (POLICY CMP0177)
+	cmake_policy(SET CMP0177 OLD)
+endif()
 set(__qt_bug_modules "UiTools")
 
 set(__qt_modules_4 "CLucene;Core;Declarative;Gui;Help;main;Multimedia;Network;OpenGL;\
@@ -503,24 +506,24 @@ macro(qad_wrap)
 		get_filename_component(_EXT "${_i}" EXT)
 		#message("${_EXT}")
 		if (NOT ("x${_EXT}" STREQUAL "x"))
-			if (("x${_EXT}" STREQUAL "x.h") OR ("x${_EXT}" STREQUAL "x.hpp"))
+			if ("${_EXT}" MATCHES ".*\\.h(pp)?$")
 				list(APPEND H_LIST "${_i}")
 				#message("header")
 			endif()
-			if (("x${_EXT}" STREQUAL "x.c") OR ("x${_EXT}" STREQUAL "x.cpp") OR ("x${_EXT}" STREQUAL "x.cxx"))
+			if ("${_EXT}" MATCHES ".*\\.c((pp)|(xx))?$")
 				list(APPEND CPP_LIST "${_i}")
 				#message("source")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.ui")
+			if ("${_EXT}" MATCHES ".*\\.ui$")
 				list(APPEND UI_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.qrc")
+			if ("${_EXT}" MATCHES ".*\\.qrc$")
 				list(APPEND RES_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.rc")
+			if ("${_EXT}" MATCHES ".*\\.rc$")
 				list(APPEND RC_LIST "${_i}")
 			endif()
-			if ("x${_EXT}" STREQUAL "x.ts")
+			if ("${_EXT}" MATCHES ".*\\.ts$")
 				list(APPEND TS_LIST "${_i}")
 			endif()
 		endif()
@@ -723,7 +726,7 @@ macro(qad_target_link_libraries _NAME)
 					list(APPEND _ARGS ${_i})
 				endif()
 			endforeach()
-			target_link_libraries(${_TARGET} ${Qt${_v}_LIBRARIES} ${_ARGS})
+			target_link_libraries(${_TARGET} ${_ARGS} ${Qt${_v}_LIBRARIES})
 			#message("link ${_TARGET}: ${Qt${_v}_LIBRARIES} ${_ARGS}")
 		endif()
 	endforeach()