summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.1v5.12.15.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
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I550c370258b58890167d6f99f58ebf7e8c2dce1b
| * 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.35.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>
* | | 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>
* | 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.05.12.0Antti Kokko2018-11-071-0/+27
| | | | | | | | | | | | | | | Change-Id: I80314586578b534c1b71b12bf59860377fbf1b8b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | 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>
* | | 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
* | | 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>
* | 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.25.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.15.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.05.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.15.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>
View Lorry Controller Status