Merge remote-tracking branch 'origin' into 7.0.x

samples/client/petstore/cpp-qt/.openapi-generator/FILES

@@ -1,5 +1,6 @@
 README.md
 client/CMakeLists.txt
+client/Config.cmake.in
 client/PFXApiResponse.cpp
 client/PFXApiResponse.h
 client/PFXCategory.cpp

samples/client/petstore/cpp-qt/CMakeLists.txt

@@ -5,28 +5,16 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-unused-variable")
-
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Test REQUIRED)
-find_package(Qt5Gui REQUIRED)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/client
-)
-
 add_subdirectory(client)
+
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Test)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test)
+
 add_executable(${PROJECT_NAME}
     PetStore/main.cpp
     PetStore/PetApiTests.cpp
     PetStore/StoreApiTests.cpp
     PetStore/UserApiTests.cpp
     )
-target_link_libraries(${PROJECT_NAME} PRIVATE client)
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Network Qt5::Test Qt5::Gui)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_EXTENSIONS OFF)
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+target_link_libraries(${PROJECT_NAME} PRIVATE CppQtPetstoreClient Qt${QT_VERSION_MAJOR}::Test)

samples/client/petstore/cpp-qt/README.md

@@ -128,13 +128,6 @@ servers:
 ## Documentation for Authorization
 
 Authentication schemes defined for the API:
-### api_key
-
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ### petstore_auth
 
 
@@ -145,6 +138,13 @@ Authentication schemes defined for the API:
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
+### api_key
+
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 
 ## Author
 

samples/client/petstore/cpp-qt/build-and-test.bash

@@ -35,7 +35,7 @@ else
     exit 1
   fi
 
-  echo "Check if no memory leaks occured:"
+  echo "Check if no memory leaks occurred:"
   leakCount=$(cat result.log | grep 'lost: 0 bytes in 0 blocks' | wc -l)
   if [ $leakCount == 3 ]
   then

samples/client/petstore/cpp-qt/client/CMakeLists.txt

@@ -1,45 +1,81 @@
 cmake_minimum_required(VERSION 3.2)
 
-project(client)
+project(CppQtPetstoreClient)
+
 set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CXX_STANDARD_REQUIRED ON)
 
-if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-else ()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wno-unused-variable")
-endif ()
-
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Gui REQUIRED)
-
-add_library(${PROJECT_NAME}
-    PFXApiResponse.cpp
-    PFXCategory.cpp
-    PFXOrder.cpp
-    PFXPet.cpp
-    PFXTag.cpp
-    PFXTestAnyType.cpp
-    PFXUser.cpp
-    PFXPetApi.cpp
-    PFXPrimitivesApi.cpp
-    PFXStoreApi.cpp
-    PFXUserApi.cpp
-    PFXHelpers.cpp
-    PFXHttpRequest.cpp
-    PFXHttpFileElement.cpp
-    PFXOauth.cpp
-)
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Network Qt5::Gui)
-if(NOT APPLE)
-  find_package(OpenSSL REQUIRED)
-  target_link_libraries(${PROJECT_NAME} PRIVATE ssl crypto)
+if(NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 14)
 endif()
 
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 14)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_EXTENSIONS OFF)
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Gui)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network Gui)
+
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+file(GLOB_RECURSE HEADER_FILES "*.h")
+file(GLOB_RECURSE SOURCE_FILES "*.cpp")
+
+add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES})
+
+target_compile_options(${PROJECT_NAME}
+    PRIVATE
+        $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+            -Wall -Wno-unused-variable>
+)
+
+target_include_directories(${PROJECT_NAME}
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>  
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        Qt${QT_VERSION_MAJOR}::Core
+        Qt${QT_VERSION_MAJOR}::Network
+        Qt${QT_VERSION_MAJOR}::Gui
+
+)
+
+if(NOT APPLE)
+    find_package(OpenSSL REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ssl crypto)
+endif()
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+    INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+)
+
+install(
+    TARGETS ${PROJECT_NAME}
+    EXPORT ${PROJECT_NAME}Targets
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
+)
+
+install(
+    FILES ${HEADER_FILES}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+)
+
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
+
+install(
+    EXPORT ${PROJECT_NAME}Targets
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)

samples/client/petstore/cpp-qt/client/Config.cmake.in

@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
+
+check_required_components("@PROJECT_NAME@")

samples/client/petstore/cpp-qt/client/PFXOauth.cpp

@@ -53,8 +53,8 @@ void OauthCode::link(){
 
 void OauthCode::unlink()
 {
-    disconnect(this,0,0,0);
-    disconnect(&m_server,0,0,0);
+    disconnect(this, nullptr, nullptr, nullptr);
+    disconnect(&m_server, nullptr, nullptr, nullptr);
 }
 
 void OauthCode::setVariables(QString authUrl, QString tokenUrl, QString scope, QString state, QString redirectUri, QString clientId, QString clientSecret, QString accessType){
@@ -119,8 +119,8 @@ void OauthImplicit::link()
 
 void OauthImplicit::unlink()
 {
-     disconnect(this,0,0,0);
-     disconnect(&m_server,0,0,0);
+     disconnect(this, nullptr, nullptr, nullptr);
+     disconnect(&m_server, nullptr, nullptr, nullptr);
      m_linked = false;
 }
 
@@ -163,7 +163,7 @@ void OauthCredentials::link()
 
 void OauthCredentials::unlink()
 {
-    disconnect(this,0,0,0);
+    disconnect(this, nullptr, nullptr, nullptr);
 }
 
 void OauthCredentials::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret){
@@ -206,7 +206,7 @@ void OauthPassword::link()
 
 void OauthPassword::unlink()
 {
-    disconnect(this,0,0,0);
+    disconnect(this, nullptr, nullptr, nullptr);
 }
 
 void OauthPassword::setVariables(QString tokenUrl, QString scope, QString clientId, QString clientSecret, QString username, QString password){