aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | Add dependency on QtGuiPaul Olav Tvete2017-03-171-0/+2
| | | | | | | | | | | | | | | Change-Id: Ia60de94601bef84a7561be35bdb391e3ad3f7bb8 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>
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-2/+2
| | |\ | | | | | | | | | | | | Change-Id: Ia2221357b99132510f60d6fca171982a64b31516
| | | * 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>
| * | | Cleanup ExamplesAndy Nichols2017-02-039-645/+689
| | | | | | | | | | | | | | | | | | | | Change-Id: I36de0a3ba85b6b89547792badaa06c50f0e4ccc3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | | Doc: documented methods in qgamepadkeynavigation.cppNico Vertriest2017-02-031-2/+115
| | | | | | | | | | | | | | | | | | | | Change-Id: If292fca8a81aaba20a12fa79eea0031468f28c32 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: I4ac32831687595d7a1f22c788d827ee668c470e1
* | | 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>
* | | | quickGamepad: Remove unused graphicaleffects importLaszlo Agocs2017-01-312-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc406b1c53b129358ac394bb900a587017b4c3d7 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | | Doc: added basic doc for QGamepadManagerNico Vertriest2017-01-313-12/+41
| | | | | | | | | | | | | | | | | | | | Change-Id: I9692182d60d670742895f1dfce9b0e8159548f11 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | | Enhance tech details on doc front pageLaszlo Agocs2017-01-311-5/+104
|/ / / | | | | | | | | | | | | Change-Id: I27803fbb2e1e2fbccb06d07b73fa1abb2f351a9b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-1/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If73672bc96e3be4220b3f3af81ab9dc159cdd584
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| |/ | | | | | | Change-Id: I9b7af8cdd30dabb09d5759e2ee80fadf19d983ec
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-0/+1
| |\ | | | | | | | | | Change-Id: If15d6220c652c9dde2a755bdbfeba1f605c159b7
| | * Doc: Add navigation.homepage for the modulev5.7.15.7Venugopal Shivashankar2016-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | To be consistent with other tech. preview module docs, which use a different navigation.homepage for the breadcrumb. Change-Id: I962b746b292008bfd65bff49964856186332b96e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | Improve robustness of QML plugin loadingSimon Hausmann2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use a variable that expands to the latest plugin version instead of hard-coding the string. Change-Id: I2e4470e901b91c824ae93dbc9fde41ec03460356 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-028-31/+51
|\| | | | | | | | | | | Change-Id: I68ec90e160086231923e514d0cdad8fc1b268c04
| * | Convert the module to the new configuration systemLars Knoll2016-10-316-29/+49
| | | | | | | | | | | | | | | | | | | | | | | | ... and clean up the SDL detection. This also enables SDL use on non-macOS Darwin platforms, per the library's documentation. Change-Id: I4111fc8cb75b30662fe93b90e76a0c5563140656 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | use modularized platformsupport modulesv5.8.0-beta1Oswald Buddenhagen2016-10-212-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia86969ea365700629a1ccc04f94d3cafc756645b Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-234-5/+9
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iac2a80d01bf81a534290bdd8c4a49731c8fa276e
| * | Eradicate Q_FOREACH loops and mark the module as Q_FOREACH-free and ↵Marc Mutz2016-09-223-5/+8
| | | | | | | | | | | | | | | | | | | | | warning_clean Change-Id: I67813e8d2d27d39d772099b2d9d77bbe9bfa476e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | Fix compilation after feature modularization in qtbaseLiang Qi2016-09-201-0/+1
| | | | | | | | | | | | | | | Change-Id: Iffe6d9ba611aa6a4a3e48e7206bbdf4b96465fc1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / | | | | | | Change-Id: I6a94f528e4dfae97b04b30be07589fec6e29b735
* | Adjust to qtConfig() changes in qtbasev5.8.0-alpha1Lars Knoll2016-08-191-1/+1
| | | | | | | | | | | | Change-Id: I1020ca26211e151c3a8e3bf766caa5ae90a01f83 Reviewed-by: Andy Nichols <andy.nichols@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Disable darwin plugin on watchOSJake Petroules2016-08-181-1/+1
| | | | | | | | | | | | | | | | The dependent frameworks are not available on that platform. Change-Id: I17a48c7e3136b647a3ec7f258e6979ee5dd8c9b7 Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-022-2/+10
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3d0c6ed292b1f3aa7c24d0c39a4ecfdd8f380d6c
| * Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: Ia1243f332caa6abf6e3fe1b0b1c4c8f36933d6f4
| * Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Since Android 5.0 Google introduce a nasty bug[1] which calls JNI_OnLoad more than once. Basically every time when a library is loaded JNI_OnLoad is called if found, but it calls *again* JNI_OnLoad of its .so dependencies! [1] Workaround https://code.google.com/p/android/issues/detail?id=215069 Change-Id: Id04f7e55ee93ec5adef791809eca481fdfdbab4e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-2/+5
| |\ | | | | | | | | | Change-Id: Ia2f2e0d6b8e65908efd19814d3425f7c79b571f5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 06:22:21 +0000