aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2017-10-18 13:58:47 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2017-10-18 12:05:41 +0000
commit2cf65ed117e8e4494b1ab66b35e3dc9a70234659 (patch)
treeeb9f9eaa749d5313005be8a6357e2627cd138271
parentf14a911ab827f243c5b5fe31ff9746f3535d756f (diff)
Check if the required X11 libs are available before using them
Change-Id: I6c0a46b2e5123b00198d21792d7a2c0f9e857a2c Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r--src/src.pro7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/src.pro b/src/src.pro
index 23558a1..880c373 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,7 +4,7 @@ TARGET = neptune-ui
include(../config.pri)
macos:CONFIG -= app_bundle
-CONFIG *= no_private_qt_headers_warning
+CONFIG *= no_private_qt_headers_warning link_pkgconfig
QT *= appman_main-private testlib
@@ -12,9 +12,8 @@ DEFINES *= NEPTUNE_VERSION=\\\"$$VERSION\\\"
SOURCES = main.cpp
-unix:!macos: {
- CONFIG += link_pkgconfig
- PKGCONFIG += xcb x11 xi
+unix:!macos:system($$pkgConfigExecutable() --libs x11 xi xcb) {
+ PKGCONFIG *= xcb x11 xi
SOURCES += MouseTouchAdaptor.cpp
HEADERS += MouseTouchAdaptor.h
DEFINES += NEPTUNE_ENABLE_TOUCH_EMULATION