summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor.pro
Commit message (Collapse)AuthorAgeFilesLines
* Use the feature system internallyLars Knoll2016-11-231-2/+0
| | | | | | | | | Get rid of almost all DEFINES += ... in the pro files, instead use the proper QT_CONFIG() macro to determine whether a feature is available. Change-Id: I867769be2085c6ba93b6815e223e2b89edcb245d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Move qtwayland over to use the new configuration systemLars Knoll2016-11-231-7/+2
| | | | | | | | | | | | | 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>
* Compositor: Rename shm to sharedMemoryJohan Klokkhammer Helsing2016-07-111-1/+1
| | | | | | | | sharedMemory is much clearer and will increase the readability of the code and API. Change-Id: Ibb6d7424fa8d44a94a0f4ddf476a564eb235323f Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
* Rename QT_COMPOSITOR_WAYLAND_GL to QT_WAYLAND_COMPOSITOR_GLJohan Klokkhammer Helsing2016-07-011-1/+1
| | | | | | | | Qt Wayland Compositor is the name used for the module elsewhere. Change-Id: I28813d50f1aed86f49a31aa54d27ea4ed2770d6a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
* Rename private headers to _p.hPaul Olav Tvete2016-05-191-2/+8
| | | | | | Change-Id: I0f0d1bd8efabc39325eec7dba4166ae0bccbf6ff Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* QtWaylandCompositor: Add support for different EGL buffer formatsLouai Al-Khanji2016-04-291-0/+1
| | | | | Change-Id: Idfeeedbf247fa81dccdf28a1aa04f878900ed262 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Fix text-input support for new APIJan Arne Petersen2016-04-181-2/+2
| | | | | | | | | | | | | | | | Update text input support to upstream text-input protocol v2 from wayland-protocols. Remove support for input-method protocol for now. Map text-input protocol on compositor side to the Qt input method API, this allows to use any qt platform input method on compositor side (especially qtvirtualkeyboard). Add support for qtvirtualkeyboard to pure-qml example. Implement all missing functions of the text-input protocol. Change-Id: I597451ff65454a63dff86026b6a8d1ffbe07ce02 Done-with: Zeno Endemann <zeno.endemann@kdab.com> Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
* Merge remote-tracking branch 'qt/5.6' into 5.7Paul Olav Tvete2016-03-081-6/+6
|\ | | | | | | Change-Id: Iada0e076ee33e8d39ecc4f40edfd9764ba610c03
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-4/+3
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ie9e89fa47696244e8ee478ed1a019765c835533e Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Add missing QT+=quickLaszlo Agocs2016-01-281-0/+2
| | | | | | | | | | | | | | | | | | This is important for the build system esp. in prefixed builds when cross-compiling. Otherwise compositor apps will complain not finding libQt5Quick.so. Change-Id: Idfd5a2f0ab02d63d761ed69e60310525cb8cdf9e Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Doc: Rename the qdocconf to match the doc project nameVenugopal Shivashankar2015-12-151-1/+1
| | | | | | | | | | | | | | | | qmake assumes that the conf file name and the project name are same, so 'make docs' fail if they are different. Change-Id: Ic4784524c50cd085096fbf8853138b48d818fd61 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Add documentation to Qt Wayland CompositorEskil Abrahamsen Blomfeldt2015-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | This adds some preliminary documentation for the Qt Wayland Compositor. There are a few classes which remain undocumented. The documentation in some areas may be a bit minimal, but this can be expanded gradually with code examples and more details. Change-Id: I5d285a5a25e8602ac2fdddc84c3fd217e7b77c95 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Rename QtCompositor to QtWaylandCompositorJørgen Lind2015-09-101-1/+2
| | | | | | | | | | | | | | enable building QtWaylandCompositor by default Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* | Rework how we manage extensionsJørgen Lind2015-08-281-1/+1
|/ | | | Change-Id: If2cbf096e7419bc1bda007d5167ce39d1a5d50ae
* Disable headers precompilationGiulio Camuffo2014-06-041-0/+1
| | | | | | | | | | | | qtbase's cb09e1e enables precompiled headers by default. Unfortunately qmake tries to precompile them as C headers as a dependency of the .c protocol files we have, failing the build. Quick and easy solution: disable them alltogether. Change-Id: I96a4f4fd1fe0d3a83bb990408f1f3994650d96c5 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* build fix for MODULE_PLUGINS_TYPETomasz Olszak2014-04-151-0/+1
| | | | | Change-Id: I8d44f50480440060eba84354e88fb2535e1d8e4a 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/+0
| | | | | | | | | 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>
* use private linkage where possibleOswald Buddenhagen2013-11-041-1/+1
| | | | | | Change-Id: I36fbe9f77092a5a3cb7148e26e9315d9e14384ec Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Install qwayland-server-wayland.hPier Luigi Fiorini2013-05-281-0/+1
| | | | | | | It's required by the private QtCompositor API. Change-Id: I2f00fb5f60e5b849bb9656deef998ef3a1fb26e4 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Qt-ify the QtCompositor moduleAndy Nichols2013-02-081-1/+20
| | | | | | | | | | | | | | | | | | | | Currently the QtCompositor library and API do not follow the Qt API naming conventions. This commit intends to fix these inconsistencies. filenames start with q headers containing private API's end in _p public API classes begin with Q use the qt namespace macros where necessary Wayland namespace is now QtWayland wayland_wrapper classes are now private API's It's important to make these changes not just for stylistic reasons, but also because when qmake builds the module in checks for these conventions to determine how to deploy the include files. Change-Id: I8bfadeceda92a0f52cb73c704551da75540e7587 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: Iba6a04a12450ef81635bc76e72d737c67cc5f096 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Still support building with pri filesJorgen Lind2012-07-051-2/+0
| | | | | Change-Id: I1f537b8dc69359ab250b972b21673b2b4499843e Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-271-3/+1
| | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - qmake -project boilerplate - dead code Change-Id: Ia515c3cc40170e3b99b0bfd04c10637d49f9b99f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-271-2/+5
| | | | | Change-Id: I4f5c243d01f1b00f7cced6487dd4a5fa4fb072e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Introduce standard pkg-config usageDonald Carr2012-06-111-3/+0
| | | | | | | | Use our own qualified pkg-config mkspec feature rather than directly executing the system binary Change-Id: I4b162cd8d2d9a8bd5d0b3adb9ca935df9ff96a69 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Make QtCompositor.so compile with pkg-config as a defaultJørgen2011-12-301-0/+3
| | | | | Change-Id: Ibf599e66a6172e4fedbb41be4e179f43ce21d5c2 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Make wayland actually a moduleJørgen Lind2011-12-071-0/+10
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 19:27:37 +0000