whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make xkb a private dependency of QtGui 

It should not be necessary to have the xkb dev package installed for
users of QtGui.

Task-number: QTBUG-86421
Change-Id: I4a4102d578df504d23f504a97704fcab4a39023b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2020-09-15 15:24:47 +02:00
parent 7a67c01a49
commit 4ceef8a3a6
8 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/.prev_CMakeLists.txt
View File

@ -828,7 +828,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
SOURCES
platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h
platform/unix/qxkbcommon_3rdparty.cpp
PUBLIC_LIBRARIES
LIBRARIES
XKB::XKB
)

2
src/gui/CMakeLists.txt
View File

@ -999,7 +999,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_xkbcommon AND UNIX
SOURCES
platform/unix/qxkbcommon.cpp platform/unix/qxkbcommon_p.h
platform/unix/qxkbcommon_3rdparty.cpp
PUBLIC_LIBRARIES
LIBRARIES
XKB::XKB
)

2
src/gui/platform/unix/unix.pri
View File

@ -41,5 +41,5 @@ qtConfig(xkbcommon) {
platform/unix/qxkbcommon.cpp
HEADERS += \
platform/unix/qxkbcommon_p.h
QMAKE_USE += xkbcommon
QMAKE_USE_PRIVATE += xkbcommon
}

5
src/platformsupport/input/.prev_CMakeLists.txt
View File

@ -77,6 +77,11 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
PkgConfig::Libudev
)
qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
LIBRARIES
XKB::XKB
)
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
SOURCES
shared/devicehandlerlist_p.h

5
src/platformsupport/input/CMakeLists.txt
View File

@ -82,6 +82,11 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
PkgConfig::Libudev
)
qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
LIBRARIES
XKB::XKB
)
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
SOURCES
shared/devicehandlerlist_p.h

1
src/platformsupport/input/libinput/libinput.pri
View File

@ -11,5 +11,6 @@ SOURCES += \
$$PWD/qlibinputtouch.cpp
QMAKE_USE_PRIVATE += libudev libinput
qtConfig(xkbcommon): QMAKE_USE_PRIVATE += xkbcommon
INCLUDEPATH += $$PWD/../shared

2
src/plugins/platforminputcontexts/ibus/CMakeLists.txt
View File

@ -14,6 +14,8 @@ qt_internal_add_plugin(QIbusPlatformInputContextPlugin
qibusproxy.cpp qibusproxy.h
qibusproxyportal.cpp qibusproxyportal.h
qibustypes.cpp qibustypes.h
LIBRARIES
XKB::XKB
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus

1
src/plugins/platforminputcontexts/ibus/ibus.pro
View File

@ -1,6 +1,7 @@
TARGET = ibusplatforminputcontextplugin
QT += dbus gui-private
QMAKE_USE_PRIVATE += xkbcommon
SOURCES += $$PWD/qibusplatforminputcontext.cpp \
$$PWD/qibusproxy.cpp \
$$PWD/qibusproxyportal.cpp \