diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 0e53f5127a..46dfff586d 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -1082,7 +1082,10 @@ qt_feature("clipboard" PUBLIC SECTION "Kernel" LABEL "QClipboard" PURPOSE "Provides cut and paste operations." - CONDITION NOT INTEGRITY AND NOT QNX AND NOT rtems + # BB10: upstream gates clipboard off on QNX, but the qqnx plugin ships a + # working QQnxClipboard (built when QT_FEATURE_qqnx_pps, links libclipboard + # which the QNX sysroot provides). tdesktop needs QClipboard, so allow it. + CONDITION NOT INTEGRITY AND NOT rtems ) qt_feature_definition("clipboard" "QT_NO_CLIPBOARD" NEGATE VALUE "1") qt_feature("wheelevent" PUBLIC diff --git a/src/plugins/platforms/qnx/qqnxclipboard.cpp b/src/plugins/platforms/qnx/qqnxclipboard.cpp index 3f27ec8069..b402a9d170 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.cpp +++ b/src/plugins/platforms/qnx/qqnxclipboard.cpp @@ -10,7 +10,9 @@ #include #include +#include #include +#include #include #include diff --git a/src/plugins/platforms/qnx/qqnxclipboard.h b/src/plugins/platforms/qnx/qqnxclipboard.h index 66f862f0dc..39d11d66b7 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.h +++ b/src/plugins/platforms/qnx/qqnxclipboard.h @@ -8,6 +8,7 @@ #if !defined(QT_NO_CLIPBOARD) #include +#include QT_BEGIN_NAMESPACE