1 files changed, 11 insertions, 9 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
index b3361dbd99..f9f78ad1eb 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -1,12 +1,13 @@
-# Generated from xcb_glx.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## QXcbGlxIntegrationPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(QXcbGlxIntegrationPlugin
+qt_internal_add_plugin(QXcbGlxIntegrationPlugin
     OUTPUT_NAME qxcb-glx-integration
-    TYPE xcbglintegrations
+    PLUGIN_TYPE xcbglintegrations
     SOURCES
         qglxintegration.cpp qglxintegration.h
         qxcbglxintegration.cpp qxcbglxintegration.h
@@ -18,24 +19,25 @@ qt_add_plugin(QXcbGlxIntegrationPlugin
     INCLUDE_DIRECTORIES
         ..
         ../..
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::GlxSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
         Qt::XcbQpaPrivate
+    NO_UNITY_BUILD # X11 define clashes
 )
 
 ## Scopes:
 #####################################################################
 
-qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
-    PUBLIC_LIBRARIES
+qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx
+    LIBRARIES
         XCB::GLX
 )
 
-qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static
-    PUBLIC_LIBRARIES
+qt_internal_extend_target(QXcbGlxIntegrationPlugin
+    CONDITION QT_FEATURE_dlopen AND QT_BUILD_SHARED_LIBS
+    LIBRARIES
         ${CMAKE_DL_LIBS}
 )