diff options
8 files changed, 50 insertions, 9 deletions
diff --git a/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri b/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri index 25892390..d1e389da 100644 --- a/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri +++ b/src/compositor/hardware_integration/wayland_egl/wayland_egl.pri @@ -1,6 +1,10 @@ -LIBS += -lEGL -DEFINES += QT_COMPOSITOR_MESA_EGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += wayland-egl egl +} else { + LIBS += -lwayland-egl -lEGL +} SOURCES += \ $$PWD/waylandeglintegration.cpp diff --git a/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri b/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri index f4be9a25..1004fe39 100644 --- a/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri +++ b/src/compositor/hardware_integration/xcomposite_egl/xcomposite_egl.pri @@ -1,6 +1,11 @@ include (../xcomposite_share/xcomposite_share.pri) -LIBS += -lXcomposite -lX11 -lEGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += xcomposite egl x11 +} else { + LIBS += -lXcomposite -lEGL -lX11 +} HEADERS += \ $$PWD/xcompositeeglintegration.h diff --git a/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri b/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri index e8d4d013..26281cc6 100644 --- a/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri +++ b/src/compositor/hardware_integration/xcomposite_glx/xcomposite_glx.pri @@ -1,6 +1,11 @@ include (../xcomposite_share/xcomposite_share.pri) -LIBS += -lXcomposite -lX11 +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += xcomposite gl x11 +} else { + LIBS += -lXcomposite -lGL -lX11 +} HEADERS += \ $$PWD/xcompositeglxintegration.h diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri b/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri index 3325fe8e..51890ffd 100644 --- a/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri +++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri @@ -1,4 +1,9 @@ -LIBS += -lX11 -lXext -lEGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += egl x11 xext +} else { + LIBS += -lX11 -lXext -lEGL +} load(qpa/egl/convenience) HEADERS += \ diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri b/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri index 746d594f..58b7262a 100644 --- a/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri +++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri @@ -8,4 +8,9 @@ SOURCES += \ $$PWD/qwaylandreadbackglxwindow.cpp \ $$PWD/qwaylandreadbackglxcontext.cpp -LIBS += -lX11 +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += x11 gl +} else { + LIBS += -lX11 -lGL +} diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri b/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri index 8b4b163b..5bda0074 100644 --- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri +++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri @@ -1,4 +1,10 @@ -LIBS += -lwayland-egl -lEGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += wayland-egl egl +} else { + LIBS += -lwayland-egl -lEGL +} + INCLUDEPATH += $$PWD SOURCES += $$PWD/qwaylandeglintegration.cpp \ $$PWD/qwaylandglcontext.cpp \ diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri index 5f86bd95..9b5a19dc 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri @@ -1,6 +1,11 @@ include (../xcomposite_share/xcomposite_share.pri) -LIBS += -lXcomposite -lEGL +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += xcomposite egl x11 +} else { + LIBS += -lXcomposite -lEGL -lX11 +} SOURCES += \ $$PWD/qwaylandxcompositeeglcontext.cpp \ diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri index bbd6c12e..eb1aa78c 100644 --- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri +++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri @@ -1,6 +1,12 @@ include (../xcomposite_share/xcomposite_share.pri) -LIBS += -lXcomposite +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += xcomposite gl x11 +} else { + LIBS += -lXcomposite -lGL -lX11 +} + SOURCES += \ $$PWD/qwaylandxcompositeglxcontext.cpp \ $$PWD/qwaylandxcompositeglxintegration.cpp \ |