| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Re-use configuration results from qtbase where possible and move
all pkg-config handling over to be done at configuration time.
Since waylandclient and waylandcompositor are two independent libs,
this required some duplication of features and libraries used by
both in the configure.json files.
Change-Id: I1f3ec56c85cb780324cc7634a3ad7951125853a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
|
|
|
|
|
|
|
| |
This makes sure QtWayland is only built if a Wayland version >= 1.6.0 is
found. Upgraded from 1.4.0.
Change-Id: Ibbd965f9e25ae9fd15d9367431574c5c1ff8b7ce
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
contains(QT_CONFIG, egl) and CONFIG += egl is the only sane way to test
for and pull in EGL headers and libs. This is particularly important when
trying to be robust and guard against half-broken sysroots on embedded
where a naive PKGCONFIG += egl breaks.
Also add an EGL_WAYLAND_BUFFER_WL define to keep wayland-egl compiling.
We are not testing for that in any config tests may cause a failure in sysroots
that have parts of Mesa thrown in but pick ip an older EGL header from the
vendor's driver.
Change-Id: I7b7e6a7a91e78dbda5b6954ad08761298c538efc
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
|
|
|
|
|
|
|
| |
The module will be skipped if the conditions are not met.
Change-Id: I99593777348bd8c74e8c32f0a4ff482bbaa8812d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Wayland 1.4 introduces wl_subsurface which is quite an important
addition.
Change-Id: I48375f60adce556c9989872319f4d073e4a7b13b
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This breaks building from qt.pro in qt5.git when doing integration for the whole
of Qt on CI nodes that don't have wayland installed.
This isn't an optimal solution of course, but it's pragmatic. Maybe it can be
revisited if/when per-module configures are ever a thing.
We reword the warnings to make it clear that QtWayland will not be built under
these circumstances.
This partially reverts commit 5b740c6246e092bc49b029bb7b12b614c4d0ce1e.
Change-Id: I07bd95a3a0349ad37a9025cdf5fd870c348d3799
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This ensures that a build won't become a no-op with confusing results, and no
clear indication of what the problem is.
Change-Id: Ie9ad14b8d8230cfd3b2772511b853d71f2eed977
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
|
|
|
|
|
|
|
|
|
| |
Add a hardwareintegration plugin to make Qt server side EGL buffers
shareable from the compositor to the client, such as what the
server-buffer example does.
Change-Id: I24558324d51202ca449b47b0ee395c8e81c10698
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
|
|
|
|
|
| |
Change-Id: I0284bcac551c13d3f8a7e71c00f0f68cd7872f08
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/compositor/hardware_integration/qwaylandclientbufferintegrationplugin.h
src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp
src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp
src/plugins/platforms/qwayland-brcm-egl/main.cpp
src/plugins/platforms/qwayland-egl/main.cpp
src/plugins/platforms/qwayland-generic/main.cpp
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
Change-Id: I957c9bee893a9e19fc8c93f0e51292007fb3a4a8
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ib0ae4683374c2fd0c7386863ffb3c207605dc1e2
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandshellsurface.h
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: Ifa9bc553d826b893b054bbaef5ea3fc3013de3df
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The required Wayland version was updated to 1.1, but the top-level error
message was not updated to reflect this.
Change-Id: Ifc1c7552a4a38986685c214e24241704fd774e11
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ib09b2cff3f7f57efd25cbd9b085542eab2ac2853
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: I6f9e8fb0536212b7b072aec3c8152390fb9f2922
|
| |
| |
| |
| |
| |
| |
| |
| | |
Not all platforms that use qtwayland depend on xkbcommon to be present
for them to be functional
Change-Id: I9dcc8f661f7d6035f405420d9d4733b52c77112e
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
|
|/
|
|
|
| |
Change-Id: Ibd0557158ffa00cbacd64b4780961a684ab40afb
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
|
|
|
|
|
|
|
|
| |
We need this version to support the changes made for threaded Wayland
event processing.
Change-Id: I64babb4e21c3581feb5db843539f85539011c1e6
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
|
|
|
|
|
| |
Change-Id: I83066c632c5dec9599d7261a2f353ef4749a19da
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now that both xkbcommon 0.2.0 and libWayland 1.0.0 have been
released, we should no longer be building against sha1's and
should be preparing for an eventual release so these build hints
have been removed.
A test has been added for libWayland 1.0.0 which is required to
build QtWayland.
README has been updated to reflect the current situation
src/3rdparty has been removed as it has not been used in some time.
patches folder and contents have been removed as they are no longer
needed.
extensions folder has been moved to the src folder
Change-Id: Iab79b5c164758a4bd0253c90f60b2a2d044e2785
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
| |
Change-Id: Ie7d80e7591d11aa5df87ca5d5de4cd6c03928c83
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
|
|
|
|
|
| |
Change-Id: I3cf1aeeec697f39ec5fa21fe84731b12c36d54f1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
| |
Change-Id: I70f4f4e81a042a977748dbb42b069b3706829828
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
| |
Before this commit, make install would always end up building
the examples and tests, even if qtbase was configured not to.
Change-Id: I898e1125a343a8e2749a055f4bd886256026de9d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
| |
This is convenient if we want to reconfigure without reconfiguring
QtBase.
Change-Id: I719ba0d89905287a557e962ed6d804514e44b7f5
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
|
|
|
|
|
| |
Change-Id: I2fda66c30736218ee847d9f6827709507c84c301
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Also fix so that QtCompositor can be built as shared object.
+ fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl
Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
|
|
Follow the typical qmake naming scheme of <directoryname>.pro.
Change-Id: I4dce85d1f64a9385079a675dfc1e8e1f31483a15
Reviewed-on: http://codereview.qt-project.org/5760
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
|