aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13.1' into 5.14Liang Qi2019-09-041-0/+24
|\ | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/qt5.yaml 5.14 is using NDK r20 for android. Change-Id: I483a628abd154c40937a44e196643a2be2552987 Fixes: QTBUG-77999
| * Update qtbase submodule on 5.13.1 in qt5v5.13.1Jukka Jokiniva2019-09-021-0/+0
| | | | | | | | | | Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-211-0/+0
| | | | | | | | | | Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-191-0/+0
| | | | | | | | | | Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-181-0/+0
| | | | | | | | | | Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-162-0/+0
| | | | | | | | | | Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-152-0/+0
| | | | | | | | | | Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-144-0/+0
| | | | | | | | | | Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Add Android x86_64 architectureJani Heikkinen2019-08-131-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems those build targets were accidentally deleted when yaml change was merged in. Targets were there in Qt 5.13.0 release (before yaml change) This amends a94696ccd5be936099809eda58db02999cb7c77a. See also ebcfcbe69a5d34949d938211c364e1ff6f185b39. Task-number: QTBUG-47672 Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Update submodules on '5.14' in qt5Qt Submodule Update Bot2019-08-2927-0/+0
| | | | | | | | | | Change-Id: I0f5fdbd9f369dc42dd4c97dad1cb933753220e58 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/dev' into 5.14"Liang Qi2019-08-278-15/+21
|\ \
| * | Merge remote-tracking branch 'origin/dev' into 5.14Liang Qi2019-08-268-15/+21
|/| | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
| * | Add QtQuick3D as a submodule in qt5.gitChristian Strømme2019-08-262-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Adds QtQuick3D as a preview module in dev Task-number: QTBUG-77724 Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * | Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-08-2320-0/+0
| | | | | | | | | | | | | | | Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Android: Update Android NDK to version r20BogDan Vatra2019-08-226-15/+15
| | | | | | | | | | | | | | | | | | Fixes: QTQAINFRA-3152 Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/dev' into 5.14"Liang Qi2019-08-21154-2185/+4933
|\ \ \
| * | | Merge remote-tracking branch 'origin/dev' into 5.14Liang Qi2019-08-21154-2185/+4933
|/| | | | |/ / | | | | | | Change-Id: Iaccaf809372bc6132af4e25af2ca8b163b810e0a
| * | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Liang Qi2019-08-21154-2185/+4933
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-08-20154-2185/+4933
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d494d76c26df48c9cf3b45fc15ebad963fe34c52. Conflicts: coin/platform_configs/default.yaml Temporarily remove the -no-opengl build. coin/platform_configs/meta-boot2qt.yaml coin/platform_configs/qt5.yaml Temporarily remove the webassembly build on windows. coin/platform_configs/qtwebkit.yaml Task-number: QTQAINFRA-2577 Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Done-With: Samuli Piippo <samuli.piippo@qt.io> Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
| | * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-1415-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I082dbfe9cd927aa112760db67e4657868289c4e2 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Liang Qi2019-08-141-1/+1
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Liang Qi2019-08-131-1/+1
| | |/| | | | | |/ | | | | | | | | Change-Id: Ifc39acfc1a0ba6019091a194088e99e451f99bde
| | | * Provisioning: Append the emscripten to path instead of prependSimo Fält2019-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having it first in path seems to cause some confusion when detecting libc++ in darwin. Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-124-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-112-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id153f5c742637fe66bb9010fa41cb62645fb4e4d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-099-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If3fe6bab310eb0e403c040ea465ac8197a7059a2 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Liang Qi2019-08-094-4/+30
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Liang Qi2019-08-094-4/+30
| | |/| | | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
| | | * Include QtWebEngine againLiang Qi2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a94696ccd5be936099809eda58db02999cb7c77a partially. Task-number: QTBUG-77304 Task-number: QTBUG-77305 Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-083-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1"Liang Qi2019-08-084-3/+29
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12' into 5.13.1Liang Qi2019-08-084-3/+29
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qtbase.yaml Change-Id: I964ffb430436c62ad675fabc853642800499ade3
| | | | * Include qtvirtualkeyboard againLiang Qi2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 452e0d94d40bba15a56293a0a0f7d093dececda9. Task-number: QTBUG-76371 Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | | * Partially revert 'Do DeveloperBuild for Boot2Qt'Tony Sarajärvi2019-08-083-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 8f073cea69dde52b66577de4417fbc34db9e7476. Autotests slow down way too much still, so we can't run developers builds eveywhere. Task-number: QTBUG-63152 Task-number: QTBUG-77304 Task-number: COIN-326 Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-08-088-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * | Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-075-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * | Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-0734-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1"Liang Qi2019-08-07134-2125/+4640
| | | |\ \
| | | | * | Merge remote-tracking branch 'origin/5.13' into 5.13.1Liang Qi2019-08-06134-2125/+4640
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notice - qtvirtualkeyboard and qtwebengine got ignored temporarily due to issues on QEMU. Conflicts: .gitmodules Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
| | | * | | Adjust submodule branchesFrederik Gladhorn2019-07-291-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
| | * | | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibcdd2991705555bda542b60c25dbdb0e3dd572cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-080-0/+0
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Change-Id: If03f5533dcfb83ac2002f109118b5bfa8a4bad5e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-063-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-053-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-08-0532-0/+918
| | |\ \ \
| | | * | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0432-0/+918
| | |/| | | | | | | |/ | | | |/| | | | | | Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
| | | * | Add macOS 10.14 to the CITony Sarajärvi2019-08-0332-0/+918
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2938 Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-08-0397-2108/+3558
| | |\ \ \
| | | * | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0397-2108/+3558
| | |/| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules ignore QtWebEngine on QEMU temporarily. coin/platform_configs/default.yaml no-gui build was removed temporarily. coin/platform_configs/qt5.yaml coin/platform_configs/qtbase.yaml coin/platform_configs/qtconnectivity.yaml coin/platform_configs/qtsaferenderer.yaml Task-number: QTQAINFRA-2576 Task-number: QTBUG-77304 Task-number: QTBUG-77305 Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
| | | * | Provisioning: update conan_manifests for libxslt packagesKonstantin Tokarev2019-08-017-48/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package recipe was improved, as a result packages were rebuilt and checksums need update. Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 17:05:06 +0000