diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-01-15 13:09:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 15:11:35 +0100 |
| commit | 0f2dc4713918915b84755e67d4391cb3b5a66410 (patch) | |
| tree | e93d58ab9fd1996921bf858c25b7123250cb1482 /src/hardwareintegration | |
| parent | 62efff2861a8a256fbe338dfa3f348d83f346c6f (diff) | |
Fix pkgconfig for brcm-egl hw integration
Change-Id: I092eaebad40785a68c0c9c22201c9e2d39666ea9
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/brcm-egl/brcm-egl.pri | 7 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri index cb7a0e224..eb8e450f9 100644 --- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri @@ -1,5 +1,12 @@ INCLUDEPATH += $$PWD +contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += wayland-client +} else { + LIBS += -lwayland-client +} + for(p, QMAKE_LIBDIR_EGL) { exists($$p):LIBS += -L$$p } diff --git a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri index 8dbd00b1a..72645ace3 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri @@ -4,7 +4,13 @@ load(qt_plugin) QT = compositor compositor-private core-private gui-private INCLUDEPATH += $$PWD -LIBS += -lwayland-server + +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += wayland-server +} else { + LIBS += -lwayland-server +} for(p, QMAKE_LIBDIR_EGL) { exists($$p):LIBS += -L$$p |