From a18daa8793ea6b2e9405e854f4b0fef66f8ceb16 Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Wed, 20 Nov 2013 19:06:23 +0100 Subject: [PATCH] QNX: Only link libclipboard when building with clipboard support In QNX 6.6, libclipboard isn't part of the base SDP, and QT_NO_CLIPBOARD is set unconditionally on plain QNX anyway. The clipboard-based implementation isn't compiled when QT_NO_CLIPBOARD is set, so only try to link libclipboard when actually building with clipboard support (BB10). Change-Id: I54eb4fadb6bf239a83884796f5758cb79a5677ef Reviewed-by: Andreas Holzammer Reviewed-by: Fabian Bumberger Reviewed-by: Rafael Roquetto Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> --- src/plugins/platforms/qnx/qnx.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index aeacbeef693..92c8fc183ab 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -132,7 +132,8 @@ CONFIG(qqnx_pps) { qqnxclipboard.h \ qqnxbuttoneventnotifier.h - LIBS += -lpps -lclipboard + LIBS += -lpps + !contains(DEFINES, QT_NO_CLIPBOARD): LIBS += -lclipboard CONFIG(qqnx_imf) { DEFINES += QQNX_IMF