Commit 9a9f1527 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Add a cmake option to disable our own tablet support

Off by default, this makes it easier to check whether bugs are
caused by our fork of Qt's classes or to check whether Qt's tablet
support has improved.

CCBUG:399379
parent 8ba9f448
......@@ -168,6 +168,10 @@ if (WIN32)
endif (MINGW)
endif ()
option(USE_QT_XCB "Do not use Krita's forked XCB connection and tablet support on X11, but leave everything to Qt." OFF)
configure_file(config_use_qt_xcb.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_use_qt_xcb.h)
add_feature_info("Use Qt's XCB and Tablet support on X11" USE_QT_XCB "Do not use Krita's forked XCB connection and tablet support on X11, but leave everything to Qt.")
option(HIDE_SAFE_ASSERTS "Don't show message box for \"safe\" asserts, just ignore them automatically and dump a message to the terminal." ON)
configure_file(config-hide-safe-asserts.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-hide-safe-asserts.h)
add_feature_info("Hide Safe Asserts" HIDE_SAFE_ASSERTS "Don't show message box for \"safe\" asserts, just ignore them automatically and dump a message to the terminal.")
......
/* config_use_qt_xcb.h. Generated from config_use_qt_xcb.h.cmake */
#cmakedefine USE_QT_XCB 1
......@@ -62,8 +62,11 @@
#include <QLibrary>
#elif defined HAVE_X11
#include "config_use_qt_xcb.h"
#ifndef USE_QT_XCB
#include <kis_xi2_event_filter.h>
#endif
#endif
#if defined HAVE_KCRASH
#include <kcrash.h>
......@@ -331,8 +334,11 @@ extern "C" int main(int argc, char **argv)
}
#if defined HAVE_X11
app.installNativeEventFilter(KisXi2EventFilter::instance());
#ifndef USE_QT_XCB
app.installNativeEventFilter(KisXi2EventFilter::instance());
#endif
#endif
app.installEventFilter(KisQtWidgetsTweaker::instance());
......
......@@ -418,13 +418,18 @@ endif()
input/wintab/drawpile_tablettester/tablettest.cpp
)
if(UNIX)
if (UNIX)
set(kritaui_LIB_SRCS
${kritaui_LIB_SRCS}
input/wintab/kis_tablet_support.cpp
qtlockedfile/qtlockedfile_unix.cpp
)
if(NOT APPLE)
if(NOT USE_QT_XCB)
set(kritaui_LIB_SRCS
${kritaui_LIB_SRCS}
input/wintab/kis_tablet_support.cpp
)
endif()
if(NOT APPLE AND NOT USE_QT_XCB)
set(kritaui_LIB_SRCS
${kritaui_LIB_SRCS}
input/wintab/qxcbconnection_xi2.cpp
......
......@@ -40,7 +40,6 @@
#include <QGuiApplication>
#include <QApplication>
#include <X11/extensions/XI2proto.h>
#include <xcb/xproto.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment