aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix library namev5.14.0-beta2v5.14.0-beta1BogDan Vatra2019-10-011-1/+1
| | | | | | Fixes: QTBUG-78616 Change-Id: I2f244ed2161b2971fbecfd83d9298d120c7801fe Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-241-1/+1
|\ | | | | | | Change-Id: I5400f7f7797686d7621f7453fbe0fbc1929c9df6
| * Doc: Fix typoPaul Wicking2019-09-201-1/+1
| | | | | | | | | | Change-Id: Ibcd295e8aa571f788deec2488ce11f5635f499cf Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|\| | | | | | | Change-Id: Ibf73f6fef94aac10d433c849036a0ccc7cb96d3c
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I99ddb3635b6bbad1613075a348f88f18bd320c64 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-252-16/+16
|/ | | | | | Task-number: QTBUG-76491 Change-Id: I541179bcf59886ab0759d566e203decdf0ed2ce0 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-231-2/+2
|\ | | | | | | Change-Id: I30d5db204888885e9cf490d72041377402558398
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-2/+2
| |\ | | | | | | | | | Change-Id: I0824edbea393edace8932ae07f6e6b2520c64f57
| | * Doc: Add missing word in description of buttonDownPaul Wicking2019-03-291-2/+2
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-74818 Change-Id: I5e780c6a466afaec4b4efa3f63e8b9607471f651 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Liang Qi2019-04-161-2/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/gamepad/qgamepad.cpp Change-Id: I634213e4d668c778250dbd848f7dbd319c8457f1
| * | Doc: Remove redundant see also entryPaul Wicking2019-04-101-4/+0
| |/ | | | | | | | | | | | | | | | | | | It isn't obvious why this entry is relevant. It is also inconsistent with the surrounding documentation. Fixes: QTBUG-74819 Change-Id: I1887c1c3f793464420ed0cbf56348f041abec653 Reviewed-by: Frederik Schwarzer <bugfinger@posteo.de> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-181-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-73484 Change-Id: I11f253e9eea2f317b78156418719ffe1c06bd330 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-091-0/+13
|\| | | | | | | Change-Id: I79f1b074321ae173864de33bcfadd07cce88a87b
| * Define BTN_TRIGGER_HAPPY definitions when they are missing from kernelTony Sarajärvi2019-03-081-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | With some old kernel versions (i.e. 2.6.32) used by RHEL 6.10 for example, these definitions are simply missing. They reappear in later distros. If they are missing from the distro, let's define them our selves. Task-number: QTBUG-74219 Change-Id: Id2a1e24097fc6710b28288d6144b761790156251 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Doc: Fix minor issuesTopi Reinio2019-03-041-32/+7
|/ | | | | | | | Fix linking to GamepadManager::connectedGamepads property, remove unnecessary \readonly commands, as well as other minor issues. Change-Id: I0d9fd977a3824ac3e52e3a9e3bb5584673bfc6c1 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Doc: Add doc to QML types in Qt Gamepad moduleNico Vertriest2019-01-293-34/+269
| | | | | | Task-number: QTBUG-70270 Change-Id: I6acccf981da23bae9ec83a8d2b5b17b6c2449061 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove wince check as it is not supportedOliver Wolff2018-11-221-1/+1
| | | | | Change-Id: Ie91a95808c3e4319815bc3e760c3450bd69665cd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update QML registrations and plugin.typesv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Alex Blasche2018-09-133-3/+13
| | | | | | | | | | As a matter of Qt convention, the minor version of the QML API matches the general Qt minor version. Starting with Qt 6 the major version should match too. Task-number: QTBUG-70264 Change-Id: I57ab6af5b8bdc7aeba9972f9611d00071cc460d8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-301-1/+0
|\ | | | | | | Change-Id: I8dbe989c0663d26fe22556b7adbbb9c1b1015cc0
| * Doc: Remove navigation.homepage causing invalid qdoc warningsPaul Wicking2018-06-251-1/+0
| | | | | | | | | | | | | | | | | | | | As gamepad is now an addon and no longer in tech preview, the navigation.homepage configuration variable is no longer needed. As it happens to cause a range of warnings from qdoc, let's get rid of it. Change-Id: Iebfa64eeb87cf664ed3c871d003d9107e5da661a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-1/+1
|\| | | | | | | Change-Id: I6a97101dc3801171724d6c8bca53a0a46f34651c
| * Doc: Add missing dots (qtgamepad)Paul Wicking2018-06-191-1/+1
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: Ida6cb8a63752c1dc127fcbe807e9f40b68f75772 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-8/+1
| | | | | | | | | | | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: Iebfa316887d144728ecd3d173e40139cd1c1fcce Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Clean up our Objective-C usageLiang Qi2018-03-081-9/+7
|/ | | | | | | | | | Following ba871065e0f40e9197fa4ee0ffe76530bb6fca11 in qtbase. - Move ivars into @implementation - Use instancetype where applicable Change-Id: I33be9b380e3bea6bd54be1d0bfd7e3e7072fc82a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove obsolete code pathsJake Petroules2018-02-121-4/+1
| | | | | Change-Id: Ib8c26b7697d03f24b4efe18f2e8a4a2573e1bd3b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-205-20/+21
|\ | | | | | | Change-Id: Id3a493d6e7366b9c17d4af94b42d7b6f10973835
| * Fix outdated FDL license headerKai Koehne2017-10-174-20/+20
| | | | | | | | | | Change-Id: I3f63e9c1a635fbbc61ae62ee4d132ee635c66c87 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Android: Fix compile with clang and unified headersBogDan Vatra2017-08-171-0/+1
| | | | | | | | | | Change-Id: I73c57348329628f2f7b1923332a9831ed0b64363 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
* | SDL Controllers: report the Joystick nameAndrea Odetti2017-10-161-2/+6
| | | | | | | | | | | | | | | | | | | | The controller name is a generic "XInput Controller", while the joystick is more meaningful (e.g.) "Microsoft X-Box 360 pad", the same as evdev. Change-Id: If93acdadb20f0601cc08069efed4718b4320d3a3 Reviewed-by: Andy Maloney <asmaloney@gmail.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Fix header include guards to reflect the actual file namesAndy Maloney2017-10-098-24/+24
| | | | | | | | | | | | Change-Id: I125a5e3f77649e6c9e8f18ebcfaa23599dc79b84 Reviewed-by: Andrea Odetti <mariofutire@gmail.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Propagate the gamepad name from the backend to QGamepadAndrea Odetti2017-10-067-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | Added signals and slots to forward the name to QGamepad. Previously the property name and signal nameChanged in QGamepad were never used. Now the plumbing is done and the 2 linux backends (evdev and SDL2) forward the name. Change-Id: I97261769524ddb23a31789e362e6de7bb30694f3 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-261-1/+1
| | | | | | | | | | Change-Id: I91a5ea5ace5fb8116ce6d369b9c3c5fb5bdaae83 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Android: remove support for local/debug deploymentJake Petroules2017-09-065-26/+18
|/ | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: I940eaf71a55c589b740489660f49ef30feb79cab Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Disable senseless GCC 7 warning about maybe-uninitialized fieldsThiago Macieira2017-06-301-0/+3
| | | | | | | | | | | | | | | | | | The GCC 7 output makes no sense because it doesn't explain where the problem was. It only lists what fields were maybe uninitialized. In file included from qevdevgamepadbackend.cpp:37:0: qevdevgamepadbackend_p.h: In member function ‘T& QHash<K, V>::operator[](const Key&) [with Key = int; T = QEvdevGamepadDevice::EvdevAxisInfo]’: qevdevgamepadbackend_p.h:82:12: error: ‘<anonymous>.QEvdevGamepadDevice::EvdevAxisInfo::flat’ may be used uninitialized in this function [-Werror=maybe-uninitialized] struct EvdevAxisInfo : public QGamepadBackend::AxisInfo<int> ^~~~~~~~~~~~~ qevdevgamepadbackend_p.h:82:12: error: ‘<anonymous>.QEvdevGamepadDevice::EvdevAxisInfo::gamepadMinButton’ may be used uninitialized in this function [-Werror=maybe-uninitialized] qevdevgamepadbackend_p.h:82:12: error: ‘<anonymous>.QEvdevGamepadDevice::EvdevAxisInfo::gamepadMaxButton’ may be used uninitialized in this function [-Werror=maybe-uninitialized] qevdevgamepadbackend_p.h:82:12: error: ‘<anonymous>.QEvdevGamepadDevice::EvdevAxisInfo::gamepadLastButton’ may be used uninitialized in this function [-Werror=maybe-uninitialized] Change-Id: Ia3e896da908f42939148fffd14c4b1ac4a7f6943 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix SDL plugin building on PPC64leAndy Nichols2017-05-231-0/+2
| | | | | | | | SDL.h redefines bool, which breaks the build. Task-number: QTBUG-60679 Change-Id: I1ae833b26e867c0127000d8b09eb53fe8cdac0b8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix bundling of module for static buildsJulian Strobl2017-05-051-0/+8
| | | | | | | | | | | | | | Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: I7c517ec22b4e3cad11bc961a76473111c2731823 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-241-1/+1
| | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I27602edbe6895215a640a25bc1427732d9a8d550 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3Liang Qi2017-04-181-7/+12
|\ | | | | | | Change-Id: I29de95f0b639059e3aa6c678f0a8ce2a38026587
| * Fix build with -no-feature-library5.8Ulf Hermann2017-03-171-7/+12
| | | | | | | | | | | | | | | | | | | | The previous code produced warnings about unused parameters. We can actually load (static) plugins without QLibrary. Try to do so and warn if we are trying to load from a specific location. Change-Id: Icd396f1e4bb2d5200b1693d2230d87b502aa275b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Doc: correct link specification xboxdrvv5.9.0-beta2Nico Vertriest2017-04-101-1/+1
| | | | | | | | | | Change-Id: Iab0d80411af0f0b02488331bafd98d543a592754 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Doc: complete specification parameter keyv5.9.0-beta1Nico Vertriest2017-03-301-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qgamepadkeynavigation.cpp:409: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonAKey() qgamepadkeynavigation.cpp:421: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonBKey() qgamepadkeynavigation.cpp:481: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonGuideKey() qgamepadkeynavigation.cpp:493: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonL1Key() qgamepadkeynavigation.cpp:517: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonL2Key() qgamepadkeynavigation.cpp:541: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonL3Key() qgamepadkeynavigation.cpp:505: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonR1Key() qgamepadkeynavigation.cpp:529: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonR2Key() qgamepadkeynavigation.cpp:553: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonR3Key() qgamepadkeynavigation.cpp:457: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonSelectKey() qgamepadkeynavigation.cpp:469: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonStartKey() qgamepadkeynavigation.cpp:433: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonXKey() qgamepadkeynavigation.cpp:445: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setButtonYKey() qgamepadkeynavigation.cpp:373: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setDownKey() qgamepadkeynavigation.cpp:385: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setLeftKey() qgamepadkeynavigation.cpp:397: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setRightKey() qgamepadkeynavigation.cpp:361: warning: Undocumented parameter 'key' in QGamepadKeyNavigation::setUpKey() Change-Id: I52530e983c1abe000681cbf78356e51639490208 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-102-3/+3
|\| | | | | | | Change-Id: Ic7edff3a9f06ae205a5944e423d9ecbbfa321896
| * Fix -Wsign-compare warningRoland Winklmeier2017-01-261-1/+1
| | | | | | | | | | Change-Id: I936c06df1c75f03c57b4f34b67c76ca50db64ee0 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * Android: add override to fix warningsv5.8.0-rc1v5.8.0BogDan Vatra2016-11-291-2/+2
| | | | | | | | | | Change-Id: Iab3c25d019f707b90d6cd36028c3192f47293976 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Doc: documented methods qgamepadmanager.cppTopi Reinio2017-03-091-0/+37
| | | | | | | | | | Change-Id: I5334ccd62324fa836c760903184f5b2c9951e141 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Doc: minor language corrections qgamepad.cppv5.9.0-alpha1Nico Vertriest2017-02-131-43/+54
| | | | | | | | | | Change-Id: I30862f47396dc4a1fb0cc9cdaf0e54dafe06582a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: documented methods in qgamepadkeynavigation.cppNico Vertriest2017-02-031-2/+115
| | | | | | | | | | Change-Id: If292fca8a81aaba20a12fa79eea0031468f28c32 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Merge remote-tracking branch 'origin/dev' into 5.9Andy Nichols2017-01-3121-602/+745
|\ \ | | | | | | | | | Change-Id: Ieaf48cf0764f9cdf32f656233252cdfe451ab22f
| * | General Module CleanupsAndy Nichols2017-01-3117-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed reference to bsquask nullptr instead of 0 explicit override keyword for virtuals Q_SLOTS and Q_SIGNALS instead of keywords Change-Id: I7dd96fa66003c52fe2d26decca73224b70896baa Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | PImplize the public exportsAndy Nichols2017-01-306-557/+699
| |/ | | | | | | | | | | | | | | QGamepad, QGamepadManager, and QGamepadKeyNavigation needed private implementations. Change-Id: I592933f2b8a3101f0a7b9eeaf789e6ac8e2bc15b Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 15:19:15 +0000