summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.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.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>
* | 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>
* | 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
| | * Add changes file for Qt 5.11.1v5.11.1Alex Blasche2018-06-121-0/+24
| |/ | | | | | | | | | | Change-Id: Ie24d153cf4c1f813e5f3b14a150857b395e28d68 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+6386
|\| | | | | | | Change-Id: Idb7bdf8d9e9ac45801273544652542f986f88b5c
| * Add binary compatibility file for 5.11 for QtSensorsMilla Pohjanheimo2018-06-051-0/+6386
| | | | | | | | | | | | | | Binary compatibility file for bic test added. Change-Id: Id0b45f457fd00ee388070fd07cb5dec69834d514 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-043-2/+50
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib2a417a6482e5c34f403968313e3285b3a54e30d
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: Ib1811da5b6bd3400d576869013122ecbdddb4771 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 30044c5a4a1be9553c3db7a3669acd07431b2512) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: I672189bfdb9aef67e8cf805d2793ed4c3adc8d21 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit d552586debd5d2808e0e290e18ccd380dfceaebd) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Don't try to call Math.hypot() until V4 implements itEdward Welbourne2018-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | We'll be adding that in dev (where I'll then revert this) but I was mistaken when I simply assumed V4 had it while updating this example before. Task-number: QTBUG-68277 Change-Id: Idb3b45317bfb410cea12c3795e82670db79c18b5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: Ifac0a2824f38d88876297808a2096b32a7e37341
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+29
|\| | | | | | | Change-Id: Id4a5d3d5c140b0bc5af993a9713f98a79a4d07e7
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+29
| |\ | | | | | | | | | Change-Id: I93f90eb8dd5dee445317926d4f186bb1b4cfd37c
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Alex Blasche2018-04-251-0/+29
| |/ | | | | | | | | Change-Id: I2d632eed8c5c97a440fe9ac1ce89284a65153577 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | 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: I4e68865d242f35517fbc179db1c578850025d328 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-213-5/+5
|\| | | | | | | Change-Id: Idb9dc88c742d8b407fabe72465024ebafb6886cb
| * Bump Qt sensors qml import versions in doc and qmltypesAlex Blasche2018-04-193-5/+5
| | | | | | | | | | Change-Id: If3027bc22486bec4b4b02eea85497578c8bb1b1a Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-311-1/+0
|\| | | | | | | Change-Id: Ic5f355f57f0705055bd7ffb34312e8b7d75ebe85
| * Doc: Remove incorrect \relates commandv5.11.0-beta4v5.11.0-beta3Topi Reinio2018-03-261-1/+0
| | | | | | | | | | | | | | | | | | QDoc cannot handle the case of setting a class to be related to another class (unless they are nested); adding \relates to another class will overwrite the class output page. Change-Id: I9978b915b339e4e1baafb708012b6fdf9a3b9aad Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-241-1/+1
|\| | | | | | | Change-Id: I26f7bef6fb93bc1ddb00b9af13d9582e1a973f07
| * Doc: Fix libclang related warning for templated methodPaul Wicking2018-03-201-1/+1
| | | | | | | | | | | | | | Corrected method signature in documentation. Change-Id: I86343f9e0bd4df04a4c24f6d7c02be663ebac0d9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-273-0/+56
|\| | | | | | | Change-Id: I97b86fef841d6dd8dbb04243b762bb6bc4980b63
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I62b5d4414939e0a67ba3271fee71ed9c7ccce5fb
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: Ie9b041de105795aa1494f4064227acbda830f3fd
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+30
| |\ \ | | | | | | | | | | | | Change-Id: I3b97bac9f46a38e25f68c028eee0290e2fb47f19
| | * | Add changes file for Qt 5.10.1v5.10.1Alex Blasche2018-02-051-0/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I2946cfab276a7b3a225d7c20c666a10c0eb38ff5 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-122-0/+26
| |\| | | | | | | | | | | | | | Change-Id: I666569a09a42196d834e9aa97be706cc2551e7bf
| | * | qtlite: Skip building examples when configured with no-feature-itemviews5.10Rainer Keller2018-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: I98086d0c1877b8345ee76553eea19738023aebae Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-241-0/+25
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If889421e172ff4f2f2f562d95518120556bdc97b
| | | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | | |\ | | | | | | | | | | | | | | | Change-Id: I14e05ef2ecc6dedd9cf69dfa10e75d62703f0781
| | | | * Add changes file for Qt 5.9.4v5.9.4Alex Blasche2018-01-081-0/+25
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I98faeda1640fdb2a659887700722f8e8ad464f89 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib1403a428870bf7852aa190d965aa6e33163ca0a
| | | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | | |\ | | | | | | | | | | | | | | | Change-Id: I2c4fe1b393daaa7213162972da915d694420e9e6
| | * | | testSingleGestures: Fix for case of multiple gesturesAlexander Volkov2018-01-241-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test fails sometimes for the twist gesture data, because it contains 3 gestures. QTRY_COMPARE_WITH_TIMEOUT usually stops comparison after recognition of the first gesture, but it may make the first comparison after more than one gesture has been recognized and thus fail the test. Add a new column to the test data with a list of gestures that should be recognized and use the list in QTRY_COMPARE_WITH_TIMEOUT. It will make the error message more informative if the test will fail, and should make the test pass on all configurations. Task-number: QTBUG-65861 Change-Id: Icfd86831b527da4933da2a20f45ccf9617862eac Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit e3b6a54a75482c5ddd91dab50a86629053c69a2e)
* | | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I279529e9c2f15e94af75cfdc87fcaf37bb266aaa
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-206-2/+6437
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I17dec1cd2d4934710663e5fa97c926a65fe301e5
| * | | Add binary compatibility file for QtSensors for 5.10Milla Pohjanheimo2018-01-081-0/+6386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File to test binary compatibility for 5.10 added Change-Id: Ic86425ada00f5c3804d50fff6d2e8618b2bc923e Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I31a1be224350f83ed196fce7b0891cdc2b146e15
| * | | Doc: correct clang error messageNico Vertriest2017-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qsensorbackend.cpp:149: (qdoc) warning: clang found diagnostics parsing \fn QSensorBackend::setReading(T *reading) Change-Id: I274c9eea76eab9071f47d8bebcfd163d5867281a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+46
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Id68b9d931c42bd42797da900970527ab650ad55f
| | * | | Add changes file for Qt 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Antti Kokko2017-11-221-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3db88fb59739620cf9cba4d41a32196173aef429 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+24
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I905bedf79caa0b3e86a8fc2a21374f7d347c5f08
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 18:55:30 +0000