version 2.32.3

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy(SET CMP0072 NEW) #  FindOpenGL prefers GLVND by default
 project(QAD)
 set(QAD_MAJOR    2)
 set(QAD_MINOR    32)
-set(QAD_REVISION 2)
+set(QAD_REVISION 3)
 set(QAD_SUFFIX   )
 set(QAD_COMPANY  SHS)
 set(QAD_DOMAIN   org.SHS)

libs/graphic3d/CMakeLists.txt

@@ -1,4 +1,16 @@
 if (HAS_GL)
-	qad_library(graphic3d "Gui;Widgets;DataVisualization" "")
+	set(HAS_QtDataVisualization ON)
+	foreach(_v ${_QT_VERSIONS_})
+		if (Qt${_v}Core_FOUND)
+			find_package(Qt${_v} COMPONENTS DataVisualization QUIET)
+			if (NOT Qt${_v}DataVisualization_FOUND)
+				message(STATUS "Qt${_v} DataVisualization NOT FOUND -> skip build QAD::graphic3d")
+				set(HAS_QtDataVisualization OFF)
+			endif()
+		endif()
+	endforeach()
+	if (HAS_QtDataVisualization)
+		qad_library(graphic3d "Gui;Widgets;DataVisualization" "")
+	endif()
 endif()
 

libs/sql/sql_query.h

@@ -26,6 +26,7 @@
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QVariant>
+#include <functional>
 
 
 namespace QAD {

libs/utils/qad_types.h

@@ -347,10 +347,13 @@ T qDeserialize(const QByteArray & data, int version = -1) {
 /// qCallQueued(this, &MyClass::myFuncWithIntAndString, 0xAB, "string");
 template<typename O, typename F, typename... Args>
 void qCallQueued(O * o, F f, Args... args) {
-	QMetaObject::invokeMethod(
-		o,
-		[o, f, args...]() { (o->*f)(args...); },
-		Qt::QueuedConnection);
+	QMetaObject::invokeMethod(o, [o, f, args...]() { (o->*f)(args...); }, Qt::QueuedConnection);
+}
+
+/// qCallQueued with lambda
+template<typename O, typename L>
+void qCallQueuedL(O * o, L func) {
+	QMetaObject::invokeMethod(o, [func] { func(); }, Qt::QueuedConnection);
 }