aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-09-1341-50/+1135
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change partially reverts 24f0367a60fdd3379014e507fa7f4553d433c601. Conflicts: coin/platform_configs/default.yaml SLES 12 got removed temporarily. Task-number: QTQAINFRA-2851 Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
| * | Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarativeAssam Boudjelthia2019-09-101-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2808 Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-09-094-5/+28
| |\ \ | | | | | | | | | | | | Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb
| | * | Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build flag '-no-opengl' to remove xcb from static build Add build flag '-no-vulkan' to disable vulkan Task-number: QSR-517 Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * | Provisioning: Fix version of libiodbc on MacOsAssam Boudjelthia2019-09-062-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libiodbc latest version (3.52.13) was automatically installed causing qt-config-gui to fail build, this installs version 3.52.12. Task-number: QTQAINFRA-3188 Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build flag '-no-xcb' to remove xcb from static build Task-number: QSR-517 Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * | Remove un-needed configure arguments for Apple OSesTor Arne Vestbø2019-09-051-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * | Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build flag '-qpa offscreen' to remove dependency to xcb libraries Task-number: QSR-510 Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * | Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static buildTuomas Heimonen2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build flag '-no-icu' to remove dependency to icu libraries Task-number: QSR-499 Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| * | | Provisioning: Add emsdk to macOS 10.14Heikki Halmet2019-09-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3191 Change-Id: I46a72db63966804b33996d8bc3babe50cd2a41dd Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Provisioning: update QEMU toolchainsAssam Boudjelthia2019-09-074-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with GCC 8.2.0. * Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs, set environment variable QEMU_SYSCALL_DEBUG to show them. Task-number: QTQAINFRA-2808 Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | | Provisioning: Add Android NDK ROOT to environment variableHeikki Halmet2019-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3181 Task-number: QTBUG-74952 Change-Id: I4cc6936c3b3eef32a1013888ced3950cd1f39407 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
| * | | Provisioning: Update Android NDK version to macOS 10.14Heikki Halmet2019-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are provisioning older Android NDK version than the one used in macOS 10.13. Let's keep these sync even though we don't currently make Android builds with macOS 10.14 Change-Id: I6c284d50bac395eb474c0f7e34cd90eda3f180c3 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-2834-22/+1070
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.yaml coin/provisioning/common/linux/disable-ntp_linux.sh coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh emsdk.sh was moved from linux to unix, see 38e416be664dc216b332e6b4ff8d38905dfdc1e9 Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
| | * | Update Saferenderer static buildsTuomas Heimonen2019-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtci-windows-10-x86_64-10 static build: remove flag '-developer-build' qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig' and '-qt-freetype', remove flag '-developer-build' Task-number: QSR-491 Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| | * | Update Saferenderer static buildsTuomas Heimonen2019-08-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DisableTests on qtci-windows-10-x86_64-10 Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64 Task-number: QSR-432 Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
| | * | Suppress QEMU syscall and ioctl debug messagesAssam Boudjelthia2019-08-211-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile QEMU with "Unsupported syscall" and "Unsupported ioctl" messages suppressed, those can be shown by set/unset environment variable QEMU_SYSCALL_DEBUG. Task-number: QTQAINFRA-2808 Change-Id: If0b28c47f2599c4ebca9cae6a6d38f9a4fd00458 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Provisioning: Update iOS signing toolsHeikki Halmet2019-08-192-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new apple id is required with notarization Task-number: QTBUG-77359 Change-Id: I2aafda37d40608296d598b1d9ade83a025bcac8d Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| | * | Add Packaging to Saferenderer static buildsTuomas Heimonen2019-08-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QSR-432 Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| | * | Add Suse Linux Enteprise Server 15 to the CITony Sarajärvi2019-08-1415-0/+503
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3123 Change-Id: I725c58c7d319945f7470118dec99b5360385da7b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Add Suse Linux Enteprise Server 12 to the CITony Sarajärvi2019-08-1316-2/+509
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2851 Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Provisioning: Ubuntu 18.04: Add required packages for b2qtJoni Jäntti2019-08-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These packages are required for building b2qt module. Needed also on 5.12 branch as meta-qt5 follows Qt branching and will take provisionings from here. Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit ee9dd0d8601bbe252a6a99e44a3376016911f1b0) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop buildJani Heikkinen2019-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After adding "-force-debug-info" and "-separate-debug-info" debug information is going in the binaries accidentally & so on exploding binary size. Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as configure argument will prevent debug information not to go inside binaries. Task-number: QTBUG-69767 Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Build MIPS64 with b2qt toolchain - againTony Sarajärvi2019-08-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This configuration verifies big endian builds. The build was accidentally removed in merge a94696ccd5be936099809eda58db02999cb7c77a. See also 9b84c7135b9903d6f975ea082d7ae5958248a8fd. Task-number: QTQAINFRA-2492 Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | | Enable a no-gui build on Ubuntu 18.04 for 5.13wip/pyside-setup/5.14Liang Qi2019-08-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-2576 Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Add webAssembly build for windows againLiang Qi2019-09-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a8fb868ec2c526325408a4cbf3e628aa3377e30 partially. See also 38e416be664dc216b332e6b4ff8d38905dfdc1e9. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | 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
| * | | 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>
* | | 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 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
| * | 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>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13.1Liang Qi2019-08-083-2/+28
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qtbase.yaml Change-Id: I964ffb430436c62ad675fabc853642800499ade3
| | * 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>
| * | 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 remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0396-2106/+3556
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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>
| | * Conan: Suppress output of New-ItemKonstantin Tokarev2019-07-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I3d62fffa08d38a383187726e08743512236bb859 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Provisioning: install-msys2.ps1 must run its commands synchronouslyKonstantin Tokarev2019-07-261-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [*] Using bash instead of msys2_shell.cmd allows Start-Process to actually wait for the end of command execution. [*] cpan requires "yes" to be typed by user when it's run first time, otherwise it hangs indefinitely waiting for input. [*] Stop gpg-agent and dirmngr started in the background to prevent CI session from hanging. Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Use msiexec to install Strawberry Perl from msi packageKonstantin Tokarev2019-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently provisioning fails with following error: "This command cannot be run due to the error: %1 is not a valid Win32 application." Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Provisioning: Run-Executable should print stdout and stderr to logKonstantin Tokarev2019-07-261-2/+34
| | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3085 Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Provisioning: don't re-run Conan 5 times if there is no errorKonstantin Tokarev2019-07-261-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Fix extra file and missing library in platform configurationsToni Saario2019-07-022-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Missing libraries in no-gui platform. Default.txt was supposed to be removed by 439a1eb2207417a6d2d0f14766e3e627035a9a7f Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| | * Change configuration files into yaml formatToni Saario2019-07-0121-72/+370
| | | | | | | | | | | | | | | | | | Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| | * Add correct openSSL arguments to no-gui buildsTony Sarajärvi2019-06-281-1/+1
| | | | | | | | | | | | | | | Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>