Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
443
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
d33f86fd
Commit
d33f86fd
authored
2 years ago
by
Alexandre Janniaux
Committed by
Jean-Baptiste Kempf
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
configure.ac: add support for wayland in static Qt plugins
parent
b65aae35
No related branches found
Branches containing commit
No related tags found
1 merge request
!2479
qt: fix contrib to avoid race conditions and make it work on Linux and Macosx reliably
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure.ac
+12
-0
12 additions, 0 deletions
configure.ac
with
12 additions
and
0 deletions
configure.ac
+
12
−
0
View file @
d33f86fd
...
...
@@ -3872,6 +3872,13 @@ AS_IF([test "${enable_qt}" != "no"], [
],[
AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
])
dnl TODO
PKG_CHECK_MODULES([QT5_WAYLAND], [Qt5WaylandClient], [
have_qt5_wayland="yes"
],[
AC_MSG_WARN([Not building Qt Interface with wayland support.])
])
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
QT_VERSION="$(eval $PKG_CONFIG --modversion Qt5Gui)"
...
...
@@ -3901,6 +3908,10 @@ AS_IF([test "${enable_qt}" != "no"], [
qxcb-glx-integration qxcb
], [VLC_ADD_LIBS([qt],[${QT5_XCB_PLUGINS_LIBS}])], [:])
PKG_CHECK_MODULES([QT5_WAYLAND_PLUGINS], [
qwayland-generic qwayland-egl xdg-shell
], [VLC_ADD_LIBS([qt],[${QT5_WAYLAND_PLUGINS_LIBS}])], [:])
dnl Platform plugins are mandatory on those platforms, as opposed to
dnl the previous integration for linux which are optional
...
...
@@ -3937,6 +3948,7 @@ AS_IF([test "${enable_qt}" != "no"], [
AC_SUBST([QT_VERSION])
AM_CONDITIONAL([ENABLE_QT], [test "$enable_qt" != "no"])
AM_CONDITIONAL([HAVE_QT5_X11], [test "${have_qt5_x11}" = "yes"])
AM_CONDITIONAL([HAVE_QT5_WAYLAND], [test "${have_qt5_wayland}" = "yes"])
dnl
dnl detect kde4-config patch (used for kde solids).
...
...
This diff is collapsed.
Click to expand it.
Johannes Kauffmann
@JohannesKauffmann
mentioned in merge request
!3197 (merged)
·
2 years ago
mentioned in merge request
!3197 (merged)
mentioned in merge request !3197
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment