summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove QMake project filesJoerg Bornemann2021-02-111-27/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I57922bff138258f5b35d484caa4b00d84e924a06 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Simplify src.proJohan Klokkhammer Helsing2020-02-271-22/+12
| | | | | | | | This also makes it go more smoothly through the CMake conversion scripts. Task-number: QTBUG-78177 Change-Id: Iee6a3e64028c146a641f540fa5a187ac5ac6b77b Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* Make it possible to build only the compositor moduleJohan Klokkhammer Helsing2019-08-191-14/+16
| | | | | | | | | | | Reduces unnecessary coupling between the compositor and client modules. [ChangeLog][Compositor] The compositor module no longer depends on the client module. Change-Id: I108e56960835b6c31c450d5ae08a0a101af9422b Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* New texture sharing protocol and infrastructurePaul Olav Tvete2019-03-281-1/+1
| | | | | | | | | | | | | This adds a higher level protocol on top of the server buffer extension, providing an easy way for Qt Quick applications to use the shared textures. [ChangeLog] Added protocol and Qt Quick image provider for sharing textures in graphics memory between compositor and multiple clients. Task-number: QTBUG-73822 Change-Id: Idc41b3479d6ca37be35d9ccd7b89e9994ff17f8f Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* Fix platform integration not building with -no-feature-wayland-serverJohan Klokkhammer Helsing2019-01-231-6/+8
| | | | | | | | | | | | The plugins subdir which includes the platform plugins was not built without the feature wayland-server. Moves the checks inside the plugins folder to make it build. Also disables some tests that won't pass without the compositor API. Fixes: QTBUG-73169 Change-Id: Ie68badd2ff62ee544c31edaff7c732082e0a4115 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move qtwayland over to use the new configuration systemLars Knoll2016-11-231-19/+27
| | | | | | | | | | | | | 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>
* Remove platformheadersLaszlo Agocs2016-02-111-2/+0
| | | | | | | Move it to qtbase. QtPlatformHeaders would otherwise conflict. Change-Id: I9fdabc64fb59f6190ca8c12e22f09912ef6a2fe1 Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
* Merge branch 'wip-compositor-api' into devPaul Olav Tvete2015-12-021-9/+10
|\ | | | | | | | | | | | | This introduces the new compositor API, removing the old API (which was never officially supported). Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913
| * Rename QtCompositor to QtWaylandCompositorJørgen Lind2015-09-101-13/+9
| | | | | | | | | | | | | | enable building QtWaylandCompositor by default Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * Add qml plugin for conveniently creating compositors in qmlJørgen Lind2015-08-281-0/+5
| | | | | | | | Change-Id: I76229c38489d6c72dfad9eace38cd8b6fd03dcae
* | Add QWaylandWindowFunctionsMikko Levonmaa2015-11-061-0/+2
|/ | | | | | | Allow the control of the subsurface sync mode Change-Id: I19f35261313282873f57228487a63a8f6a780b0c Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* build: If building the compositor API, build plugins after the compositor ↵Robin Burchell2014-08-271-0/+1
| | | | | | | | | library. Some plugins require the compositor library, so it must be finished first. Change-Id: I60d2932cdd0e777a0ad0dd866246c59b9a1f47fc Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Parallelize the QtWayland build.Robin Burchell2014-08-211-5/+17
| | | | | | | | Remove CONFIG += ordered and specify explicit dependencies to allow the Compositor and Client modules to be built in parallel. Change-Id: Ifc7ccbdb6fe6623609ad050ede1cbc995499e524 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Move wayland into a client directory not under the plugins src folderJorgen Lind2013-12-271-1/+1
| | | | | | | | | And make wayland common files into a library, exporting all classes. Now there is no need to do bulild hacks to make your own version of the wayland plugin. Change-Id: Ib4872863dfb5ab3f2bc0f4a94ae16fc1e7b63b88 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Introduced qtwaylandscanner.Samuel Rødal2013-04-171-0/+2
| | | | | | | | | | Generates C++ headers with Qt types based on the Wayland XML protocol files, to reduce a lot of code duplication in all the places that interface between Qt and the wayland protocol headers. Change-Id: I34a4417d3d3d0238de2f2f74986855d097b50ec9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* QtCompositor hardware integrations as pluginsAndy Nichols2013-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | Rather than defining which hardware integration should be used at compile time, we should build each hardware integration as a plugin, and load the one we want at runtime. The default hardware integration is wayland-egl, but you are able to override this using the environment variable QT_WAYLAND_HARDWARE_INTEGRATION Backends tested: wayland-egl xcomposite-egl Backends untested: xcomposite-glx brcm-egl Change-Id: Idee66574d232a9236898f68ca64145f471b1bb80 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Don't build QtCompositor unless explicitly enabledAndy Nichols2013-02-051-1/+5
| | | | | | | | | | | | | The QtCompositor API is to be considered experimental in Qt 5.1 and thus it should be disabled from being built by default. If the qmake variable CONFIG contains "wayland-compositor" then the QtCompositor API will be built. Change-Id: If10f5a688749f31338a80be45bbec22a0f2d12da Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Cleanup QtWayland moduleAndy Nichols2012-12-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | 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 the order of subdirsElvis Lee2012-10-081-1/+1
| | | | | | | | | | | Commit '272142f53790987b3f226ca70f942da927d99815' makes wayland.pro need qt_compositor.pri file for DESTDIR. But qt_compositor.pri is made by compositor.pro. So '/compsitor' must be compiled before '/plugins'. Change-Id: Iae993195e399ff1a66c438cd450355fc5d35935b Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Make wayland actually a moduleJørgen Lind2011-12-071-1/+1
| | | | | | | | | 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>
* Add root-level .pro filesLasse Holmstedt2011-07-291-0/+2
So that you can build from the root. By default, examples are not built.