summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix Qt6 buildwip/cmakeAlexandru Croitor2019-08-061-2/+3
| | | | | | | | | | | Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: Ie46e7d5b6d4cd5e0e8c6eea5b3ebbbdd83343656 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Bump Qt version to Qt 6Alexandru Croitor2019-07-101-1/+1
| | | | | | Change-Id: Iab481eed8da237dc1a7cb06bec0bddf96c1b23a9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove usages of deprecated APIs from QDateTimeSona Kurazyan2019-06-278-16/+16
| | | | | | | | | | | | - Replaced QTime by QElapsedTimer, because of the usage of QTime::start() and QTime::elapsed() methods, which are deprecated. - Replaced the deprecated QDateTime::toTime_t() with QDateTime::toSecsSinceEpoch(). Task-number: QTBUG-76491 Change-Id: I625ce6bbc2718cd3c1b4905fecef9d75fdbab618 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-043-3/+5
|\ | | | | | | Change-Id: I529d632409473eb6ae6ff364079e7eaa361f1400
| * Doc: Fix qdoc errorsNico Vertriest2019-04-303-3/+5
| | | | | | | | | | Change-Id: I989cc21bdbbd56c3b14b934b3256bda3a01a6764 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-274-4/+22
|\| | | | | | | Change-Id: I18e38d785174cdcfe7982ff1c831b72361b1140c
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-261-2/+0
| |\ | | | | | | | | | Change-Id: I580be02701e5e4b5a57f59206d6a50cc98ddf220
| | * Remove .jar dependenciesBogDan Vatra2019-04-261-2/+0
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-75381 Change-Id: Iacd5760e176908645e1a49115e122f2e5e3469ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Fix building maze example on AndroidAlex Blasche2019-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Qt 5.13 raised the minimal SDK version of Qt for Android to v21. Change-Id: I4c15254ef3aa2d5898c0ce7f5f6b8ffe62202fb9 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * | Update accelbubble android SDK versionAlex Blasche2019-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example requires a specific AndroidManifest. Unfortunately the manifest hardcodes the SDK version too. Since Qt 5.13 increased the minimal SDK version to 21, building this example failed. Fixes: QTBUG-75379 Change-Id: Ieb5e26e759521fbb712bf24e5d336d8a22906b85 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\| | | | | | | | | | Change-Id: I95e4048716fb1bd9462b47012259c859be00c35e
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ica43432c84af8499e1edf508c5efb60abb28739e
| | | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + d0e959844d60a547430cd7731d66452306561159 Doc: Fix name of global QML singleton + f528104474dd74e34ea6a01da096e7c31730c01a Bump version Change-Id: I758992a6edfa39c543dcace943cda8d716571850 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-2033-1225/+906
|\| | | | | | | | | | | | | | | Change-Id: Ifec8fec9ec213f6e5497a46e602ef52f77529bdb
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-1333-1225/+906
| |\| | | | | | | | | | | | | | Change-Id: Iff501d1162491fafeb9aaf0a68927ade79b3b6e7
| | * | Say hello to Qt Android Sensors based on NDK APIBogDan Vatra2019-04-1133-1225/+906
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until Qt 5.9, we had to use JNI way because the NDK sensors API was introduced in API-16. Starting with Qt 5.9 we can safely use the NDK API as API_16 is the minimum API supported by Qt. Using the NDK API instead of JNI boost the performance a lot! The CPU usage dropped 2 to 4 times, from over 60% using the JNI to less than 20%. [ChangeLog][Android] Rewrite Qt Android Sensors using NDK API. Change-Id: If3e3f1e56973e2a189662912b2a6ebfbd71dee14 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-131-2/+2
|\| | | | | | | | | | | Change-Id: I762165aeda97092be4b626281502ec4703aaa035
| * | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-04-121-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: Id3be3f2d116d7c1ef8541ced2b75043129b08ab5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-302-7/+7
|\| | | | | | | | | | | Change-Id: I978a5520147990f14f5d8ef6febbdea7c0da8f7a
| * | 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.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\| | | | | | | | | | | Change-Id: Ib37c983cf9aa7eea5961e7f93b626df012caff9b
| * | 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>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Ic9dce5df3b48b3cd5ddff37d16bbe03eb1b6c82f
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-052-0/+6477
|\| | | | | | | | | | | Change-Id: I273791a60a1aec5ab75bba5a35d5695457f1c7fb
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 17:06:00 +0000