summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"devSimon Hausmann6 days2-61/+0
|\
| * Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann6 days2-61/+0
| |\ |/ / | | | | Change-Id: I46d0ce36d9168a0a2fe2229ff94fc6e4a82b5308
| * Update submodules on 'wip/qt6' in qt5wip/qt6Liang Qi10 days2-0/+0
| | | | | | | | | | | | | | Only qtmultimedia and qtwebengine in this round. Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Liang Qi10 days161-2168/+4919
| |\
| | * Merge remote-tracking branch 'origin/dev' into wip/qt6Liang Qi10 days161-2168/+4919
| | |\ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Ignore qtquick3d for now. coin/platform_configs/default.txt coin/platform_configs/default.yaml coin/platform_configs/qtbase.txt coin/platform_configs/qtbase.yaml We use yaml files for configurations now. Adjust the configurations for Qt6 as it was done before in the .txt files. Done-With: Alexandru Croitor <alexandru.croitor@qt.io> Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
* | Update submodules on 'dev' in qt5Liang Qi2019-09-0744-0/+0
| | | | | | | | | | Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | platform_configs: replace -qt-xcb with -xcbGatis Paeglis2019-08-261-1/+1
| | | | | | | | | | | | | | | | ... as we are removing -qt-xcb switch from qtbase as part of stopping to bundle xcb sources. Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6 Reviewed-by: Simo Fält <simo.falt@qt.io>
* | 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/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>
| | * | | Update platform_configs for QtWebKitKonstantin Tokarev2019-08-011-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove redundant MSVC2017 configuration * Synchronize Mingw73 configuration with qt5.txt Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | | Remove 'Packaging' feature from WinRT_10 x86Jani Heikkinen2019-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't deliver binaries for that target anymore -> do not export that either Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-317-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-284-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | | Provisioning: update Conan and Conan packagesKonstantin Tokarev2019-07-2661-1941/+2925
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * | | Provisioning: Add CompilerException and CompilerThreads settings for ConanKonstantin Tokarev2019-07-261-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * | | Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming conventionKonstantin Tokarev2019-07-264-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>