Graphic config: checkboxes for all graphics now gather current states

MapView add contrast property
MapView fix plugin

.clang-format

@@ -0,0 +1,224 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeComma
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     140
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: CurrentLine
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+  - piForeach
+  - piForeachC
+  - piForeachR
+  - piForeachRC
+  - piForeachCR
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentExternBlock: NoIndent
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: Wrapped
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Middle
+PPIndentWidth:   2
+ReferenceAlignment: Middle
+ReflowComments:  true
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Both
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: After
+Standard:        c++11
+StatementAttributeLikeMacros:
+  - Q_EMIT
+  - PIMETA
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+  - PRIVATE_DECLARATION
+  - NO_COPY_CLASS
+  - FOREVER_WAIT
+  - WAIT_FOREVER
+TabWidth:        4
+UseCRLF:         false
+UseTab:          AlignWithSpaces
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+  - PIMETA
+...
+

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{h,c,cpp}]
+charset = utf-8
+indent_style = tab
+tab_width = 4

CMakeLists.txt

@@ -1,12 +1,13 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
-project(qad)
+cmake_policy(SET CMP0072 NEW) #  FindOpenGL prefers GLVND by default
-set(qad_MAJOR    1)
+project(QAD)
-set(qad_MINOR    12)
+set(QAD_MAJOR    2)
-set(qad_REVISION 1)
+set(QAD_MINOR    32)
-set(qad_SUFFIX   )
+set(QAD_REVISION 2)
-set(qad_COMPANY  SHS)
+set(QAD_SUFFIX   )
-set(qad_DOMAIN   org.SHS)
+set(QAD_COMPANY  SHS)
+set(QAD_DOMAIN   org.SHS)
 
 if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
 	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -14,7 +15,7 @@ endif()
 
 include(SHSTKMacros)
 include(QtWraps)
-shstk_begin_project(qad QAD)
+shstk_begin_project(QAD)
 include(SHSTKQtMacros)
 
 shstk_qt_founded(QtVersions)
@@ -30,22 +31,23 @@ endif()
 
 option(UTILS "Build various utils" ${_plugins_default_})
 option(DESIGNER_PLUGINS "Build Qt designer plugins" ${_plugins_default_})
+option(HAS_GL "Build with OpenGL" ${_plugins_default_})
 
 macro(qad_library NAME _MODULES _LIBS)
-	shstk_qt_project(qad_${NAME} FALSE "qad" "${_MODULES}" "${_LIBS}" ${ARGN})
+	shstk_qad_project(qad_${NAME} FALSE "QAD" "${_MODULES}" "${_LIBS}" ${ARGN})
-	shstk_qt_install("qad" FALSE qad_${NAME} "${out_HDR}" "out_QM")
+	shstk_qad_install("qad" FALSE qad_${NAME} "${out_HDR}" "out_QM")
 endmacro()
 
 macro(qad_application NAME _MODULES _LIBS)
-	shstk_qt_project(${NAME} TRUE "qad" "${_MODULES}" "${_LIBS}" ${ARGN})
+	shstk_qad_project(${NAME} TRUE "QAD" "${_MODULES}" "${_LIBS}" ${ARGN})
-	shstk_qt_install("qad" TRUE ${NAME} "" "out_QM")
+	shstk_qad_install("qad" TRUE ${NAME} "" "out_QM")
 endmacro()
 
 macro(qad_plugin NAME _MODULES _LIBS)
-	shstk_qt_plugin(qad_${NAME} "${_MODULES}" "qad_${NAME};${_LIBS}")
+	shstk_qad_plugin(qad_${NAME} "${_MODULES}" "qad_${NAME};${_LIBS}")
 endmacro()
 
-shstk_install(qad FALSE "" "${qad_VERSION_FILE}")
+shstk_install(qad FALSE "" "${QAD_VERSION_FILE}")
 file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in")
 install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
 
@@ -56,9 +58,9 @@ endif()
 
 message("----------QAD----------")
 message(" Build for ${QtVersions}")
-message(" Version: ${qad_VERSION} ")
+message(" Version: ${QAD_VERSION} ")
-message(" Linkage: ${qad_LIB_TYPE_MSG}")
+message(" Linkage: ${QAD_LIB_TYPE_MSG}")
-message(" Type   : ${qad_BUILD_TYPE}")
+message(" Type   : ${QAD_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()

cmake/FindQAD.cmake

@@ -6,9 +6,12 @@ Create imported targets:
   * QAD::Application
   * QAD::Blockview
   * QAD::Graphic
+  * QAD::GraphicAnalysis
+  * QAD::Graphic3D
   * QAD::SQLTable
   * QAD::TouchWidgets
   * QAD::Doc
+  * QAD::VirtualKeyboard
   * QAD::PIQt
   * QAD::PIQtUtils
 
@@ -19,7 +22,7 @@ These targets include directories and dependencies
 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(NOT BUILDING_qad)
+if(NOT BUILDING_QAD)
 	find_package(PIP QUIET)
 	include(QtWraps)
 	include(SHSTKMacros)
@@ -27,40 +30,43 @@ endif()
 
 shstk_is_parent_exists(hasParent PARENT_DIRECTORY)
 
-shstk_set_find_dirs(qad)
+shstk_set_find_dirs(QAD)
-set(_SEARCH_DIR ${qad_LIBDIR})
 
-find_qt(Core QUIET)
+qad_find_qt(Core QUIET)
 if(NOT SOME_QT_FOUND)
-	message(WARNING "No qt found, please install qt")
+	message(WARNING "No Qt found, please install Qt")
 	set(QAD_FOUND OFF CACHE BOOL "")
 	return()
 endif()
 
-if (NOT BUILDING_qad)
+if (NOT BUILDING_QAD)
-	list(APPEND _SEARCH_DIR $ENV{SMSDK_DIR}/lib)
+	shstk_find_header(QAD "qad_version.h" ${QAD_INCDIR})
-	shstk_find_header(qad QAD "qad_version.h" "")
 endif()
 
 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;sql_table;touch_widgets;doc")
+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)
+if (PIP_FOUND OR BUILDING_PIP)
 	list(APPEND __libs "piqt;piqt_utils")
 endif()
 
-set(__module_utils          Utils        )
+set(__module_utils            Utils          )
-set(__module_widgets        Widgets      )
+set(__module_widgets          Widgets        )
-set(__module_application    Application  )
+set(__module_application      Application    )
-set(__module_blockview      Blockview    )
+set(__module_blockview        Blockview      )
-set(__module_graphic        Graphic      )
+set(__module_graphic          Graphic        )
-set(__module_sql_table      SQLTable     )
+set(__module_graphic_analysis GraphicAnalysis)
-set(__module_touch_widgets  TouchWidgets )
+set(__module_graphic3d        Graphic3D      )
-set(__module_doc            Doc          )
+set(__module_sql              SQL            )
-set(__module_piqt           PIQt         )
+set(__module_sql_table        SQLTable       )
-set(__module_piqt_utils     PIQtUtils    )
+set(__module_touch_widgets    TouchWidgets   )
+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} "")
@@ -68,20 +74,23 @@ foreach (_l ${__libs})
 	set(__libs_${_l} "")
 endforeach()
 
-set(__deps_widgets       "QAD::Utils")
+set(__deps_widgets          "QAD::Utils")
-set(__deps_application   "QAD::Widgets")
+set(__deps_application      "QAD::Widgets")
-set(__deps_blockview     "QAD::Widgets")
+set(__deps_blockview        "QAD::Widgets")
-set(__deps_graphic       "QAD::Widgets")
+set(__deps_graphic          "QAD::Widgets")
-set(__deps_sql_table     "QAD::Widgets")
+set(__deps_graphic_analysis "QAD::Graphic;PIP::FFTW")
-set(__deps_piqt          "QAD::Widgets;PIP")
+set(__deps_sql_table        "QAD::Widgets")
-set(__deps_piqt_utils    "QAD::Blockview;QAD::PIQt")
+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}")
+#message("find QAD ${BUILDING_QAD}")
 
-if (BUILDING_qad)
+if (BUILDING_QAD)
 
-	if (NOT SET_TARGETS_qad)
+	if (NOT SET_TARGETS_QAD)
-		set(SET_TARGETS_qad ON CACHE BOOL "")
+		set(SET_TARGETS_QAD ON CACHE BOOL "")
 		#message("create aliases")
 		foreach(_l ${__libs})
 			foreach(_v ${_QT_VERSIONS_})
@@ -104,7 +113,7 @@ else()
 	foreach(_l ${__libs})
 		foreach(_v ${_QT_VERSIONS_})
 			set(_m ${__module_${_l}})
-			find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${_SEARCH_DIR})
+			find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${QAD_LIBDIR})
 			#message("found ${_l}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
 			if((NOT TARGET QAD::${_m}${_v}) AND QAD_LIBRARY_${_l}${_v})
 				#message("imported QAD::${_m}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
@@ -120,7 +129,7 @@ else()
 				endforeach()
 				set_target_properties(QAD::${_m}${_v} PROPERTIES
 					IMPORTED_LOCATION "${QAD_LIBRARY_${_l}${_v}}"
-					INTERFACE_INCLUDE_DIRECTORIES "${qad_INCLUDES}"
+					INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}"
 					INTERFACE_LINK_LIBRARIES "${_deps}")
 			endif()
 		endforeach()

cmake/QtWraps.cmake

@@ -1,19 +1,19 @@
 #[[
 
-find_qt([<Module1> <Module2> ...] [Qt4] [Qt5])
+qad_find_qt([<Module1> <Module2> ...] [Qt4] [Qt5] [Qt6])
 
-Find Qt4 or/and Qt5 packages
+Find Qt4 or/and Qt5, Qt6 packages
-If Qt4/5 found, set
+If Qt4/5/6 found, set
-* Qt<4/5>_ROOT        var to Qt root dir
+* Qt<4/5/6>_ROOT        var to Qt root dir
-* Qt<4/5>_BIN         var to Qt binary dir
+* Qt<4/5/6>_BIN         var to Qt binary dir
-* Qt<4/5>_PLUGINS_DIR var to Qt plugins dir
+* Qt<4/5/6>_PLUGINS_DIR var to Qt plugins dir
-* Qt<4/5>_LANG_DIR    var to Qt translations dir
+* Qt<4/5/6>_LANG_DIR    var to Qt translations dir
 Also set variable SOME_QT_FOUND
 
 
 
 
-qt_sources(<src_out_var> [NO_DEFAULT] [DIR <dir>] [<regexp> ...])
+qad_sources(<src_out_var> [NO_DEFAULT] [DIR <dir>] [<regexp> ...])
 
 Collect all sources, optionally in directory <dir> and
 Additional filters <regexp>. By default filter files with regexps
@@ -23,34 +23,34 @@ Default filters disabled with option NO_DEFAULT
 
 
 
-qt_wrap(<file0> <file1> ... [HDRS <hrd_var>] [CPPS <cpp_var>] [QMS <qm_var>])
+qad_wrap(<file0> <file1> ... [HDRS <hrd_var>] [CPPS <cpp_var>] [QMS <qm_var>])
 
 Prepare sources for compile
-Store headers to <hrd_var>, all wrapped Qt4 files to <cpp_var>_Qt4 and Qt5 files to <cpp_var>_Qt5
+Store headers to <hrd_var>, all wrapped Qt4 files to <cpp_var>_Qt4, Qt5 files to <cpp_var>_Qt5 and Qt6 files to <cpp_var>_Qt6
-version are automatic detected after find_qt() call
+version are automatic detected after qad_find_qt() call
 
 
 
 
-qt_add_executable(<name> [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL] source1 [source2 ...])
+qad_add_executable(<name> [WIN32] [MACOSX_BUNDLE] [EXCLUDE_FROM_ALL] source1 [source2 ...])
 
 Add executables for founded Qt versions, target names is <name><TARGET_SUFFIX_Qt?>
 All needed Qt includes automatic added to corresponding targets
-<source> cant be CPPS variable passed to qt_wrap() or some list or filename
+<source> cant be CPPS variable passed to qad_wrap() or some list or filename
 
 
 
 
-qt_add_library(<name> [STATIC | SHARED | MODULE] [EXCLUDE_FROM_ALL] source1 [source2 ...])
+qad_add_library(<name> [STATIC | SHARED | MODULE] [EXCLUDE_FROM_ALL] source1 [source2 ...])
 
 Add library for founded Qt versions, target names is <name><TARGET_SUFFIX_Qt?>
 All needed Qt includes automatic added to corresponding targets
-<source> cant be CPPS variable passed to qt_wrap() or some list or filename
+<source> cant be CPPS variable passed to qad_wrap() or some list or filename
 
 
 
 
-qt_target_link_libraries(<name> ... <item> ...)
+qad_target_link_libraries(<name> ... <item> ...)
 
 Link targets for founded Qt versions, target names is <name><TARGET_SUFFIX_Qt?>
 All needed Qt libraries automatic added to corresponding targets
@@ -60,7 +60,7 @@ add <MULTILIB_SUFFIX_Qt?> or individual <MULTILIB_>libname<_SUFFIX_Qt?>
 
 
 
-qt_target_compile_definitions(<name> ...)
+qad_target_compile_definitions(<name> ...)
 
 Syntax similar to original "target_compile_definitions()"
 Specify compile definitions to use when compiling a given <name>
@@ -68,7 +68,7 @@ Specify compile definitions to use when compiling a given <name>
 
 
 
-qt_target_include_directories(<name> ...)
+qad_target_include_directories(<name> ...)
 
 Syntax similar to original "target_include_directories()"
 Add include directories to a target
@@ -76,7 +76,7 @@ Add include directories to a target
 
 
 
-qt_install(...)
+qad_install(...)
 
 Syntax similar to original "install()"
 Install targets for founded Qt versions
@@ -90,12 +90,12 @@ to corresponding Qt plugins directory
 
 Add LANG type for first argument - in this case you should
 specify variable name, not variable value!
-e.g. "qt_install(LANG my_QM DESTINATION QtLang)"
+e.g. "qad_install(LANG my_QM DESTINATION QtLang)"
 
 
 
 
-qt_install_lang(<name> DESTINATION <dir> [PATHS <path0> [<path1>] [...] ])
+qad_install_lang(<name> DESTINATION <dir> [PATHS <path0> [<path1>] [...] ])
 
 Search Qt translations for all <name> dependencies
 in Qt<?>_LANG_DIR for <name>_LANG languages
@@ -105,23 +105,23 @@ You should use "set_lang()" macro before this action
 
 
 
-qt_get_target(<name> <var> [Qt4 | Qt5])
+qad_get_target(<name> <var> [Qt4 | Qt5 | Qt6])
 
 Write real <name> Qt target name to <var>
-If Qt4 or Qt5 specified, search for this version,
+If Qt4 or Qt5, Qt6 specified, search for this version,
 otherwise returns greatest version
 
 
 
 
-qt_get_targets(<name> <var>)
+qad_get_targets(<name> <var>)
 
 Write all real <name> Qt target names to <var>
 
 
 
 
-qt_generate_export_header(<name> ...)
+qad_generate_export_header(<name> ...)
 
 Call generate_export_header on Qt multitarget
 
@@ -135,12 +135,53 @@ 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
+	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;\
+Script;ScriptTools;Sql;Svg;Test;UiTools;UiToolsd;WebKit;Xml;XmlPatterns")
 
-set(_QT_VERSIONS_ 4 5)
+set(__qt_modules_5 "3DAnimation;3DCore;3DExtras;3DInput;3DLogic;3DQuick;3DQuickAnimation;\
+3DQuickExtras;3DQuickInput;3DQuickRender;3DQuickScene2D;3DRender;AccessibilitySupport;\
+AttributionsScannerTools;AxBase;AxContainer;AxServer;Bluetooth;Bootstrap;Concurrent;\
+Core;DataVisualization;DBus;Designer;DesignerComponents;DeviceDiscoverySupport;DocTools;EdidSupport;\
+EglSupport;EventDispatcherSupport;FbSupport;FontDatabaseSupport;Gamepad;Gui;Help;\
+LinguistTools;Location;Multimedia;MultimediaQuick;MultimediaWidgets;Network;NetworkAuth;\
+Nfc;OpenGL;OpenGLExtensions;PacketProtocol;PlatformCompositorSupport;Positioning;\
+PositioningQuick;PrintSupport;Qml;QmlDebug;QmlDevTools;QmlImportScanner;QmlModels;\
+QmlWorkerScript;Quick;QuickCompiler;QuickControls2;QuickParticles;QuickShapes;QuickTemplates2;\
+QuickTest;QuickWidgets;RemoteObjects;RepParser;Scxml;Sensors;SerialBus;SerialPort;\
+Sql;Svg;Test;TextToSpeech;ThemeSupport;UiPlugin;UiTools;VulkanSupport;WebChannel;WebSockets;\
+Widgets;WindowsUIAutomationSupport;WinExtras;Xml;XmlPatterns;Zlib;Charts;AndroidExtras")
+
+set(__qt_modules_6 "3DAnimation;3DCore;3DExtras;3DInput;3DLogic;3DQuick;3DQuickAnimation;3DQuickExtras;\
+3DQuickInput;3DQuickRender;3DQuickScene2D;3DRender;ActiveQt;AxBasePrivate;AxContainer;\
+AxContainerTools;AxServer;AxServerTools;Bluetooth;BodymovinPrivate;BuildInternals;\
+Bundled_Clip2Tri;BundledFreetype;BundledLibpng;BundledOpenwnn;BundledPinyin;BundledTcime;\
+Charts;ChartsQml;Coap;Concurrent;Core;Core5Compat;CoreTools;DataVisualization;DBus;\
+DBusTools;Designer;DesignerComponentsPrivate;DeviceDiscoverySupportPrivate;EntryPointPrivate;\
+FbSupportPrivate;Gui;GuiTools;Help;HostInfo;LabsAnimation;LabsFolderListModel;LabsQmlModels;\
+LabsSettings;LabsSharedImage;LabsWavefrontMesh;Linguist;LinguistTools;Mqtt;\
+Multimedia;MultimediaQuickPrivate;MultimediaWidgets;Network;NetworkAuth;Nfc;OpcUa;\
+OpenGL;OpenGLWidgets;PacketProtocolPrivate;Positioning;PositioningQuick;PrintSupport;\
+Qml;QmlCompilerPrivate;QmlCore;QmlDebugPrivate;QmlDevToolsPrivate;QmlDomPrivate;QmlImportScanner;\
+QmlLocalStorage;QmlModels;QmlTools;QmlWorkerScript;QmlXmlListModel;Quick;Quick3D;\
+Quick3DAssetImport;Quick3DAssetUtils;Quick3DEffects;Quick3DHelpers;Quick3DIblBaker;Quick3DParticles;\
+Quick3DRuntimeRender;Quick3DTools;Quick3DUtils;QuickControls2;QuickControls2Impl;\
+QuickControlsTestUtilsPrivate;QuickDialogs2;QuickDialogs2QuickImpl;QuickDialogs2Utils;QuickLayouts;\
+QuickParticlesPrivate;QuickShapesPrivate;QuickTemplates2;QuickTest;QuickTestUtilsPrivate;\
+QuickTimeline;QuickWidgets;RemoteObjects;RemoteObjectsQml;RemoteObjectsTools;RepParser;\
+Scxml;ScxmlQml;ScxmlTools;Sensors;SensorsQuick;SerialBus;SerialBusTools;SerialPort;\
+ShaderTools;ShaderToolsTools;Sql;StateMachine;StateMachineQml;Svg;SvgWidgets;Test;Tools;\
+ToolsTools;UiPlugin;UiTools;VirtualKeyboard;WebChannel;WebSockets;WebView;WebViewQuick;\
+Widgets;WidgetsTools;Xml;AndroidExtras")
+
+
+set(_QT_VERSIONS_ 4 5 6)
 foreach(_v ${_QT_VERSIONS_})
 	if (NOT DEFINED TARGET_SUFFIX_Qt${_v})
 		set(TARGET_SUFFIX_Qt${_v} "${_v}")
@@ -154,7 +195,7 @@ endif()
 #set(TARGET_SUFFIX_Qt4 "")
 
 
-macro(find_qt)
+macro(qad_find_qt)
 	set(_QCOMP)
 	foreach(_v ${_QT_VERSIONS_})
 		set(_NEED${_v} 0)
@@ -185,7 +226,9 @@ macro(find_qt)
 			endif()
 		endforeach()
 		if (NOT _FOUND_NEED)
-			list(APPEND _QCOMP "${_i}")
+			if (NOT "x${_i}" STREQUAL "xQUIET")
+				list(APPEND _QCOMP "${_i}")
+			endif()
 		endif()
 	endforeach()
 	if (NOT _NEED_SOME)
@@ -201,10 +244,12 @@ macro(find_qt)
 			get_filename_component(Qt4_BIN ${QT_QMAKE_EXECUTABLE} PATH)
 			set(Qt4_INCLUDES ${QT_INCLUDES})
 			foreach(m ${_QCOMP})
-				string(TOUPPER "${m}" _um)
+				if (m IN_LIST __qt_modules_4)
-				#message("${QT_QT${_um}_FOUND}")
+					string(TOUPPER "${m}" _um)
-				if (${QT_QT${_um}_FOUND})
+					#message("${QT_QT${_um}_FOUND}")
-					list(APPEND Qt4_LIBRARIES ${QT_QT${_um}_LIBRARY})
+					if (${QT_QT${_um}_FOUND})
+						list(APPEND Qt4_LIBRARIES ${QT_QT${_um}_LIBRARY})
+					endif()
 				endif()
 			endforeach()
 			set(Qt4_PLUGINS_DIR ${QT_PLUGINS_DIR} CACHE STRING "")
@@ -217,27 +262,35 @@ macro(find_qt)
 		#if (Qt5_FOUND)
 		#	set(_MSG 0)
 		#endif()
-		find_package(Qt5 COMPONENTS Core LinguistTools UiPlugin Widgets ${_QCOMP} QUIET)
+		set(_QCOMP5 Core LinguistTools UiPlugin Widgets ${_QCOMP})
+		list(REMOVE_DUPLICATES _QCOMP5)
+		find_package(Qt5 COMPONENTS ${_QCOMP5} QUIET)
 		if (DEFINED ANDROID_PLATFORM)
 			set(CMAKE_SHARED_MODULE_SUFFIX_CXX ".so")
 			set(CMAKE_SHARED_LIBRARY_SUFFIX_CXX ".so")
 			set(CMAKE_SHARED_MODULE_SUFFIX_C ".so")
 			set(CMAKE_SHARED_LIBRARY_SUFFIX_C ".so")
 		endif()
-		if (Qt5_FOUND)
+		if (Qt5Core_FOUND)
 			set(LOCAL_FOUND5 1)
 			set(_Qt5Modules)
-			foreach(m ${_QCOMP})
+			foreach(m ${_QCOMP5})
-				if (${Qt5${m}_FOUND})
+				if (m IN_LIST __qt_modules_5)
-					set(__lib ${Qt5${m}_LIBRARIES})
+					if (${Qt5${m}_FOUND})
-					if (DEFINED ANDROID_PLATFORM)
+						set(__lib ${Qt5${m}_LIBRARIES})
-						if (m IN_LIST __qt_bug_modules)
+						#if (DEFINED ANDROID_PLATFORM)
-							get_target_property(__lib Qt5::${m} LOCATION)
+							if (m IN_LIST __qt_bug_modules)
+								get_target_property(__lib Qt5::${m} LOCATION)
+							endif()
+						#endif()
+						list(APPEND _Qt5Modules ${m})
+						list(APPEND Qt5_INCLUDES ${Qt5${m}_INCLUDE_DIRS})
+						list(APPEND Qt5_LIBRARIES ${__lib})
+					else()
+						if (NOT "x${_QUIET}" STREQUAL "xQUIET")
+							message(FATAL_ERROR "Qt5${m} NOT FOUND")
 						endif()
 					endif()
-					list(APPEND _Qt5Modules ${m})
-					list(APPEND Qt5_INCLUDES ${Qt5${m}_INCLUDE_DIRS})
-					list(APPEND Qt5_LIBRARIES ${__lib})
 				endif()
 			endforeach()
 			#get_property(_up_dir TARGET Qt5::UiPlugin PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
@@ -269,7 +322,76 @@ macro(find_qt)
 			if (NOT _QT5_MSG)
 				message(STATUS "Found Qt5: ${_Qt5_qmake} (version \"${Qt5_VERSION}\")")
 				set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE)
-				#message(STATUS "Found Qt5 modules: ${_Qt5Modules}")
+				message(STATUS "Found Qt5 modules: ${_Qt5Modules}")
+			endif()
+		endif()
+	endif()
+	if (_NEED6)
+		#set(_MSG 1)
+		#if (Qt6_FOUND)
+		#	set(_MSG 0)
+		#endif()
+		set(_QCOMP6 Core LinguistTools UiPlugin Widgets ${_QCOMP})
+		list(REMOVE_DUPLICATES _QCOMP6)
+		find_package(Qt6 COMPONENTS ${_QCOMP6} QUIET)
+		if (DEFINED ANDROID_PLATFORM)
+			set(CMAKE_SHARED_MODULE_SUFFIX_CXX ".so")
+			set(CMAKE_SHARED_LIBRARY_SUFFIX_CXX ".so")
+			set(CMAKE_SHARED_MODULE_SUFFIX_C ".so")
+			set(CMAKE_SHARED_LIBRARY_SUFFIX_C ".so")
+		endif()
+		if (Qt6Core_FOUND)
+			set(LOCAL_FOUND6 1)
+			set(_Qt6Modules)
+			foreach(m ${_QCOMP6})
+				if (m IN_LIST __qt_modules_6)
+					if (${Qt6${m}_FOUND})
+						set(__lib ${Qt6${m}_LIBRARIES})
+						if (DEFINED ANDROID_PLATFORM)
+							if (m IN_LIST __qt_bug_modules)
+								get_target_property(__lib Qt6::${m} LOCATION)
+							endif()
+						endif()
+						list(APPEND _Qt6Modules ${m})
+						list(APPEND Qt6_INCLUDES ${Qt6${m}_INCLUDE_DIRS})
+						list(APPEND Qt6_LIBRARIES ${__lib})
+					else()
+						if (NOT "x${_QUIET}" STREQUAL "xQUIET")
+							message(FATAL_ERROR "Qt6${m} NOT FOUND")
+						endif()
+					endif()
+				endif()
+			endforeach()
+			#get_property(_up_dir TARGET Qt6::UiPlugin PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+			#message("${_up_dir}")
+			#if (NOT "x${_up_dir}" STREQUAL "x")
+			#	list(APPEND Qt6_INCLUDES ${_up_dir})
+			#endif()
+			get_target_property(_Qt6_qmake Qt6::qmake LOCATION)
+			get_filename_component(_Qt6_BIN ${_Qt6_qmake} PATH)
+			foreach(_p ${Qt6Gui_PLUGINS})
+				get_target_property(_l ${_p} LOCATION)
+				get_filename_component(_l ${_l} DIRECTORY)
+				string(FIND "${_l}" "/" _ind REVERSE)
+				string(SUBSTRING "${_l}" 0 ${_ind} _l)
+				#message("Qt6: plugins dir: ${Qt6_PLUGINS_DIR}")
+				break()
+			endforeach()
+			string(FIND "${_Qt6_BIN}" "/" _ind REVERSE)
+			string(SUBSTRING "${_Qt6_BIN}" 0 ${_ind} _Qt6_ROOT)
+			set(Qt6_ROOT "${_Qt6_ROOT}" CACHE STRING "")
+			set(Qt6_BIN  "${_Qt6_BIN}"  CACHE STRING "")
+			set(Qt6_LANG_DIR ${Qt6_BIN}/../translations CACHE STRING "")
+			if ("x${Qt6_PLUGINS_DIR}" STREQUAL "x")
+				set(Qt6_PLUGINS_DIR "${Qt6_ROOT}/plugins" CACHE STRING "")
+			endif()
+			if (APPLE)
+				list(APPEND MOC_INC_Qt6 "-F${Qt6_ROOT}/lib")
+			endif()
+			if (NOT _QT6_MSG)
+				message(STATUS "Found Qt6: ${_Qt6_qmake} (version \"${Qt6_VERSION}\")")
+				set(_QT6_MSG 1 CACHE BOOL "msg_qt6" FORCE)
+				message(STATUS "Found Qt6 modules: ${_Qt6Modules}")
 			endif()
 		endif()
 	endif()
@@ -287,7 +409,7 @@ macro(find_qt)
 endmacro()
 
 
-macro(qt_sources OUT)
+macro(qad_sources OUT)
 	set(${OUT})
 	set(_DIR "")
 	set(_IS_DIR 0)
@@ -323,7 +445,7 @@ macro(qt_sources OUT)
 endmacro()
 
 
-macro(qt_wrap)
+macro(qad_wrap)
 	set(HDR_VAR)
 	set(CPP_VAR)
 	set(QM_VAR)
@@ -384,24 +506,24 @@ macro(qt_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()
@@ -437,8 +559,16 @@ macro(qt_wrap)
 					set(${QM${_v}_VAR} "")
 					qt5_add_translation(${QM${_v}_VAR} ${TS_LIST})
 				endif()
+			elseif (${_v} EQUAL 6)
+				qt6_wrap_cpp(MOCS${_v} ${H_LIST} OPTIONS -nw ${MOC_INC_Qt6})
+				qt6_wrap_ui(CUIS${_v} ${UI_LIST})
+				qt6_add_resources(CRES${_v} ${RES_LIST})
+				if (WAS_QM_ARG)
+					set(${QM${_v}_VAR} "")
+					qt6_add_translation(${QM${_v}_VAR} ${TS_LIST})
+				endif()
 			else()
-				# Qt6 ...
+				# Qt7 ...
 			endif()
 			#message("${${QM${_v}_VAR}}")
 			list(APPEND ${CPP${_v}_VAR} ${CPP_LIST})
@@ -486,7 +616,8 @@ macro(__qt_set_defines _NAME _T)
 endmacro()
 
 
-macro(qt_add_executable _NAME)
+macro(qad_add_executable _NAME)
+	#message("*qad_add_executable: \"${_NAME}\"")
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
 			_qt_split_add_args(_PREF _ARGS ${ARGN})
@@ -503,6 +634,7 @@ macro(qt_add_executable _NAME)
 			set(_${_NAME}_is_qt 1)
 			target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
 			__qt_set_defines(${_NAME} ${_TARGET})
+			#message("add exe: \"${_TARGET}\"")
 
 			if(APPLE)
 				set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}")
@@ -525,7 +657,8 @@ macro(qt_add_executable _NAME)
 endmacro()
 
 
-macro(qt_add_library _NAME)
+macro(qad_add_library _NAME)
+	#message("*qad_add_library: \"${_NAME}\"")
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
 			_qt_split_add_args(_PREF _ARGS ${ARGN})
@@ -539,6 +672,7 @@ macro(qt_add_library _NAME)
 			endif()
 			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
 			add_library(${_TARGET} ${_PREF} ${_ARGS})
+			#message("add lib: \"${_TARGET} ${_PREF}\"")
 			set(_${_NAME}_is_qt 1)
 			target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/qt${_v})
 			target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${Qt${_v}_INCLUDES})
@@ -576,7 +710,7 @@ macro(_qt_multitarget_suffix_ _OUT _IN _v)
 endmacro()
 
 
-macro(qt_target_link_libraries _NAME)
+macro(qad_target_link_libraries _NAME)
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
 			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
@@ -592,14 +726,14 @@ macro(qt_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()
 endmacro()
 
 
-macro(qt_target_compile_definitions _NAME)
+macro(qad_target_compile_definitions _NAME)
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
 			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
@@ -609,7 +743,7 @@ macro(qt_target_compile_definitions _NAME)
 endmacro()
 
 
-macro(qt_target_include_directories _NAME)
+macro(qad_target_include_directories _NAME)
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
 			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
@@ -619,7 +753,7 @@ macro(qt_target_include_directories _NAME)
 endmacro()
 
 
-macro(qt_install)
+macro(qad_install)
 	set(_prev_inst)
 	set(__add_args)
 	#message("command: ${ARGN}")
@@ -737,7 +871,7 @@ macro(_qt_gather_deps _T _out __p)
 endmacro()
 
 
-macro(qt_install_lang _NAME)
+macro(qad_install_lang _NAME)
 	set(_prev_inst)
 	#message("command: ${ARGN}")
 	set(_PATHS)
@@ -792,6 +926,18 @@ macro(qt_install_lang _NAME)
 						string(SUBSTRING "${_libname}" 0 ${_sl} _libname)
 						string(REPLACE "::" "_" _libname "${_libname}")
 						string(TOLOWER "${_libname}" _libname )
+						if ("${_libname}" STREQUAL "qad_piqtutils")
+							set(_libname "qad_piqt_utils")
+						endif()
+						if ("${_libname}" STREQUAL "qad_sqltable")
+							set(_libname "qad_sql_table")
+						endif()
+						if ("${_libname}" STREQUAL "qad_touchwidgets")
+							set(_libname "qad_touch_widgets")
+						endif()
+						if ("${_libname}" STREQUAL "qad_graphicanalysis")
+							set(_libname "qad_graphic_analysis")
+						endif()
 						#message("imp lib \"${_libname}\"")
 						list(APPEND _qt_libs ${_libname})
 					endif()
@@ -801,6 +947,7 @@ macro(qt_install_lang _NAME)
 				list(APPEND _qt_libs "qtbase")
 				foreach (_i ${${PROJECT_NAME}_LANG})
 					foreach (_l ${_qt_libs})
+						#message("lib = \"${_l}\"")
 						unset(_qm_path CACHE)
 						find_file(_qm_path "${_l}_${_i}.qm" PATHS "${Qt${_v}_LANG_DIR}" ${_PATHS} NO_DEFAULT_PATH)
 						if (EXISTS "${_qm_path}")
@@ -815,7 +962,7 @@ macro(qt_install_lang _NAME)
 endmacro()
 
 
-macro(qt_get_target _NAME _OUT)
+macro(qad_get_target _NAME _OUT)
 	set(${_OUT})
 	set(_ver)
 	foreach(_i ${ARGN})
@@ -837,7 +984,7 @@ macro(qt_get_target _NAME _OUT)
 endmacro()
 
 
-macro(qt_get_targets _NAME _OUT)
+macro(qad_get_targets _NAME _OUT)
 	set(${_OUT})
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
@@ -847,9 +994,9 @@ macro(qt_get_targets _NAME _OUT)
 endmacro()
 
 
-macro(qt_generate_export_header _NAME)
+macro(qad_generate_export_header _NAME)
-	qt_get_target(${_NAME} _some_target)
+	qad_get_target(${_NAME} _some_target)
-	qt_get_target(${_NAME} _targets)
+	qad_get_target(${_NAME} _targets)
 	foreach(_t ${_targets})
 		set_target_properties(${_t} PROPERTIES DEFINE_SYMBOL ${_NAME}_EXPORTS)
 	endforeach()