summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix qtwaylandscanner package dependencieswip/cmakeAlexandru Croitor2020-03-264-6/+16
| | | | | | | | | | | | | | | Use the new API provided in qtbase, to register a package dependency between the client module and the QtWaylandScannerTools package. Do the same for the compositor module. Also register a dependency between the QtWaylandScannerTools package and the WaylandScanner package. Also fix the tests condition to check the correct _FOUND variable. Change-Id: Id961a365715cef2d7d0b8a54ca9000dc3890ffd7 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate and adjust projects after mergeAlexandru Croitor2020-03-2698-484/+773
| | | | | | | | | | | | | | | Some of the changes that were needed - adjusted wayland macros due to changed target names for plugins - a few direct moc file includes, to get rid of compilation errors - Threads::Threads linking for a few tests - a few special cases for QT_FOR_PRIVATE handling because pro2cmake doesn't handle those correctly at the moment (they map to PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES) - just regenerating all projects Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-26140-479/+3739
|\ | | | | | | Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-251-2/+2
| | | | | | | | | | Change-Id: I82470897b4059d68d10f4c8fe01ad5f2cc9c6aff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-251-2/+2
| | | | | | | | | | Change-Id: Ic98cc17974ef4ea19b59663319640131eb052251 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-241-2/+2
| | | | | | | | | | Change-Id: I320cb4fd7a58354bd9249823b4707c7d90da37d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-231-2/+2
| | | | | | | | | | Change-Id: Ibcc378dc1735539f93eefe95dae0cbed1989f85b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-201-2/+2
| | | | | | | | | | Change-Id: Ic5e944d1a4524c88e33468185ef16abfaabd93ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-191-2/+2
| | | | | | | | | | Change-Id: I6e18a5cb2e4516a8119d6541d66da60f63fe9f40 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-181-2/+2
| | | | | | | | | | Change-Id: Iea182ceb5fef70b78216623aa8ee4fd9aea1e3b6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix build after event API changesSimon Hausmann2020-03-161-5/+5
| | | | | | | | | | | | | | Some deprecated functions were removed in dev. Change-Id: Iad9910051efe0a499f0e0a4f2e151c39ddd0fcd0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix build after header changes in qtbaseSimon Hausmann2020-03-161-0/+1
| | | | | | | | | | | | | | QPainterPath is not implicitly included anymore. Change-Id: I5a7a7c9a69f7cdee04c5ca7798811daac15b7bd5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix build after QOpenGLShaderProgram library moveSimon Hausmann2020-03-161-1/+1
| | | | | | | | | | | | | | The class is now in QtOpenGL. Change-Id: Ifef8dfa753fb5d337d516a33fc49e610c7c8c6eb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix build after header changes in qtbaseSimon Hausmann2020-03-163-0/+4
| | | | | | | | | | | | | | QTouchDevice is not implicitly included anymore. Change-Id: I4fcfdb70e1850da7243b520df8b2d1deba2e7424 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Prospective build fix after meta-type changesSimon Hausmann2020-03-1613-0/+14
| | | | | | | | | | | | | | | | | | The moc generated code needs to have full visibility into all types used in properties, so Q_MOC_INCLUDE statements are needed to ensure the generated code is compiled with the right includes. Change-Id: I73552a916430cf7db14121f2ba1ec610e5b3382f Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-03-161-2/+2
| | | | | | | | | | Change-Id: I2550520ceafa39d8416fcb75705faa7e4c200bbd Reviewed-by: Simon Hausmann <simon.hausmann@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>
| * Client: Remove recursion in data offer retrievalDavid Edmundson2020-02-201-17/+20
| | | | | | | | | | | | | | | | | | A loop functions just as well is more readable and uses less stack memory. Change-Id: I6f6c6b7b8047c42080fb8b9e0bc3eae96f8872ab Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Fix compile errors in testsJohan Klokkhammer Helsing2020-02-192-6/+6
| | | | | | | | | | | | | | const qualifiers made default assignment operators invalid. Change-Id: I8b22a04f6e2f3b9b76a971b0a59f5fdce589c8e5 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * Inject OpenGL dependency for backing storeJohan Klokkhammer Helsing2020-02-192-1/+11
| | | | | | | | | | | | | | | | | | The backing store no longer has OpenGL support by default, so we need to enable it. Task-number: QTBUG-74409 Change-Id: Ie132dae523db86091134279ade61cffe2ff10a73 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * QWaylandCursorTheme: replace a QMap with a C arrayMarc Mutz2020-02-112-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QMap's key is an enumeration with small values (<= 33, as of this writing), and while the range has a hole, it's not a terribly big one. So, instead of using a QMap, just use a C array of mapped_type, using the key as an index into the array. This gives a 'map' with zero memory allocations. It also saves a bit more than 700B in text size on optimized Linux AMD64 GCC 9.1 builds. Change-Id: If538ba80075f1bbdffd82b070e871391e6a5a6d1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+0
| | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: I3560edc79cdd28c77ec2a4344b8744ff0597d3dc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-02-041-2/+2
| | | | | | | | | | Change-Id: Ib257b01b41acf92d958eff6ad1829f5dbdb4567d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-02-021-2/+2
| | | | | | | | | | Change-Id: I7dc4bf5c7ecb15af8cd7007c0cc97c7a9cddf61d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-02-011-1/+1
| | | | | | | | | | Change-Id: I8f22a8cc7ad4c21bb8fb9fd464b85526ce95c131 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-013-1/+44
| |\ | | | | | | | | | Change-Id: I064b614b3390d9b744afb3ac437096109b53b1d5
| | * Turn QNX key codes into xkbcommon key codesJames McDonnell2020-01-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just requires adding 8 to the key code when the platform plugin is qnx. Inherited from evdev which inherited it from XKB. It's easier to conform to the requirement than remove it. Change-Id: Icd32ebf27256f29405821c7c8b7b8d93ff7f8fe0 Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * Client: Temporarily disable QPA startSystemMoveJohan Klokkhammer Helsing2020-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signature of startSysteMove has changed, remove the override temporarily so qt5.git can update. Then we can add the correct override back afterwards. Fixes: QTBUG-81751 Change-Id: I4ef9aec1e8299e853be4ef868ecfc3a374ae6f27 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+34
| | |\ | | | | | | | | | | | | Change-Id: Ic93b75388cd3322f883c2facc3022a9aa2758f0c
| | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+34
| | | |\ | | | | | | | | | | | | | | | Change-Id: I276371cd0eb2c4c550a8f26a225712a648962900
| | | | * Merge 5.14 into 5.14.1v5.14.1Kari Oikarinen2020-01-151-2/+5
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I1a29dac00e66671e019fa7fdf60fe4894a6522a5
| | | | * | Add changes file for Qt 5.14.1Johan Klokkhammer Helsing2020-01-101-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 09861f0081e6729383808ac4803c7fd1f0ba6dd1 Fix detection of linux-dmabuf + 36974955d13578071387695adb13a47be33e4d32 Avoid animating single frame cursors + ce06115da6bf4c8d891ff0aa382dd2b1f5b4bf65 Add client test for touch down and motion in same frame + c2105d8b7e16cc934b886537968228f6300bf4bc Fix compilation of linuxdmabuf compositor plugin + 6e9d6f166dec65e91b4dbf73ccb60170e0a56dc8 Client: really use OpenGL ES 2 API for decoration blitter + d0137d3c48882a6f52de9fab93c3b02c0cff8282 Client tests: Fix missing frame event + 7c0833f4bc22d2d947c793f0711e3f1e1a09012c Client: Always close popups when hiding a window + 1d0863049111926e0ff827cf17f3a7087d53c5c3 Add client test for hiding the toplevel parent of a popup + a2be69d47884dd995ac6e9004ba2855f354f7522 Client: Fix detection of linux-dmabuf + 99daf1ce6f328ed5419df93e5dc7e02e31d54be9 Bump version + 80ed5501cf5dcc4b6ef2a1a126d9d564c1c73851 Client: Fix inverse repeat rate implementation + ce15889614f87b5986f997beffd2826471adfe51 Drive cursor animation with a timer + f7e035446355d9cb90141e508b5d33e019e14add Stop using modern C++ Change-Id: Ic94102c60c9513d331790a1d2434895eb17f5ff1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifdc374a5fdeed4c1c84d158d66b1849ca2a449cd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e5151fc503510644b4b6718702eee7f3b0de4de Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Fix build: Add dependency on OpenGL moduleJohan Klokkhammer Helsing2020-01-3036-38/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several of the QOpenGL* classes we depend on has moved to QtOpenGL, add the dependency and fix the include paths. Task-number: QTBUG-74409 Change-Id: Iab7949dd67befaa71cf2cfa041771e93f4e47160 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Update dependencies on 'dev' in qt/qtwaylandQt Submodule Update Bot2020-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d5f18eb138186c89564e0b1ef2311b71aa0e94e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-251-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | Change-Id: I62f1cbbf543021a9569e4d1e8c4f9e7c554e77f3
| | * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-211-0/+2
| | |\| | | | | | | | | | | | | | | | | | | | | Change-Id: I4e205974d29aef0443ad7aecdb43d5ab3ee1ec64
| | | * | | Avoid conflicting declaration for egl typedefsSamuli Piippo2020-01-201-0/+2
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The EGL typedefs may have alternative declaration on some platforms, such as NVIDIA, which cause build errors. Add guards around the typedefs to avoid re-declaration. Task-number: QTBUG-79709 Change-Id: I14f09c94e159ef51dd858f0877fe610ce6f582d4 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-1816-26/+96
| |\| | | | | | | | | | | | | | | | | | Change-Id: Ibd911372386f9f5fddb13afa05b84af6fe422fdd
| | * | | Enable QtWayland for QNXJames McDonnell2020-01-135-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make EGL 1.5 with EGL_PLATFORM_WAYLAND_EXT a requirement for QNX and add some EGL 1.5 code alternatives. Avoids the need to deal with incompatibility problems between the QNX native display/window type and Wayland display/window type. Change-Id: Ib26a020e1f8c7f570c6af08697d8c8153c887294 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Dan Cape <dcape@qnx.com>
| | * | | Client: Upgrade to xdg-output-unstable-v1 version 3Johan Klokkhammer Helsing2020-01-134-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QPA plugin] xdg-output-unstable-v1 version 3 is now supported. Change-Id: I054b2946e86175eabe76731bac94e5f287c4ee58 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| | * | | Don't use deprecated QMatrix class anymoreJarek Kobus2020-01-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-46653 Change-Id: I038a370ca8af642605709fa5ffdb1c619c60433b Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * | | Implement missing changed signals to propertiesPier Luigi Fiorini2020-01-104-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML cannot do property binding with properties without CONSTANT or NOTIFY. Also emit changed signal where it's not. Change-Id: I5117383e22085af08589f6aa05892676c24f3846 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| | * | | Update protocol for xdg-output-unstable-v1Johan Klokkhammer Helsing2020-01-092-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7d7a2fdbd1f44469b90c467c9490448c13025fa5 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * | | | Update qtbase dependencyPaul Olav Tvete2020-01-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPlatformScreen::isPlaceholder() is required. Updating to the latest version of qtdeclarative, and its qtbase dependency which should hopefully avoid rebuilding too much. Change-Id: I87bf63792fc9c22a55a163dfb2f861321bc8cc34 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * | | | Merge remote-tracking branch 'qt/5.15' into devPaul Olav Tvete2020-01-0970-231/+3386
| |\| | | | | | | | | | | | | | | | | | Change-Id: Id0bb84667482232cb648f4984e9f9e2ea4c360c6
| | * | | Merge "Merge remote-tracking branch 'qt/5.14' into 5.15"Paul Olav Tvete2020-01-091-2/+5
| | |\ \ \
| | | * | | Merge remote-tracking branch 'qt/5.14' into 5.15Paul Olav Tvete2020-01-091-2/+5
| | | |\| | | | | | | | | | | | | | | | | | | | Change-Id: I21c6a0a4bc8df8dcaf9e33647482ba43c7b7d6c4
| | | | * | Avoid potential double deletionPaul Olav Tvete2020-01-091-2/+5
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not safe to use qDeleteAll on lists that change when elements are deleted. Change-Id: I7ec5b41da9eea839d1bda88bde621cc73a27927f Reviewed-by: Johan Helsing <johan.helsing@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 04:03:25 +0000