aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-121-0/+24
| | | | | Change-Id: I6fc5a5ef06a10c108b2ae16f160606dfbf7d357c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Ic037ca1a826ffa61de58805e5d40375fd8cd7bd6
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
|\ | | | | | | Change-Id: Ib1c66be1c723e73c1e9e07fbeae7f43fbf0a152e
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-251-0/+22
|/ | | | | Change-Id: I5003127b78f6cf55e7e9e3901786d8caae4f7c05 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibf90b43225de08ea50ab255b1ae877e4f8072b05
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I7f3b240d7ddb9a559d8c9af1a58adc3ede0164d3
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: I7bc0566e9afa3076e24cb7daee2d38d2123ab1fe
| * | Add changes file for Qt 5.10.1v5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | Change-Id: I4fdd7f7addcf9ee4db2c74404bda205d337167e8 Reviewed-by: Andy Nichols <andy.nichols@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 Qi2018-01-202-0/+49
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I65259cbbae3074335478f54dc0ed5cb099fd8569
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id1598f42c2fa8a3f2eb16d1f0a357f14b4a2b028
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I78bf9e75cf1e22c6f28630dd8413e0953dfe9da6
| | | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | Change-Id: I340d345b73a3917e2c9500e92658eafed918136f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I8742ed00464dde5975c5c101ae2b8d63127e7e3d
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ie16d1f206e7da713a1e3b5c84613fc22539a4b8e
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0a0c102385c15374b1b62b29eda500d99df709ca
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I89e8ac1fb0fc37f4fc460ab49973c8193b44c7b8
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: Id7a9e3faa49c30204ef8a4f03d871001f34605ec
| | * | Add changes file for Qt 5.9.3v5.9.3Jani Heikkinen2017-11-081-0/+24
| | |/ | | | | | | | | | | | | | | | Task-number: QTBUG-64182 Change-Id: If9bfb31355d39ddcfc5d41bb08bfe1ddd954501e Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2026-87/+272
|\| | | | | | | | | | | Change-Id: Id3a493d6e7366b9c17d4af94b42d7b6f10973835
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+22
| | | | | | | | | | | | | | | Change-Id: Iecb8e6bb3b12ef961c0672bace077f0642b6b6e9 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3025-87/+250
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3f85d1c4f7e9bdb32ff8dd652c67c60c127748d6
| | * Fix outdated BSD license headerKai Koehne2017-10-1714-42/+182
| | | | | | | | | | | | | | | Change-Id: I87851e4882771a75121915d84c07dc8fc2feb8aa Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-179-45/+45
| | | | | | | | | | | | | | | Change-Id: I3f63e9c1a635fbbc61ae62ee4d132ee635c66c87 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I8a74cd6542c0438dad5875942a967595116cab9c
| | * Add changes file for Qt 5.9.2v5.9.2Antti Kokko2017-09-221-0/+22
| | | | | | | | | | | | | | | Change-Id: Id48f935aa4fa24d856c62a9b505ed6b513892ea8 Reviewed-by: Andy Nichols <andy.nichols@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>
* | | Turn on debug logging for simple gamepad exampleAndy Maloney2017-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The example fails silently, so turn on debug logging so we can see what's happening and add a debug message if it fails to find any gamepads. Change-Id: I5ceedc9734836e1a44788c0912c3cbcfbb7cb158 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>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: I188d6156e9df8dd3c27cfa6a8a4208ff6ce81fd4
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Liang Qi2017-08-152-0/+27
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1c6e79301402751efe0e38d48cd7b1235c3c7942
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\ | | | | | | | | | Change-Id: I40768f2ebf3cf5d0dee8cf675a117f6c399efd3c
| | * Add changes file for 5.9.1v5.9.1Antti Kokko2017-06-231-0/+24
| | | | | | | | | | | | | | | Change-Id: I448c19d42f60d117bbc3b2026e07ed5c5d6ae173 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: Iec48659c33eb221c80363f9aded099cf27089c60
| * | 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>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-074-1/+27
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icc2815181c118f89f333dc134ecf43b5671d2d38
| * 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>
| * Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: I969d5b16166f294526d52d3ed47a342241d99c05
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.0-beta4v5.9.0Antti Kokko2017-05-051-0/+16
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I11fe03419bcf0250878c33cbb75fc7bf9454bc4b Reviewed-by: Andy Nichols <andy.nichols@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.9' into devLiang Qi2017-04-2117-701/+930
|\| | | | | | | Change-Id: I2777e210906f77bea547c3afab08e27ae6886185
| * 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>