aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.12.9' in qt/qt5v5.12.9wip/qt3dstudio/masterwip/emulator/masterQt Submodule Update Bot2020-06-125-0/+0
| | | | | Change-Id: I8f008cd5876b2e1260ca63d21f9a1177c7b4a772 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.12.9' in qt/qt5Qt Submodule Update Bot2020-06-1040-0/+0
| | | | | Change-Id: I364eb2bf99495d0f86d08190b26910270c88356f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Adjust submodule branchesPaul Wicking2020-06-021-40/+40
|
* Update submodules on '5.12' in qt/qt5Qt Submodule Update Bot2020-05-2642-0/+0
| | | | | Change-Id: I1155362f9c892aca06d1d4432677cdfe0cbeb782 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.8' into 5.12wip/qtsaferenderer/masterwip/qtsaferenderer/1.2wip/qtsaferenderer/1.1Liang Qi2020-04-230-0/+0
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I5a3c7de3adc990e1294bb0fde461ddd4e1557b37
| * Update submodules on '5.12.8' in qt/qt5v5.12.8Qt Submodule Update Bot2020-03-3139-0/+0
| | | | | | | | | | Change-Id: I16e001dcce7d0c3b9eeb84eeaf5732af00652062 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Adjust submodule branchesKari Oikarinen2020-03-161-40/+40
| |
* | Provisioning: Enable RPMS for Redhat 6.6Heikki Halmet2020-04-201-0/+44
| | | | | | | | | | | | | | | | | | Needed RPMS are currently in disabled state in Tier 1 image and those need to be enabled. Task-number: COIN-563 Change-Id: Ib803be03ad859a180bf941a52deaf0cf00412400 Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* | Update submodules on '5.12' in qt5Qt Submodule Update Bot2020-04-207-0/+0
| | | | | | | | | | Change-Id: I643c5a49307fcc90b09615c26146fc7f76dbd891 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Provisioning: Activate subscriptionsHeikki Halmet2020-04-162-4/+14
| | | | | | | | | | | | | | Task-number: QTQAINFRA-3638 Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943 (cherry picked from commit 5148639647ca7d98ac94aaa90f8d650e68d0f592) Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* | Execute a specific version of homebrew install scriptDimitrios Apostolou2020-04-023-5/+23
|/ | | | | | | | | | | | | | Also first try to download it from local mirror. This install script appears to be doing a lot of git-cloning and downloading itself though, so it is still far from the ideal solution: to only download from locally cached endpoints. Task-number: QTQAINFRA-3134 Change-Id: I32131045d6e62f302ec666b4ac055ca5ee9662d5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit c0033df4b98eee349fcd7b92f35cb6ee4ca18927) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.12' in qt5Qt Submodule Update Bot2020-03-139-0/+0
| | | | | Change-Id: Ib6cbea4b4a921d9bbe6696f0949457df170535cf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add installer-framework specific platform configsSimo Fält2020-03-091-0/+30
| | | | | | | Task-number: COIN-287 Change-Id: If9de982bc40ae86176fe0a233efea150b0a2811e Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* Provisioning: update Conan and Conan packages to latest versionsKonstantin Tokarev2020-03-0754-2567/+2155
| | | | | | | | Task-number: QTQAINFRA-3556 Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit b73e61a458b6cce4cbb5546a912b9def52779d51) Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Remove pip installationSimo Fält2020-02-201-6/+0
| | | | | | | | RHEL 6.6 is having too old python3 to support latest version of pip. Change-Id: Ib8f9996b668ae02070986a1607c43885284560c1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update submodules on '5.12' in qt/qt5Qt Submodule Update Bot2020-02-185-0/+0
| | | | | Change-Id: If76c9b4e573e741e693b5c35d6a62de4c0038419 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provisioning: Update signing tools for macOSHeikki Halmet2020-02-182-4/+4
| | | | | | | | | | Update expired certificates Task-number: QTQAINFRA-3540 Change-Id: I21e718901cb3f5c901273c0c122430f5caaea3d0 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> (cherry picked from commit fd7bfcc0c50f8b352aaa2c27b01e026589ec4c5b)
* Fix openssl build in SLES-15Dimitrios Apostolou2020-02-181-0/+3
| | | | | | | | | | | | | | Upstream changes of binutils or elfutils broke the build. Error was: /usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/libc_nonshared.a(elf-init.oS): unable to initialize decompress status for section .debug_info /usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/libc_nonshared.a: error adding symbols: file format not recognized collect2: error: ld returned 1 exit status Task-number: QTQAINFRA-3527. Change-Id: I50b677598b4415a281abbf0ddb2db39613646b36 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit eee60c0824a6ef6f50d0fc18a0e0908d9ab93be4) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* 08-pythondev build should not execute external scriptDimitrios Apostolou2020-02-181-4/+38
| | | | | | | | | | | | | The important bits of the script were copied and modified. NOTE that we no longer build openssl from source, the distro (SLES15) provides a version that works well. Task-number: QTQAINFRA-3528 Change-Id: Iad63d75055a7efc3e104789e4a515b8511cf0880 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit db23c64876028d8c4584b58c049f0211764c775a) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Provisioning: Update jinja2 to 2.10.3Dominik Holland2020-02-181-1/+1
| | | | | | | | | | | This makes sure we don't run into CVE-2019-10906 when using jinja2 in QtIvis Autogenerator. Change-Id: If51bf54bd26858c6b5faa3dd6a6627f2979b862d Reviewed-by: Robert Griebl <robert.griebl@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 7b4b2f86a03a176fa5fe0ca1059dc4935c1e665f) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update submodules on '5.12' in qt/qt5Liang Qi2020-02-0441-0/+0
| | | | | Change-Id: I06b7d79a3f81bb4b1296bc46cabc857c4be18264 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Liang Qi2020-02-030-0/+0
|\ | | | | | | Change-Id: I5075e16f288d4c28616d7ac18cb2292edc47ca31
| * Update submodules on '5.12.7' in qt5v5.12.7Qt Submodule Update Bot2020-01-282-0/+0
| | | | | | | | | | Change-Id: I290ccf0d58159c0ac641ad0abbb7d5bd3a0a1872 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.7' in qt/qt5Qt Submodule Update Bot2020-01-2540-0/+0
| | | | | | | | | | Change-Id: Ib92dbf253c2abd757aaa324b1ccefe31a26bb6c1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.12.7Jani Heikkinen2020-01-231-959/+1005
| |\ | | | | | | | | | Change-Id: Idcebfb9dd7be92e0130f9aa36046a41532fd2589
| * | Adjust submodule branchesKari Oikarinen2020-01-161-40/+40
| | |
* | | Update submodules on '5.12' in qt/qt5Qt Submodule Update Bot2020-01-266-0/+0
| |/ |/| | | | | | | Change-Id: Ib4fe6314ba3c47397437f441e75c903e68f34128 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update enterprise license agreement v4.2.1Jani Heikkinen2020-01-191-959/+1005
|/ | | | | | | Task-number: QTBUG-80661 Change-Id: Icc3a1408b104ad2f08cd6959ee4bcb8da2fb69cf Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 62d75f883c307e8fe4b3d2a7ca9544675bd6182a)
* Update QT LICENSE AGREEMENT Agreement version 4.2 in qt5 rootJani Heikkinen2020-01-152-913/+1285
| | | | | | | | | | | | | | There seems to be own copy of QT LICENSE AGREEMENT in qt5 root as well. That's why we need to update it to currently used version (4.2). At same time let's remove version from file name to make update easier in the future Task-number: QTBUG-80485 Change-Id: I286390a0754dcba79927f4d74abaf06d761bedc1 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit ad5245241628da67fc42e792c2554de913e01c14) Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Liang Qi2020-01-102-34/+107
|\ | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I82e695715beec4fd0cd58e31b11606e24afc4b0f
| * Docker installation: do not depend on external repositorieswip/qt3dstudio/2.6wip/ogl-runtime/2.65.12.6Dimitrios Apostolou2019-11-201-9/+28
| | | | | | | | | | | | | | | | | | | | Also updated the docker-compose binary to the latest one. Task-number: QTQAINFRA-3279 Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit a270bcdb6beb34d7590378899805391cfcfe7091) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * DownloadURL last argument (targetFile) is now optionalDimitrios Apostolou2019-11-201-1/+8
| | | | | | | | | | | | | | Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 6cc2215b8ce6da477cf23f01ff5b88c0d12c2b88) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Fix for DownloadURL to try alternative URLDimitrios Apostolou2019-11-201-2/+2
| | | | | | | | | | | | Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 518e114dc71fb58d175a15afb282ac7f6dff6adc)
| * DownloadURL now works with either wget or curlDimitrios Apostolou2019-11-201-2/+11
| | | | | | | | | | | | | | | | | | | | The reason is that Ubuntu does not have curl at the very beginning of provisioning scripts, and also does not have the repositories configured in order to install it. Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 4e3a0f79fbe8bea7915b267e132ba1e0d4b67733)
| * Refactor DownloadURL.shDimitrios Apostolou2019-11-201-23/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-detects and verifies all kinds of hashes, not only SHA1. Hash verification is now an autonomous function. If the file is found at the destination, skip redownloading it if the hash is OK. Runs on POSIX sh, not requiring bash. Retain compatibility with previous version. Change-Id: I9930336030aa776f49dc460fe766f3e831700255 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c0fce7a3b37db53289ffd1e44c58f0bfc0601229) Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Remove more of update notifiersTony Sarajärvi2019-11-202-1/+5
| | | | | | | | | | | | | | Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 2eab420e807d5fa4e39d4437879b9a35a2cdc88e) (cherry picked from commit 7285bbee64b24f7aef86fa109334448f1ddbf49b)
| * Change local Ubuntu repo mirror in provisioningTony Sarajärvi2019-11-202-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old mirror host Qt company used to sync their local mirror from, stopped syncing from Ubuntu in October 2018. The mirror mechanism was changed so that in the future if addresses change, we don't have to touch the provisioning scripts as the address is more general. Also a duplicate entry was removed. Task-number: QTQAINFRA-3279 Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit 5b77e74a5e66be1b0b529ad872d2d80457ef4a84) Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 439fbad1c9b80522435ecaceba96a394aaea5bdb)
| * Workaround broken local apt mirrorDimitrios Apostolou2019-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit ef7481b9cd514d0e3d73c5211193d1d100acfe74) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Workaround broken local apt mirror for Ubuntu 16.04Heikki Halmet2019-11-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: I736b0c9627399839d713ec637cab9403a368601f Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit b0fb9bbc72ab560f9f338693e92f84f79add82be) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.6' in qt5v5.12.6Qt Submodule Update Bot2019-11-107-0/+0
| | | | | | | | | | Change-Id: I3e49c6d83f5952869d0722674c83cf8db836ec8c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update submodules on '5.12.6' in qt/qt5Qt Submodule Update Bot2019-11-0842-0/+0
| | | | | | | | | | Change-Id: I8956dd80e96d7444f18986f50d9d557f514a8b43 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Adjust submodule branchesFrederik Gladhorn2019-10-301-40/+40
| | | | | | | | Change-Id: Ib27a2145631136383c6f580f9a6497cf78215eff
* | Update submodules on '5.12' in qt/qt5Liang Qi2020-01-1042-0/+0
| | | | | | | | | | Change-Id: I4261fd2d715ea61fb659dc070dc14aef77fc26e7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Provisioning: Change JDK script to use 'Remove' function from helpersHeikki Halmet2019-12-031-2/+1
| | | | | | | | | | | | | | | | Task-number: QTQAINFRA-3369 Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit dcfef7226fb54288858d234764f15582c77f5b05) Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Workaround broken local apt mirrorDimitrios Apostolou2019-11-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d (cherry picked from commit ef7481b9cd514d0e3d73c5211193d1d100acfe74) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* | Workaround broken local apt mirror for Ubuntu 16.04Heikki Halmet2019-11-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Local mirror is mirroring a public mirror, and for some reason there is a mismatch of file sizes and file hashes for the dep-11 metadata files. More info: https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files Task-number: QTQAINFRA-3351 Change-Id: I736b0c9627399839d713ec637cab9403a368601f Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* | Provisioning: Install pre-builded openssl for Windows 7Heikki Halmet2019-11-181-3/+5
| | | | | | | | | | | | | | Task-number: QTQAINFRA-3224 Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506 (cherry picked from commit 569fd1dabc47dccd80331d4f380eae811fd07447) Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Provisioning: Disable automatic cleanup from windowsHeikki Halmet2019-11-154-0/+11
| | | | | | | | | | | | | | Task-number: QTQAINFRA-3238 Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b (cherry picked from commit 60befd750829fe5a61b07256f0dc667ea1bd0f2f) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Provisioning: Update Cmake to version 3.7.2Heikki Halmet2019-11-112-8/+8
| | | | | | | | | | | | | | | | | | | | QtCreator requires Cmake minimal version to be at least 3.7.0 Task-number: QTQAINFRA-3272 Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> (cherry picked from commit 3f9673d1090feecd9e849ca2547f3024e323777a)
* | Provisioning: Hide password with /dev/nullHeikki Halmet2019-11-113-6/+33
| | | | | | | | | | | | Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f (cherry picked from commit 39a42f0abd1cffc634fe5ba91dde893bebc43021) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 07:42:40 +0000