Skip to content

Commit d9f0dc1

Browse files
TheOneRingTheOneRing
committed
Qt: Add Qt6 support
1 parent 623f73a commit d9f0dc1

39 files changed

+2293
-1615
lines changed

‎client/.ninja_deps

0 Bytes
Binary file not shown.

‎client/.ninja_log

Lines changed: 160 additions & 160 deletions
Large diffs are not rendered by default.

‎client/CMakeCache.txt

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,32 @@ Libre Graph API_IS_TOP_LEVEL:STATIC=ON
252252
//Value Computed by CMake
253253
Libre Graph API_SOURCE_DIR:STATIC=/drone/src/out-cpp-qt-client/client
254254

255+
//The directory containing a CMake configuration file for QT.
256+
QT_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5
257+
255258
//The directory containing a CMake configuration file for Qt5Core.
256259
Qt5Core_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Core
257260

261+
//The directory containing a CMake configuration file for Qt5Gui.
262+
Qt5Gui_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui
263+
258264
//The directory containing a CMake configuration file for Qt5Network.
259265
Qt5Network_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Network
260266

267+
//The directory containing a CMake configuration file for Qt5.
268+
Qt5_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5
269+
270+
//Path to a file.
271+
ZLIB_INCLUDE_DIR:PATH=/usr/include
272+
273+
//Path to a library.
274+
ZLIB_LIBRARY_DEBUG:FILEPATH=ZLIB_LIBRARY_DEBUG-NOTFOUND
275+
276+
//Path to a library.
277+
ZLIB_LIBRARY_RELEASE:FILEPATH=/usr/lib/x86_64-linux-gnu/libz.so
278+
261279
//Dependencies for the target
262-
client_LIB_DEPENDS:STATIC=general;Qt5::Core;general;Qt5::Network;
280+
client_LIB_DEPENDS:STATIC=general;Qt5::Core;general;Qt5::Network;general;Qt5::Gui;general;ZLIB::ZLIB;
263281

264282

265283
########################
@@ -423,6 +441,14 @@ CMAKE_STRIP-ADVANCED:INTERNAL=1
423441
CMAKE_UNAME:INTERNAL=/usr/bin/uname
424442
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
425443
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
444+
//Details about finding ZLIB
445+
FIND_PACKAGE_MESSAGE_DETAILS_ZLIB:INTERNAL=[/usr/lib/x86_64-linux-gnu/libz.so][/usr/include][v1.2.11()]
446+
//ADVANCED property for variable: ZLIB_INCLUDE_DIR
447+
ZLIB_INCLUDE_DIR-ADVANCED:INTERNAL=1
448+
//ADVANCED property for variable: ZLIB_LIBRARY_DEBUG
449+
ZLIB_LIBRARY_DEBUG-ADVANCED:INTERNAL=1
450+
//ADVANCED property for variable: ZLIB_LIBRARY_RELEASE
451+
ZLIB_LIBRARY_RELEASE-ADVANCED:INTERNAL=1
426452
//CMAKE_INSTALL_PREFIX during last run
427453
_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX:INTERNAL=/usr/local
428454

‎client/CMakeFiles/Export/lib/cmake/LibreGraphAPI/LibreGraphAPITargets-noconfig.cmake

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#----------------------------------------------------------------
2+
# Generated CMake target import file.
3+
#----------------------------------------------------------------
4+
5+
# Commands may need to know the format version.
6+
set(CMAKE_IMPORT_FILE_VERSION 1)
7+
8+
# Import target "OpenAPI::LibreGraphAPI" for configuration ""
9+
set_property(TARGET OpenAPI::LibreGraphAPI APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
10+
set_target_properties(OpenAPI::LibreGraphAPI PROPERTIES
11+
IMPORTED_LINK_INTERFACE_LANGUAGES_NOCONFIG "CXX"
12+
IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/lib/libLibreGraphAPI.a"
13+
)
14+
15+
list(APPEND _IMPORT_CHECK_TARGETS OpenAPI::LibreGraphAPI )
16+
list(APPEND _IMPORT_CHECK_FILES_FOR_OpenAPI::LibreGraphAPI "${_IMPORT_PREFIX}/lib/libLibreGraphAPI.a" )
17+
18+
# Commands beyond this point should not need to know the version.
19+
set(CMAKE_IMPORT_FILE_VERSION)

‎client/CMakeFiles/Export/lib/cmake/LibreGraphAPI/LibreGraphAPITargets.cmake

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# Generated by CMake
2+
3+
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
4+
message(FATAL_ERROR "CMake >= 2.6.0 required")
5+
endif()
6+
cmake_policy(PUSH)
7+
cmake_policy(VERSION 2.6...3.20)
8+
#----------------------------------------------------------------
9+
# Generated CMake target import file.
10+
#----------------------------------------------------------------
11+
12+
# Commands may need to know the format version.
13+
set(CMAKE_IMPORT_FILE_VERSION 1)
14+
15+
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
16+
set(_targetsDefined)
17+
set(_targetsNotDefined)
18+
set(_expectedTargets)
19+
foreach(_expectedTarget OpenAPI::LibreGraphAPI)
20+
list(APPEND _expectedTargets ${_expectedTarget})
21+
if(NOT TARGET ${_expectedTarget})
22+
list(APPEND _targetsNotDefined ${_expectedTarget})
23+
endif()
24+
if(TARGET ${_expectedTarget})
25+
list(APPEND _targetsDefined ${_expectedTarget})
26+
endif()
27+
endforeach()
28+
if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
29+
unset(_targetsDefined)
30+
unset(_targetsNotDefined)
31+
unset(_expectedTargets)
32+
set(CMAKE_IMPORT_FILE_VERSION)
33+
cmake_policy(POP)
34+
return()
35+
endif()
36+
if(NOT "${_targetsDefined}" STREQUAL "")
37+
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
38+
endif()
39+
unset(_targetsDefined)
40+
unset(_targetsNotDefined)
41+
unset(_expectedTargets)
42+
43+
44+
# Compute the installation prefix relative to this file.
45+
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
46+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
47+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
48+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
49+
if(_IMPORT_PREFIX STREQUAL "/")
50+
set(_IMPORT_PREFIX "")
51+
endif()
52+
53+
# Create imported target OpenAPI::LibreGraphAPI
54+
add_library(OpenAPI::LibreGraphAPI STATIC IMPORTED)
55+
56+
set_target_properties(OpenAPI::LibreGraphAPI PROPERTIES
57+
INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/OpenAPI/LibreGraphAPI"
58+
INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Qt5::Core>;\$<LINK_ONLY:Qt5::Network>;\$<LINK_ONLY:Qt5::Gui>;\$<LINK_ONLY:ZLIB::ZLIB>"
59+
)
60+
61+
if(CMAKE_VERSION VERSION_LESS 2.8.12)
62+
message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
63+
endif()
64+
65+
# Load information for each installed configuration.
66+
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
67+
file(GLOB CONFIG_FILES "${_DIR}/LibreGraphAPITargets-*.cmake")
68+
foreach(f ${CONFIG_FILES})
69+
include(${f})
70+
endforeach()
71+
72+
# Cleanup temporary variables.
73+
set(_IMPORT_PREFIX)
74+
75+
# Loop over all imported files and verify that they actually exist
76+
foreach(target ${_IMPORT_CHECK_TARGETS} )
77+
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
78+
if(NOT EXISTS "${file}" )
79+
message(FATAL_ERROR "The imported target \"${target}\" references the file
80+
\"${file}\"
81+
but this file does not exist. Possible reasons include:
82+
* The file was deleted, renamed, or moved to another location.
83+
* An install or uninstall procedure did not complete successfully.
84+
* The installation package was faulty and contained
85+
\"${CMAKE_CURRENT_LIST_FILE}\"
86+
but not all the files it references.
87+
")
88+
endif()
89+
endforeach()
90+
unset(_IMPORT_CHECK_FILES_FOR_${target})
91+
endforeach()
92+
unset(_IMPORT_CHECK_TARGETS)
93+
94+
# This file does not depend on other imported targets which have
95+
# been exported from the same project but in a separate export set.
96+
97+
# Commands beyond this point should not need to know the version.
98+
set(CMAKE_IMPORT_FILE_VERSION)
99+
cmake_policy(POP)

‎client/CMakeFiles/client_autogen.dir/AutogenInfo.json

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,57 @@
2424
"/usr/share/cmake-3.22/Modules/Platform/Linux-GNU.cmake",
2525
"/usr/share/cmake-3.22/Modules/CMakeCommonLanguageInclude.cmake",
2626
"/usr/share/cmake-3.22/Modules/GNUInstallDirs.cmake",
27+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5/Qt5ConfigVersion.cmake",
28+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5/Qt5Config.cmake",
29+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5/Qt5ConfigVersion.cmake",
30+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5/Qt5Config.cmake",
31+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5/Qt5ModuleLocation.cmake",
2732
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfigVersion.cmake",
2833
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfig.cmake",
2934
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfigExtras.cmake",
3035
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake",
3136
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreMacros.cmake",
3237
"/usr/share/cmake-3.22/Modules/CMakeParseArguments.cmake",
38+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake",
39+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5GuiConfig.cmake",
40+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake",
41+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEglFSEmulatorIntegrationPlugin.cmake",
42+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake",
43+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake",
44+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEglFSKmsGbmIntegrationPlugin.cmake",
45+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake",
46+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake",
47+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake",
48+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake",
49+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake",
50+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake",
51+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake",
52+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake",
53+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake",
54+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake",
55+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake",
56+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake",
57+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake",
58+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake",
59+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake",
60+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QVncIntegrationPlugin.cmake",
61+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake",
62+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake",
63+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake",
64+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake",
3365
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake",
3466
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Network/Qt5NetworkConfig.cmake",
3567
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake",
3668
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake",
37-
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake"
69+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake",
70+
"/usr/share/cmake-3.22/Modules/FindZLIB.cmake",
71+
"/usr/share/cmake-3.22/Modules/SelectLibraryConfigurations.cmake",
72+
"/usr/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake",
73+
"/usr/share/cmake-3.22/Modules/FindPackageMessage.cmake",
74+
"/usr/share/cmake-3.22/Modules/CMakePackageConfigHelpers.cmake",
75+
"/usr/share/cmake-3.22/Modules/WriteBasicConfigVersionFile.cmake",
76+
"/drone/src/out-cpp-qt-client/client/Config.cmake.in",
77+
"/usr/share/cmake-3.22/Modules/BasicConfigVersion-SameMajorVersion.cmake.in"
3878
],
3979
"CMAKE_SOURCE_DIR" : "/drone/src/out-cpp-qt-client/client",
4080
"DEP_FILE" : "/drone/src/out-cpp-qt-client/client/client_autogen/deps",
@@ -531,7 +571,7 @@
531571
"HEADER_EXTENSIONS" : [ "h", "hh", "h++", "hm", "hpp", "hxx", "in", "txx" ],
532572
"INCLUDE_DIR" : "/drone/src/out-cpp-qt-client/client/client_autogen/include",
533573
"MOC_COMPILATION_FILE" : "/drone/src/out-cpp-qt-client/client/client_autogen/mocs_compilation.cpp",
534-
"MOC_DEFINITIONS" : [ "QT_CORE_LIB", "QT_NETWORK_LIB", "QT_NO_DEBUG" ],
574+
"MOC_DEFINITIONS" : [ "QT_CORE_LIB", "QT_GUI_LIB", "QT_NETWORK_LIB", "QT_NO_DEBUG" ],
535575
"MOC_DEPEND_FILTERS" :
536576
[
537577
[
@@ -546,13 +586,14 @@
546586
"/usr/include/x86_64-linux-gnu/qt5/QtCore",
547587
"/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++",
548588
"/usr/include/x86_64-linux-gnu/qt5/QtNetwork",
589+
"/usr/include/x86_64-linux-gnu/qt5/QtGui",
590+
"/usr/include",
549591
"/usr/include/c++/11",
550592
"/usr/include/x86_64-linux-gnu/c++/11",
551593
"/usr/include/c++/11/backward",
552594
"/usr/lib/gcc/x86_64-linux-gnu/11/include",
553595
"/usr/local/include",
554-
"/usr/include/x86_64-linux-gnu",
555-
"/usr/include"
596+
"/usr/include/x86_64-linux-gnu"
556597
],
557598
"MOC_MACRO_NAMES" : [ "Q_OBJECT", "Q_GADGET", "Q_NAMESPACE", "Q_NAMESPACE_EXPORT" ],
558599
"MOC_OPTIONS" : [],

‎client/CMakeFiles/client_autogen.dir/AutogenUsed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
moc:fe576636b50e253b97e304b84afb37b40b8328529d320d05a92901cb0026d1b0
1+
moc:0fc9a87ff265529d3580502cb6d46f9a6c0df5dd007d8ce60652b51489c52b40

0 commit comments

Comments
 (0)