Commit Graph

153 Commits

Author SHA1 Message Date
Kari Oikarinen c1e85ac245 Bump version
Change-Id: I39a975731735780a8f3c808bd32ac549d949bb9e
2018-12-12 09:43:41 +02:00
Qt Forward Merge Bot d8f4ce34bc Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: I9c61834c1800c3e6e2068da1dcbf46bc63eb73a4
2018-12-04 09:38:10 +01:00
Antti Kokko 4005b78c2b Add changes file for Qt 5.11.3
+ e542b1b6c4 Bump version

Change-Id: I7ab7457ce67d67630cbe2d8170e89509eed059b9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-16 12:39:02 +00:00
Oswald Buddenhagen e542b1b6c4 Bump version
Change-Id: If04fa79ac76666bad867b015042b784e63d5690e
2018-11-08 11:28:15 +01:00
Qt Forward Merge Bot e3b436f671 Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I5fa599753aab33d126e20ce1c8258d2aceab35b8
2018-09-09 12:13:49 +02:00
Antti Kokko 4bac917db8 Add changes file for Qt 5.11.2
Change-Id: Ie47a28002ee16b8a49c2948e3143f7a4b52b5d27
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-09-04 17:07:35 +00:00
Antti Kokko 7d1b726d0c Add changes file for Qt 5.9.6
Change-Id: I81a407f02b01fbf876f1e9fb09a5829b7664f1e5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 91b692255f)
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-07-31 06:13:17 +00:00
Oswald Buddenhagen 98ea3cf16e Bump version
Change-Id: I0533169546c17a56bcc2f9fdde23c1f59d6c69dd
2018-07-30 18:47:27 +02:00
Paul Wicking 8f7dea835e Doc: Remove navigation.homepage causing invalid qdoc warnings
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>
2018-06-25 10:17:43 +00:00
Qt Forward Merge Bot 505653220f Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: I78222a642bde0ad3f61d6cb7e73c297ba75d18cc
2018-06-19 13:17:16 +02:00
Paul Wicking e8dc617f6f Doc: Add missing dots (qtgamepad)
Task-number: QTBUG-68933
Change-Id: Ida6cb8a63752c1dc127fcbe807e9f40b68f75772
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2018-06-19 09:54:25 +00:00
Antti Kokko e782f61b6e Add changes file for Qt 5.9.5
Change-Id: I2a799a2452077162058fda68279e31a4cad5430a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 8534086482)
2018-06-14 11:57:58 +00:00
Antti Kokko 4d393b920d Add changes file for Qt 5.11.1
Change-Id: I6fc5a5ef06a10c108b2ae16f160606dfbf7d357c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-06-12 18:45:07 +00:00
Oswald Buddenhagen c738dcf087 Bump version
Change-Id: Ic037ca1a826ffa61de58805e5d40375fd8cd7bd6
2018-05-31 14:05:12 +02:00
Qt Forward Merge Bot 32ce7e8af9 Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ib1c66be1c723e73c1e9e07fbeae7f43fbf0a152e
2018-05-09 13:50:12 +02:00
Antti Kokko e175347926 Add changes file for Qt 5.11.0
Change-Id: I5003127b78f6cf55e7e9e3901786d8caae4f7c05
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2018-04-25 10:27:52 +00:00
Liang Qi 313f221381 Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	.qmake.conf

Change-Id: Ibf90b43225de08ea50ab255b1ae877e4f8072b05
2018-02-18 20:38:33 +01:00
Liang Qi 9152a285cd Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I7bc0566e9afa3076e24cb7daee2d38d2123ab1fe
2018-02-14 10:26:39 +01:00
Jake Petroules dd85775b20 Remove obsolete code paths
Change-Id: Ib8c26b7697d03f24b4efe18f2e8a4a2573e1bd3b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
2018-02-12 21:20:06 +00:00
Antti Kokko e6f366618d Add changes file for Qt 5.10.1
Change-Id: I4fdd7f7addcf9ee4db2c74404bda205d337167e8
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2018-02-05 10:13:56 +00:00
Oswald Buddenhagen da6d567a54 Bump version
Change-Id: I7f3b240d7ddb9a559d8c9af1a58adc3ede0164d3
2018-02-02 15:12:49 +01:00
Liang Qi 0ed771f504 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.qmake.conf

Change-Id: I65259cbbae3074335478f54dc0ed5cb099fd8569
2018-01-20 22:40:37 +01:00
Liang Qi 544d3e4f6f Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.qmake.conf

Change-Id: Id1598f42c2fa8a3f2eb16d1f0a357f14b4a2b028
2018-01-18 21:26:01 +01:00
Liang Qi d252eb8ae4 Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: I78bf9e75cf1e22c6f28630dd8413e0953dfe9da6
2018-01-18 11:00:56 +01:00
Antti Kokko 992c0825c5 Add changes file for Qt 5.9.4
Change-Id: I340d345b73a3917e2c9500e92658eafed918136f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-01-08 08:55:01 +00:00
Oswald Buddenhagen ad15ca2728 Bump version
Change-Id: I0a0c102385c15374b1b62b29eda500d99df709ca
2017-12-20 12:07:12 +01:00
Oswald Buddenhagen 7eaac05228 Bump version
Change-Id: I8742ed00464dde5975c5c101ae2b8d63127e7e3d
2017-12-12 09:55:58 +01:00
Liang Qi f2983c524d Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I89e8ac1fb0fc37f4fc460ab49973c8193b44c7b8
2017-12-08 13:58:07 +01:00
Liang Qi c1e52bd4a3 Merge remote-tracking branch 'origin/5.9.3' into 5.9
Change-Id: Ie16d1f206e7da713a1e3b5c84613fc22539a4b8e
2017-11-23 09:48:47 +01:00
Liang Qi b505116ee4 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Change-Id: Id7a9e3faa49c30204ef8a4f03d871001f34605ec
2017-11-21 11:04:29 +01:00
Liang Qi 4ca89439b3 Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Id3a493d6e7366b9c17d4af94b42d7b6f10973835
2017-11-20 13:17:05 +01:00
Antti Kokko 2c9609cb0a Add changes file for Qt 5.10.0
Change-Id: Iecb8e6bb3b12ef961c0672bace077f0642b6b6e9
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2017-11-10 05:58:37 +00:00
Jani Heikkinen 2ed733d1cb Add changes file for Qt 5.9.3
Task-number: QTBUG-64182
Change-Id: If9bfb31355d39ddcfc5d41bb08bfe1ddd954501e
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2017-11-08 07:55:56 +00:00
Liang Qi 69dd73addc Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.qmake.conf

Change-Id: I3f85d1c4f7e9bdb32ff8dd652c67c60c127748d6
2017-10-30 09:03:16 +01:00
Kai Koehne 0e2408a272 Fix outdated BSD license header
Change-Id: I87851e4882771a75121915d84c07dc8fc2feb8aa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-10-17 12:42:12 +00:00
Kai Koehne 704114e192 Fix outdated FDL license header
Change-Id: I3f63e9c1a635fbbc61ae62ee4d132ee635c66c87
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-10-17 12:42:08 +00:00
Andrea Odetti 5f5cebfa1b SDL Controllers: report the Joystick name
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>
2017-10-16 19:37:20 +00:00
Andy Maloney 6f53e8b7d9 Fix header include guards to reflect the actual file names
Change-Id: I125a5e3f77649e6c9e8f18ebcfaa23599dc79b84
Reviewed-by: Andrea Odetti <mariofutire@gmail.com>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2017-10-09 08:49:18 +00:00
Andy Maloney 6bc67065a2 Turn on debug logging for simple gamepad example
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>
2017-10-09 08:48:52 +00:00
Andrea Odetti 0cea22b644 Propagate the gamepad name from the backend to QGamepad
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>
2017-10-06 18:23:20 +00:00
Oswald Buddenhagen cc3f8279ab Bump version
Change-Id: I8a74cd6542c0438dad5875942a967595116cab9c
2017-10-06 18:01:37 +02:00
Kevin Funk e673d453e7 Replace Q_NULLPTR with nullptr
Change-Id: I91a5ea5ace5fb8116ce6d369b9c3c5fb5bdaae83
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-09-26 17:14:23 +00:00
Antti Kokko 167566d228 Add changes file for Qt 5.9.2
Change-Id: Id48f935aa4fa24d856c62a9b505ed6b513892ea8
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2017-09-22 11:08:52 +00:00
Jake Petroules 614a535f42 Android: remove support for local/debug deployment
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>
2017-09-06 18:22:00 +00:00
Frederik Gladhorn da855181ed Bump version
Change-Id: I188d6156e9df8dd3c27cfa6a8a4208ff6ce81fd4
2017-09-04 18:08:56 +02:00
BogDan Vatra 1fc40deed6 Android: Fix compile with clang and unified headers
Change-Id: I73c57348329628f2f7b1923332a9831ed0b64363
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
2017-08-17 10:03:44 +00:00
Liang Qi ffa5a03da5 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf

Change-Id: I1c6e79301402751efe0e38d48cd7b1235c3c7942
2017-08-15 13:18:15 +02:00
Liang Qi 17c9df2e59 Merge remote-tracking branch 'origin/5.9.1' into 5.9
Change-Id: I40768f2ebf3cf5d0dee8cf675a117f6c399efd3c
2017-06-30 10:10:11 +02:00
Oswald Buddenhagen bd66b195da Bump version
Change-Id: Iec48659c33eb221c80363f9aded099cf27089c60
2017-06-30 09:52:49 +02:00
Thiago Macieira 431641fb66 Disable senseless GCC 7 warning about maybe-uninitialized fields
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>
2017-06-30 06:04:57 +00:00