lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,237 Commits 118 Branches 270 Tags
acbd59bafeb81f372e1fe9e039b3adb6fcb3955b
Commit Graph

3237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
acbd59bafe Update submodules on '5.12' in qt/qt5 
Change-Id: I042181709c2712e70021a1ba66dbe1d02543ccb3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-08-15 01:30:51 +00:00
Qt Submodule Update Bot
0865b61149 Update submodules on '5.12' in qt/qt5 
Change-Id: Ib5d2175a1d3c51a32fcbe0225a3a399b4f1d5d64
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-08-14 01:30:54 +00:00
Qt Submodule Update Bot
bc5bb7fa87 Update submodules on '5.12' in qt/qt5 
Change-Id: Iea18726bc4ea89d31cba6d5339c030d36e476265
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-08-11 01:30:57 +00:00
Qt Submodule Update Bot
2e347b2ac3 Update submodules on '5.12' in qt/qt5 
Change-Id: Ia2a28c3e089260694e387e23934f4f3bd1951673
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-08-09 01:30:51 +00:00
Qt Submodule Update Bot
b714be3898 Update submodules on '5.12' in qt/qt5 
Change-Id: Ibe3300f4c50e617b6ff0ddf3ff1a599c87b8382f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-08-04 01:30:55 +00:00
Qt Submodule Update Bot
f959fac54b Update submodules on '5.12' in qt/qt5 
Change-Id: I5f48414f38601de8b2f081df94a64c78a88d18b6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-08-02 01:30:51 +00:00
Toni Saario
573c35b164 Update windows tier1 image 
Changes in coin to virtual machine template exposed a bug where older
windows version deadlocks jom in multithreaded environment.
-16 version of the windows 10 image is latest to include msvc2017,
update to this.

Task-number: COIN-598
Change-Id: Icc75ad4a6029332ebcd4acaad563156a139dc280
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2020-07-31 12:24:14 +00:00
Qt Submodule Update Bot
d9849f0107 Update submodules on '5.12' in qt/qt5 
Change-Id: I2689da8cd59ef8b87545495b7de2467be65afe66
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-07-15 01:30:52 +00:00
Qt Submodule Update Bot
c69f19090d Update submodules on '5.12' in qt/qt5 
Change-Id: I83ba3592e275a82fc44b81b03f5ec7b82c5289dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-07-12 01:30:54 +00:00
Qt Submodule Update Bot
126a7d42bc Update submodules on '5.12' in qt/qt5 
Change-Id: I4a6afd607a9d1b51e7a3c729fa5272fb1d5d593a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-07-10 07:58:29 +00:00
Qt Submodule Update Bot
4d5059d959 Update submodules on '5.12' in qt/qt5 
Change-Id: I5d5e03c11dfd34d6efc54c940d9a3485b51be2e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-07-08 01:30:53 +00:00
Qt Submodule Update Bot
990ca42c39 Update submodules on '5.12' in qt/qt5 
Change-Id: I9b08589a4949f9a0b4fd0badcb7b26239b295c9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-07-07 01:30:51 +00:00
Qt Submodule Update Bot
9b463661e5 Update submodules on '5.12' in qt/qt5 
Change-Id: Ie265c92a49cce192a75ab628a182d8d36badbee1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-07-04 01:30:51 +00:00
Qt Submodule Update Bot
3cf5fd7d5c Update submodules on '5.12' in qt/qt5 
Change-Id: I617dd239460e526c64e9d661ec57b558334fd12b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-27 01:30:48 +00:00
Qt Submodule Update Bot
eabdd54a78 Update submodules on '5.12' in qt/qt5 
Change-Id: I5a20499e4ecb30eed72775dad6d26c12096d77d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-25 06:52:43 +00:00
Qt Submodule Update Bot
d5cc6ad04e Update submodules on '5.12' in qt/qt5 
Change-Id: I2cdd332febdc1bdc97a5b22b9b6eeec78150798f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-23 01:31:16 +00:00
Qt Submodule Update Bot
b8c2b6f67e Update submodules on '5.12' in qt/qt5 
Change-Id: I88683ef7ac233fe4a9c1a6eba60a20a18823f3f2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-20 01:30:49 +00:00
Qt Submodule Update Bot
44f3bca7d8 Update submodules on '5.12' in qt/qt5 
Change-Id: I7606bb6b374aa44091c8f398fc4c22096356f4e0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-19 01:30:48 +00:00
Qt Submodule Update Bot
4db16af519 Update submodules on '5.12' in qt/qt5 
Change-Id: I11e77c5de8af099eabb61a939b1a3cdd29d8c08c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-18 11:12:25 +00:00
Heikki Halmet
5b70bb480e Provisioning: Use signed opengl32 package 
Task-number: QTBUG-80252
Change-Id: Ife9942796ed64c4e2894fb3342259c674cf5d7ed
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 9c33fe844a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-06-11 08:09:30 +03:00
Qt Submodule Update Bot
00fbdd5572 Update submodules on '5.12' in qt/qt5 
Change-Id: I460962439ac832f117facd57c60f94fcc70d3d79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-10 01:31:03 +00:00
Qt Submodule Update Bot
0b0c3e1f07 Update submodules on '5.12' in qt/qt5 
Change-Id: I8e57a1360ceea15f42a46b06d86f7a7574222290
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-09 01:30:53 +00:00
Qt Submodule Update Bot
4c6dfebb25 Update submodules on '5.12' in qt/qt5 
Change-Id: I9b6d7aa5219cc0137145040465eceb804381a356
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-08 01:30:48 +00:00
Qt Submodule Update Bot
f23bec971f Update submodules on '5.12' in qt/qt5 
Change-Id: I387f6d2d902bf8d33d3c14076c0477bcc67fd0f9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-06-05 10:53:54 +00:00
Qt Submodule Update Bot
d3e6bf5055 Update submodules on '5.12' in qt/qt5 
Change-Id: I1155362f9c892aca06d1d4432677cdfe0cbeb782
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-05-26 08:29:48 +00:00
Liang Qi
076fdbe289 Merge remote-tracking branch 'origin/5.12.8' into 5.12 
Conflicts:
	.gitmodules

Change-Id: I5a3c7de3adc990e1294bb0fde461ddd4e1557b37
 2020-04-23 10:02:32 +02:00
Heikki Halmet
0f0ff063d2 Provisioning: Enable RPMS for Redhat 6.6 
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>
 2020-04-20 13:20:13 +03:00
Qt Submodule Update Bot
7c66bb9ff5 Update submodules on '5.12' in qt5 
Change-Id: I643c5a49307fcc90b09615c26146fc7f76dbd891
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-04-20 08:16:06 +00:00
Heikki Halmet
7759daa6ff Provisioning: Activate subscriptions 
Task-number: QTQAINFRA-3638
Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943
(cherry picked from commit 5148639647)
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
 2020-04-16 08:48:38 +03:00
Dimitrios Apostolou
09dcc777ee Execute a specific version of homebrew install script 
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 c0033df4b9)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-02 10:35:07 +03:00
Qt Submodule Update Bot
cd7c03f4de Update submodules on '5.12.8' in qt/qt5 
Change-Id: I16e001dcce7d0c3b9eeb84eeaf5732af00652062
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.8 		2020-03-31 14:09:44 +00:00
Kari Oikarinen
5f2dcfd862 Adjust submodule branches 2020-03-16 09:30:10 +02:00
Qt Submodule Update Bot
893c9eac86 Update submodules on '5.12' in qt5 
Change-Id: Ib6cbea4b4a921d9bbe6696f0949457df170535cf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-03-13 04:58:13 +00:00
Simo Fält
dc70564fa0 Add installer-framework specific platform configs 
Task-number: COIN-287
Change-Id: If9de982bc40ae86176fe0a233efea150b0a2811e
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
 2020-03-09 09:33:16 +02:00
Konstantin Tokarev
11c702414f Provisioning: update Conan and Conan packages to latest versions 
Task-number: QTQAINFRA-3556
Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit b73e61a458)
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
 2020-03-07 11:42:48 +02:00
Simo Fält
e4d68cf15e Remove pip installation 
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>
 2020-02-20 12:02:45 +02:00
Qt Submodule Update Bot
cf3f62f9c5 Update submodules on '5.12' in qt/qt5 
Change-Id: If76c9b4e573e741e693b5c35d6a62de4c0038419
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-02-18 09:35:41 +01:00
Heikki Halmet
fca65a7dfb Provisioning: Update signing tools for macOS 
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 fd7bfcc0c5)
 2020-02-18 10:35:35 +02:00
Dimitrios Apostolou
9e4446b646 Fix openssl build in SLES-15 
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 eee60c0824)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2020-02-18 08:35:27 +00:00
Dimitrios Apostolou
3c29b705c3 08-pythondev build should not execute external script 
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 db23c64876)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2020-02-18 08:35:20 +00:00
Dominik Holland
533daaa537 Provisioning: Update jinja2 to 2.10.3 
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 7b4b2f86a0)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
 2020-02-18 08:35:13 +00:00
Liang Qi
9430479427 Update submodules on '5.12' in qt/qt5 
Change-Id: I06b7d79a3f81bb4b1296bc46cabc857c4be18264
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-02-04 11:28:58 +01:00
Liang Qi
5f9d2ad8c6 Merge remote-tracking branch 'origin/5.12.7' into 5.12 
Change-Id: I5075e16f288d4c28616d7ac18cb2292edc47ca31
 2020-02-03 14:49:19 +01:00
Qt Submodule Update Bot
8d52fefbcf Update submodules on '5.12.7' in qt5 
Change-Id: I290ccf0d58159c0ac641ad0abbb7d5bd3a0a1872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.7 		2020-01-28 13:31:38 +00:00
Qt Submodule Update Bot
e60a53e5ca Update submodules on '5.12' in qt/qt5 
Change-Id: Ib4fe6314ba3c47397437f441e75c903e68f34128
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-01-26 15:42:16 +01:00
Qt Submodule Update Bot
d33150d656 Update submodules on '5.12.7' in qt/qt5 
Change-Id: Ib92dbf253c2abd757aaa324b1ccefe31a26bb6c1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-01-25 05:32:50 +01:00
Jani Heikkinen
7fa1fba5a3 Merge remote-tracking branch 'origin/5.12' into 5.12.7 
Change-Id: Idcebfb9dd7be92e0130f9aa36046a41532fd2589
 2020-01-23 13:35:57 +02:00
Jani Heikkinen
7cfe9a0ebf Update enterprise license agreement v4.2.1 
Task-number: QTBUG-80661
Change-Id: Icc3a1408b104ad2f08cd6959ee4bcb8da2fb69cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 62d75f883c)
 2020-01-19 06:58:38 +00:00
Kari Oikarinen
12a152be37 Adjust submodule branches 2020-01-16 11:33:55 +02:00
Jani Heikkinen
e0958213f9 Update QT LICENSE AGREEMENT Agreement version 4.2 in qt5 root 
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 ad52452416)
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
 2020-01-15 11:42:38 +00:00