summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.05.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.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.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
| | * 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
View Lorry Controller Status