Qt6 support (#1363)

* Initial Qt6 config

* Change Package order to reingfence missing packages

* Update to QT 6.2.0

* Qt 6.2.0 updates

* macOS fix

* Simplify handling QT5 & Qt6 in parallel

* Updates for Windows

* Fix macos build

* macOS linker fix

* General support of QTDIR, update docu

* MaxOS add default qt directories

* Fix merge typo

* Update default CMakeSettings.json with installation path options

* Add additional libs required by Qt6 to CompileHowTo

* Fix Qt5 items

Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>

libsrc/grabber/xcb/CMakeLists.txt

@@ -3,11 +3,6 @@ SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
 SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/xcb)
 
 find_package(XCB COMPONENTS SHM IMAGE RENDER RANDR REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-
-if (NOT APPLE)
-	find_package(Qt5X11Extras REQUIRED)
-endif()
 
 include_directories(${XCB_INCLUDE_DIRS})
 
@@ -17,11 +12,12 @@ add_library(xcb-grabber ${XCB_SOURCES})
 
 target_link_libraries(xcb-grabber
 	hyperion
-	Qt5::X11Extras
-	Qt5::Widgets
 	${XCB_LIBRARIES}
+	${QT_LIBRARIES}
 )
 
 if (NOT APPLE)
-	target_link_libraries(xcb-grabber Qt5::X11Extras)
+	target_link_libraries(
+		xcb-grabber
+	)
 endif()

libsrc/grabber/xcb/XcbGrabber.cpp

@@ -8,10 +8,6 @@
 
 #include <QCoreApplication>
 
-#ifndef __APPLE__
-#include <QX11Info>
-#endif
-
 #include <memory>
 
 // Constants
@@ -454,7 +450,11 @@ void XcbGrabber::setCropping(int cropLeft, int cropRight, int cropTop, int cropB
 		updateScreenDimensions(true);
 }
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+bool XcbGrabber::nativeEventFilter(const QByteArray & eventType, void * message, qintptr * /*result*/)
+#else
 bool XcbGrabber::nativeEventFilter(const QByteArray & eventType, void * message, long int * /*result*/)
+#endif
 {
 	if (!_XcbRandRAvailable || eventType != "xcb_generic_event_t" || _XcbRandREventBase == -1)
 		return false;
@@ -477,7 +477,7 @@ xcb_render_pictformat_t XcbGrabber::findFormatForVisual(xcb_visualid_t visual) c
 #ifdef __APPLE__
 	int screen = 0;
 #else
-	int screen = QX11Info::appScreen();
+	int screen = _screen_num;
 #endif
 	xcb_render_pictscreen_iterator_t sit =
 		xcb_render_query_pict_formats_screens_iterator(formats.get());