Change GuiPrivate to XcbQpaPrivate

CMakeLists.txt

@@ -218,16 +218,16 @@ set(QT_VERSION_MAJOR 6)
 set(QT_MIN_VERSION 6.4.0)
 set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
 set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
-set(QT_OPTIONAL_COMPONENTS GuiPrivate LinguistTools Test)
+set(QT_OPTIONAL_COMPONENTS LinguistTools Test)
 if(UNIX AND NOT APPLE)
-  list(APPEND QT_OPTIONAL_COMPONENTS DBus)
+  list(APPEND QT_OPTIONAL_COMPONENTS DBus XcbQpaPrivate)
 endif()
 set(QT_NO_PRIVATE_MODULE_WARNING ON)
 
 find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
 
-if(TARGET "Qt${QT_VERSION_MAJOR}::GuiPrivate")
+if(TARGET "Qt${QT_VERSION_MAJOR}::XcbQpaPrivate")
-  set(QT_GUI_PRIVATE_FOUND ON)
+  set(QT_XCB_QPA_PRIVATE_FOUND ON)
 endif()
 
 if(Qt${QT_VERSION_MAJOR}DBus_FOUND)
@@ -369,8 +369,8 @@ if(APPLE OR WIN32)
   )
 endif()
 
-optional_component(QPA_QPLATFORMNATIVEINTERFACE ON "QPA Platform Native Interface"
+optional_component(QT_XCB_QPA_PRIVATE ON "XCB QPA Platform Native Interface"
-  DEPENDS "Qt Gui Private" QT_GUI_PRIVATE_FOUND
+  DEPENDS "Qt XCB QPA Private" QT_XCB_QPA_PRIVATE_FOUND
 )
 
 optional_component(STREAMTAGREADER ON "Stream tagreader"
@@ -1549,7 +1549,7 @@ target_link_libraries(strawberry_lib PUBLIC
   Qt${QT_VERSION_MAJOR}::Network
   Qt${QT_VERSION_MAJOR}::Sql
   $<$<BOOL:${HAVE_DBUS}>:Qt${QT_VERSION_MAJOR}::DBus>
-  $<$<BOOL:${HAVE_QPA_QPLATFORMNATIVEINTERFACE}>:Qt${QT_VERSION_MAJOR}::GuiPrivate>
+  $<$<BOOL:${HAVE_QT_XCB_QPA_PRIVATE}>:Qt${QT_VERSION_MAJOR}::XcbQpaPrivate>
   ICU::uc
   ICU::i18n
   $<$<BOOL:${HAVE_STREAMTAGREADER}>:PkgConfig::LIBSPARSEHASH>

src/config.h.in

@@ -43,7 +43,7 @@
 #cmakedefine INSTALL_TRANSLATIONS
 #define TRANSLATIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/strawberry/translations"
 
-#cmakedefine HAVE_QPA_QPLATFORMNATIVEINTERFACE
+#cmakedefine HAVE_QT_XCB_QPA_PRIVATE
 #cmakedefine HAVE_QX11APPLICATION
 
 #cmakedefine ENABLE_WIN32_CONSOLE

src/osd/osdpretty.cpp

@@ -51,7 +51,7 @@
 #include <QFlags>
 #include <QtEvents>
 
-#ifdef HAVE_QPA_QPLATFORMNATIVEINTERFACE
+#ifdef HAVE_QT_XCB_QPA_PRIVATE
 #  include <qpa/qplatformnativeinterface.h>
 #endif
 
@@ -215,7 +215,7 @@ void OSDPretty::ScreenRemoved(QScreen *screen) {
 
 bool OSDPretty::IsTransparencyAvailable() {
 
-#ifdef HAVE_QPA_QPLATFORMNATIVEINTERFACE
+#ifdef HAVE_QT_XCB_QPA_PRIVATE
   if (qApp && QGuiApplication::platformName() == "xcb"_L1) {
     QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
     QScreen *screen = popup_screen_ == nullptr ? QGuiApplication::primaryScreen() : popup_screen_;