configure: convert xlib to a proper library definition

Change-Id: I1623aee9e8632e4bfd466e09e275cc23f94c6dab Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
qt · Dec 7, 2018 · 118b456 · 118b456
1 parent b6737b7
commit 118b456
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/config.tests/x11/xrender/xrender.pro b/config.tests/x11/xrender/xrender.pro
@@ -1,3 +1,2 @@
 SOURCES = xrender.cpp
-CONFIG += x11
 CONFIG -= qt
diff --git a/src/gui/configure.json b/src/gui/configure.json
@@ -454,6 +454,19 @@
                 { "type": "pkgConfig", "args": "wayland-server" }
             ]
         },
+        "xlib": {
+            "label": "XLib",
+            "test": {
+                "include": "X11/Xlib.h",
+                "main": [
+                    "Display *d = XOpenDisplay(NULL);",
+                    "XCloseDisplay(d);"
+                ]
+            },
+            "sources": [
+                { "type": "makeSpec", "spec": "X11" }
+            ]
+        },
         "x11sm": {
             "label": "X11 session management",
             "sources": [
@@ -626,7 +639,8 @@
             "test": "x11/xrender",
             "sources": [
                 "-lXrender"
-            ]
+            ],
+            "use": "xlib"
         }
     },
 
@@ -913,18 +927,6 @@
             "pkg-config-variable": "prefix",
             "value": "/usr",
             "log": "value"
-        },
-        "xlib": {
-            "label": "XLib",
-            "type": "compile",
-            "test": {
-                "include": "X11/Xlib.h",
-                "main": [
-                    "Display *d = XOpenDisplay(NULL);",
-                    "XCloseDisplay(d);"
-                ],
-                "qmake": "CONFIG += x11"
-            }
         }
      },
 
@@ -1374,7 +1376,7 @@
         "xlib": {
             "label": "XLib",
             "autoDetect": "!config.darwin || features.xcb",
-            "condition": "tests.xlib",
+            "condition": "libs.xlib",
             "output": [ "privateFeature" ]
         },
         "texthtmlparser": {

diff --git a/src/platformsupport/eglconvenience/eglconvenience.pro b/src/platformsupport/eglconvenience/eglconvenience.pro
@@ -34,7 +34,7 @@ qtConfig(xlib) {
         qxlibeglintegration_p.h
     SOURCES += \
         qxlibeglintegration.cpp
-    LIBS_PRIVATE += $$QMAKE_LIBS_X11
+    QMAKE_USE_PRIVATE += xlib
 }
 CONFIG += egl
 

diff --git a/src/platformsupport/glxconvenience/glxconvenience.pro b/src/platformsupport/glxconvenience/glxconvenience.pro
@@ -6,7 +6,7 @@ CONFIG += static internal_module
 
 DEFINES += QT_NO_CAST_FROM_ASCII
 
-LIBS_PRIVATE += $$QMAKE_LIBS_X11
+QMAKE_USE_PRIVATE += xlib
 
 HEADERS += qglxconvenience_p.h
 SOURCES += qglxconvenience.cpp