summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-03-272-7/+7
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f26c3f31900ece899f9ce9870057eb5638c4b59
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: Iad9f5307ff91e20c1fcb3f85d470c51422516159
| * Doc: Fix name of global QML singletonUlf Hermann2019-03-202-7/+7
| | | | | | | | | | | | | | | | The module API is called "QmlSensors", not "SensorGlobal". Fixes: QTBUG-74571 Change-Id: Ia998082be99517393389ba3a9785150e97d9c15f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\| | | | | | | Change-Id: I100de7289027dbc97f714ec1cd01b67f6b174b94
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\ | | | | | | | | | Change-Id: I5436bba0c1e24755004a8778edc5b7c441ef69d0
| | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| |/ | | | | | | | | | | | | + b6a72a463203cf8cdd03cd9ea135ea396ec2ed42 Bump version Change-Id: I1a3a9e0cbd520f886e9e5369bd0136aca599b1f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-0/+6477
|\| | | | | | | Change-Id: I760bb889ea4f2a89496aa6481e7918a992b96b3a
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+6477
| |\ | | | | | | | | | Change-Id: I81b9a3bad558925c1cd679528da356a5055fa9d4
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-091-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 6ad68d73e4f9c00af6cc030a168458acb7b69b50 Android: Implement calibrationLevel for QCompassReading + a4c3631b0bb895b854305ecf2a4632dc949ef2d3 Bump version + 0dab0ff3d33292bc1647ebb68dbeb8556707b5ad Add changes file for Qt 5.11.3 + f0c13a29a023c3ab42e4a514eea52585896c1c9e add missing QT_BEGIN_NAMESPACE and QT_END_NAMESPACE + 35b13ece98cedd6525e24d0bcd98825a7f4e32b3 Update plugins.qmltypes + 39363099d837c40363aa2c853a7435204edd475a Binary compatibility file for QtSensors for Qt 5.12 + 450f932762eef448081a22e98fa93a191bd9a804 Bump version Change-Id: Ife8e4d3f2c04bbe5054493f2c884a4688a8a534f Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+21
| | |\ | | | | | | | | | | | | Change-Id: Ica7bfb390cae5cb29a937c2f75588de589892c56
| | * | Binary compatibility file for QtSensors for Qt 5.12Milla Pohjanheimo2018-12-181-0/+6451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I15a1890d0a921f4427b777d2324649e85db58bbb Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0a185faec24b58beaa2151f49b094d8ce6747f36
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: I15f363e32752fca03b4cefb668ab586f0c4f12b5
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I42e2c7b43af8f2c96b8c2199b134bd2ca46221f8
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: I550c370258b58890167d6f99f58ebf7e8c2dce1b
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-251-0/+20
|\| | | | | | | | | | | Change-Id: I9eb557656457daddc8d522217379de0be2091bd4
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: I867e7e536a97929b3eed103e535db02b27086cc7
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Icb0a2d701c4af0c620cc91d27f94c15a81b878a3
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + 4ab2e8f086441c06a2dabbd4c62756fc0f029053 sensorfw: Fix initial proximity sensor state evaluation + a4c3631b0bb895b854305ecf2a4632dc949ef2d3 Bump version Change-Id: I18e1e4e99e11e27223083a5f85c1c3652ae294fb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-112-2/+29
|\| | | | | | | | | | | Change-Id: Ib7962e4b610df0423d5ca2d8c302f350d4b7ffdd
| * | Update plugins.qmltypesKai Koehne2018-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | No actual metadata has changed, but this update makes it easier to check that everything is in sync. Change-Id: Ib8cb8adbbf1288fc8e3d3495e5fc3bdaf89389af Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+27
| |\ \ | | | | | | | | | | | | Change-Id: I8d5128f9b6eda32d9ed01dd1fcb815eaf446ea0b
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Antti Kokko2018-11-071-0/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: I80314586578b534c1b71b12bf59860377fbf1b8b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-042-0/+7
|\| | | | | | | | | | | | | | | Change-Id: Ibfc32051293768600890a744df4b41a8a56558f3
| * | | add missing QT_BEGIN_NAMESPACE and QT_END_NAMESPACELorn Potter2018-11-292-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I262ee674a240bba87e84e21ceb486cb12d53053d Reviewed-by: Lincoln Ramsay <a1291762@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | Compile-fix (g++ 8): move #include of mocs outside namespaceEdward Welbourne2018-11-2920-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a1697ff968d052a2a8268299db8fde4f9f34338 Reviewed-by: Lincoln Ramsay <a1291762@gmail.com> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I8461a56ddc71f551fa3dbbd4869f0e522398c789
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8363930e73699ec1c7b617d55bf77c00ec75fa80
| | * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8d9b6a15778de64cf892bf1cbd3cff59d08de246
* | | | ios: silence warning (-Wobjc-interface-ivars)Richard Moe Gustavsen2018-11-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the variable to the implementation section to silence: "warning: declaration of instance variables in the interface is deprecated" Change-Id: I2381995d4fdaea83e0af6687faa140b249da3e3d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-031-6/+10
|\| | | | | | | | | | | | | | | Change-Id: I977f3428c7e979045abb4a70d8c185968fe08f72
| * | | Android: Implement calibrationLevel for QCompassReadingAndy Shaw2018-10-311-6/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform Specific Changes][Android] QCompassReading::calibrationLevel now returns a valid value when possible. Change-Id: Ia7b6af9fc14d4edc4ce04af251eb29c84f08b957 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Ia15e9c0665ef51b09d61872bfdeb8d92a3cf78c2
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-251-1/+1
|\| | | | | | | | | | | Change-Id: Ia2080f82b1ed04535e198aab57ff08ef544072fc
| * | iOS: remove iOS from compatmap for AmbientLight sensorv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Lorn Potter2018-09-201-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-70625 Change-Id: I6ae8520d2451c5e64a9e9648f86af2bf3957f9b9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-181-0/+24
|\| | | | | | | | | | | Change-Id: I79e3b26fa562af680299c2a0e5817997812fc632
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-151-0/+24
| |\| | | | | | | | | | Change-Id: I57276cbe3887d9eb6beaece3f5a6a51fecfebfb3
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I21628ede14b2d372bd32df3060663d875e9e5a2d
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-281-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: I3840edcb425cb55474bd11eb3b6484457668046d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-112-8/+21
|\| | | | | | | | | | | | | | | Change-Id: I03be2b98215d2180dc218cf78dabadada2930888
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-082-8/+21
| |\| | | | | | | | | | | | | | Change-Id: Iec09ac237c25be67d604a68b6690f52705edffb3
| | * | sensorfw: Fix initial proximity sensor state evaluationSimo Piiroinen2018-09-042-8/+21
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sensorfw plugin assumes that both proximity state query and change notifications use the same withinProximity boolean type values. Because the state query actually returns integer distance, the initial value visible in for example QML ProximitySensor is logically reversed from what it should be and it requires one or two sensor state transitions before changes get notified in the expected manner. Evaluate initial proximity state as "distance" value where zero means that the sensor is covered. Also use the initial value to setup the cached previously seen value instead of blindly assuming that sensor is not covered. As suggested in sensorfwd documentation: Switch from deprecated dataAvailable() signal to reflectanceDataAvailable() signal. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com> Change-Id: I49e5607134848dc3c72e79733321df6251b7df52 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | QSensorGesture: Add Qt 6 fixme comment asking to make QObject virtuals publicFriedemann Kleint2018-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt for Python cannot currently be generated for the class since QObject::metaObject() is private. Task-number: PYSIDE-487 Change-Id: Ib368aa79bb3cd9b912d48455880d2f8ea9425f70 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-011-7/+38
|\| | | | | | | | | | | Change-Id: I651a9760973757fb2d88bf2a5df8e75fd67dff69
| * | Update AndroidManifest in accelbubble exampleEskil Abrahamsen Blomfeldt2018-08-301-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example has an AndroidManifest.xml in order to force the orientation to portrait, but it had become outdated, setting the target version to android-14, which has not been supported since Qt 5.7. This updates the manifest to the latest template, while also still setting the orientation to portrait. [ChangeLog][Android][Examples] Updated AndroidManifest.xml in accelbubble example to be compatible with Qt again. Task-number: QTBUG-70159 Change-Id: I80a34c34837682c3ff2a7d232d527820fb9f4ca4 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Revert "Don't try to call Math.hypot() until V4 implements it"Edward Welbourne2018-08-221-2/+2
|/ / | | | | | | | | | | | | | | | | This reverts commit dce96572f6e073cdf8eed916365c2cc81e9da4a4, thereby restoring use of Math.hypot(), now that V4 supports it. Change-Id: I27fed3fff8cf2863257a15e906e55ab907b70078 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I36836fda9e9da3f873a4797231e17f612466a2ce
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Ic4d9ead50d7d81733dc7604d8a55f9dc0ad0b16b
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\| | | | | | | Change-Id: I8d0ef7a00f0429728bfa49ca03c1e99eb9da27fb
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I271f2cb3a82c049dbee73fc662890ae73205a6df
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 04:33:25 +0000