Release v4.2.3

commschamp · Nov 20, 2023 · aaa3c67 · aaa3c67
2 parents d56c237 + 2de87ce
commit aaa3c67
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -68,6 +68,6 @@ build_script:
         -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%;%QTDIR%" -DCMAKE_CXX_STANDARD=%CPP_STD% ^
         -DCC_TOOLS_QT_BUILD_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=%QT_MAJOR%
     - cmake --build . --config %CONFIGURATION% --target install
-    - echo -------------------------- Deploying Qt5 ---------------------------
+    - echo -------------------------- Deploying Qt ---------------------------
     - cmake --build . --config %CONFIGURATION% --target deploy_qt
 
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -19,7 +19,7 @@ if (WIN32 AND CC_TOOLS_QT_INSTALL_APPS)
         COMMAND ${CMAKE_COMMAND} 
             -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
             -DCC_BIN_DIR=${BIN_INSTALL_DIR} -DCC_PLUGIN_DIR=${PLUGIN_INSTALL_DIR}
-            -P ${PROJECT_SOURCE_DIR}/cmake/CC_DeployQt5Script.cmake
+            -P ${PROJECT_SOURCE_DIR}/cmake/CC_DeployQtScript.cmake
     )
 endif ()
 
diff --git a/cmake/CC_DeployQt5Script.cmake → cmake/CC_DeployQtScript.cmake b/cmake/CC_DeployQt5Script.cmake → cmake/CC_DeployQtScript.cmake
@@ -1,11 +1,11 @@
-# This script deploys Qt5 libraries on Windows.
+# This script deploys Qt libraries on Windows.
 # 
 # Expected input variables
 # CC_BIN_DIR - Directory where all binaries are installed
 # CC_PLUGIN_DIR - Directory where all plugins are installed
 
 if (NOT WIN32)
-    message (FATAL_ERROR "Qt5 deployment works only on Windows.")
+    message (FATAL_ERROR "Qt deployment works only on Windows.")
 endif ()
 
 if ("${CC_BIN_DIR}" STREQUAL "")

diff --git a/doxygen/main.dox b/doxygen/main.dox
@@ -30,7 +30,7 @@
 /// @b protocol for processing. 
 ///
 /// The @b cc_tools_qt shared library is implemented using
-/// <a href="http://doc.qt.io/qt-5/qt5-intro.html">QT5</a> framework using its
+/// <a href="http://doc.qt.io/qt-5/qt5-intro.html">Qt</a> framework using its
 /// signals/slots functionality and expects
 /// the main application to drive the event loop using 
 /// <a href="http://doc.qt.io/qt-5/qapplication.html">QApplication</a> object.

diff --git a/doxygen/page_filter_plugin.dox b/doxygen/page_filter_plugin.dox
@@ -21,7 +21,7 @@
 ///     ...
 /// };
 /// @endcode
-/// If filter implementation uses QT5 signals/slots infrastructure, it can use
+/// If filter implementation uses Qt signals/slots infrastructure, it can use
 /// multiple inheritance and extend @b QObject as well.
 /// @code
 /// class MyFilter : public QObject, public cc_tools_qt::Filter

diff --git a/doxygen/page_plugin.dox b/doxygen/page_plugin.dox
@@ -1,10 +1,10 @@
 /// @page page_plugin Defining a Plugin
 /// @tableofcontents
 /// This project uses
-/// <a href="http://doc.qt.io/qt-5/qtplugin.html">QT5 Infrastructure</a>
+/// <a href="http://doc.qt.io/qt-5/qtplugin.html">Qt Infrastructure</a>
 /// to define and load plugins. The custom plugin definition shared object needs
 /// to contain its own @b Plugin class that inherits from cc_tools_qt::Plugin and
-/// uses various QT5 macros to describe itself. As an example please take
+/// uses various Qt macros to describe itself. As an example please take
 /// a look at
 /// <a href="https://github.com/commschamp/cc_tools_qt/blob/master/plugin/echo_socket/EchoSocketPlugin.h">EchoSocketPlugin.h</a> 
 /// from this project.
@@ -63,7 +63,7 @@
 /// respective configurations. Such list as well as plugins' configurations are
 /// stored in single file as human readable 
 /// <a href="https://www.w3schools.com/js/js_json_objects.asp">json object</a>.
-/// The QT5 framework implements its own parsing and handling of such files. The
+/// The Qt framework implements its own parsing and handling of such files. The
 /// parsed json object is returned as 
 /// <a href="http://doc.qt.io/qt-5/qvariant.html#QVariantMap-typedef">QVariantMap</a>.
 /// When requested, every plugin must be able to provide its own configuration

diff --git a/doxygen/page_socket_plugin.dox b/doxygen/page_socket_plugin.dox
@@ -18,7 +18,7 @@
 ///     ...
 /// };
 /// @endcode
-/// If socket implementation uses QT5 signals/slots infrastructure, it can use
+/// If socket implementation uses Qt signals/slots infrastructure, it can use
 /// multiple inheritance and extend @b QObject as well.
 /// @code
 /// class MySocket : public QObject, public cc_tools_qt::Socket
@@ -68,7 +68,7 @@
 /// @subsection page_socket_plugin_data_recv Data Reception
 /// The @b socket object is expected to detect and report incoming data. It must
 /// be done @b asynchronously, hence it is recommended to use available signal/slot
-/// mechanism provided by the QT5 framework. However, if can also be done
+/// mechanism provided by the Qt framework. However, if can also be done
 /// using other third party code. In this case it is recommended to do such thing
 /// in separate thread (especially if there are blocking calls involved) and communicate 
 /// the updates to the main thread using the same signal/slot facility.

diff --git a/lib/include/cc_tools_qt/version.h b/lib/include/cc_tools_qt/version.h
@@ -28,7 +28,7 @@
 #define CC_TOOLS_QT_MINOR_VERSION 2U
 
 /// @brief Patch level of the library
-#define CC_TOOLS_QT_PATCH_VERSION 2U
+#define CC_TOOLS_QT_PATCH_VERSION 3U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_TOOLS_QT_MAKE_VERSION(major_, minor_, patch_) \

diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt
@@ -80,17 +80,17 @@ endfunction ()
 ###########################################################
 
 if (WIN32)
-    if (NOT "${Qt5_DIR}" STREQUAL "")
-        find_library(QT5PLATFORMSUPPORT_REL Qt5PlatformSupport HINTS "${Qt5_DIR}/lib")
-        find_library(QT5PLATFORMSUPPORT_DEB Qt5PlatformSupportd HINTS "${Qt5_DIR}/lib")
-        set(QT5PLATFORMSUPPORT optimized ${QT5PLATFORMSUPPORT_REL} debug ${QT5PLATFORMSUPPORT_DEB})
+    if (NOT "${Qt${CC_TOOLS_QT_MAJOR_QT_VERSION}_DIR}" STREQUAL "")
+        find_library(QTPLATFORMSUPPORT_REL Qt${CC_TOOLS_QT_MAJOR_QT_VERSION}PlatformSupport HINTS "${Qt${CC_TOOLS_QT_MAJOR_QT_VERSION}_DIR}/lib")
+        find_library(QTPLATFORMSUPPORT_DEB Qt${CC_TOOLS_QT_MAJOR_QT_VERSION}PlatformSupportd HINTS "${Qt${CC_TOOLS_QT_MAJOR_QT_VERSION}_DIR}/lib")
+        set(QTPLATFORMSUPPORT optimized ${QTPLATFORMSUPPORT_REL} debug ${QTPLATFORMSUPPORT_DEB})
     endif ()
 
-    if (NOT QT5PLATFORMSUPPORT)
-        set (QT5PLATFORMSUPPORT)
+    if (NOT QTPLATFORMSUPPORT)
+        set (QTPLATFORMSUPPORT)
     endif ()
 
-    set (CC_PLATFORM_SPECIFIC ${QT5PLATFORMSUPPORT} Setupapi.lib Ws2_32.lib opengl32.lib imm32.lib winmm.lib)
+    set (CC_PLATFORM_SPECIFIC ${QTPLATFORMSUPPORT} Setupapi.lib Ws2_32.lib opengl32.lib imm32.lib winmm.lib)
 
 endif ()   
 

diff --git a/lib/src/PluginMgrImpl.cpp b/lib/src/PluginMgrImpl.cpp
@@ -71,7 +71,7 @@ Plugin* getPlugin(QPluginLoader& loader)
 
         if (inst == nullptr) {
             std::cerr << "ERROR: The selected library \"" <<
-                loader.fileName().toStdString() << "\" is not a Qt5 plugin: " <<
+                loader.fileName().toStdString() << "\" is not a Qt plugin: " <<
                 loader.errorString().toStdString() << std::endl;
             break;
         }

diff --git a/plugin/ssl_socket/CMakeLists.txt b/plugin/ssl_socket/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (Qt5Core_VERSION VERSION_LESS 5.15)
+if (Qt${CC_TOOLS_QT_MAJOR_QT_VERSION}Core_VERSION VERSION_LESS 5.15)
     message(WARNING "Cannot build SSL sockets, requires minimal Qt version 5.15")
     return ()
 endif()