summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-09-15 15:24:47 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-09-16 08:22:38 +0200
commit4ceef8a3a6d64474344cac4a6ed4b32b09d38367 (patch)
treecac8a2ec3f34404cbea9332d3f0150a48d5f673a /src/gui
parent7a67c01a4901038b046b3437212709a302b9804e (diff)
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>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/.prev_CMakeLists.txt2
-rw-r--r--src/gui/CMakeLists.txt2
-rw-r--r--src/gui/platform/unix/unix.pri2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 5b4c581bed..f0c3dd1662 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -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
)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index dc7d28d0f1..6d496e2d7f 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -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
)
diff --git a/src/gui/platform/unix/unix.pri b/src/gui/platform/unix/unix.pri
index a51e27f1ee..a322e2ae1a 100644
--- a/src/gui/platform/unix/unix.pri
+++ b/src/gui/platform/unix/unix.pri
@@ -41,5 +41,5 @@ qtConfig(xkbcommon) {
platform/unix/qxkbcommon.cpp
HEADERS += \
platform/unix/qxkbcommon_p.h
- QMAKE_USE += xkbcommon
+ QMAKE_USE_PRIVATE += xkbcommon
}