Skip to content

Commit

Permalink
Build with Qt 5.15.1 in CentOS 7 docker.
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Nov 5, 2020
1 parent 94025be commit 3a2d8a2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
19 changes: 15 additions & 4 deletions external/qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,12 @@ else()
plugins/bearer/${qt_lib_prefix}qgenericbearer
${qt_libs_dbus_bearers}
lib/${qt_lib_prefix}Qt5WaylandClient
lib/${qt_lib_prefix}Qt5ServiceSupport
${common_qt_libs}
${qt_libs_dbus}
lib/${qt_lib_prefix}Qt5Svg
lib/${qt_lib_prefix}Qt5Core
lib/${qt_lib_prefix}qtpcre2
lib/${qt_lib_prefix}xcb-static
)
foreach (lib ${qt_libs})
list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
Expand Down Expand Up @@ -345,10 +345,21 @@ else()
wayland-client
xkbcommon
xkbcommon-x11
Xi
Xext
Xfixes
Xrender
xcb-xkb
xcb-randr
xcb-icccm
xcb-shm
xcb-render
xcb-image
xcb-xfixes
xcb-xinerama
xcb-xinput
xcb-shape
xcb-sync
xcb-util
xcb-render-util
xcb-keysyms
ffi
)
if (DESKTOP_APP_USE_GLIBC_WRAPS)
Expand Down
1 change: 1 addition & 0 deletions external/webrtc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,6 @@ else()
${webrtc_libs_list}
desktop-app::external_openssl
desktop-app::external_jpeg
desktop-app::external_opus
)
endif()

0 comments on commit 3a2d8a2

Please sign in to comment.