lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,312 Commits 120 Branches 272 Tags
4e2e65c7f17e57727ccf13c7a079cc04bed6c8fe
Commit Graph

4312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
826d95df85 Update submodules on '5.15' in qt/qt5 
Change-Id: I1d5374eb04e8bb23af1581c4f091503ccc1fe310
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-06 23:46:05 +02:00
Heikki Halmet
48ff0140de Provisioning: Disable windows defender firewall 
Service is still running. It need to be disabled.

Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-05-06 14:44:31 +03:00
Qt Submodule Update Bot
e85c0e88cf Update submodules on '5.15' in qt/qt5 
Change-Id: I95cc4f3c7d2b6d745e50c4fe5405527a06423c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-05 19:53:44 +02:00
Qt Submodule Update Bot
db44923e30 Update submodules on '5.15.0' in qt5 
Change-Id: I9e83c1d5063f0e6013bd1667987cea949e77809a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.15.0-rc1 		2020-05-05 08:30:54 +00:00
Qt Submodule Update Bot
2bc89aec9b Update submodules on '5.15' in qt/qt5 
Change-Id: I9d169c17ce5772771e51bc58463919ed7c8ed0a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-05-04 23:46:00 +02:00
Alexandru Croitor
9f4a39356a CMake: Switch host macOS configurations to framework release builds 
Also include debug info. This is the equivalent of qmake's
--release --framework --force-debug-info --separate-debug-info

Change-Id: I2778b4998890146c82552f9c721a48174a764839
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
 2020-05-04 22:50:17 +02:00
Alexandru Croitor
4dace06297 CMake: Enable a MinGW 7.3 CMake qtbase configuration 
It should be a developer build, but due to some features
that are not ported in src/gui/configure.cmake (directwrite)
there are compilation errors due to unused arguments in
static bool QWindowsFontDatabaseBase::init(QSharedPointer)
in platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp

So it's not a developer build for now.

Task-number: QTBUG-75578
Change-Id: Ieb6daca45473ea42748a39f3e9e33a9db087a0e0
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
 2020-05-04 18:01:22 +02:00
Liang Qi
9deba571f9 Temporarily disable QNX builds because license expiry issue 
Task-number: QTQAINFRA-3708
Change-Id: I676ad2e519ab527e079648d41a1ff015a2a17657
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-05-04 15:16:19 +02:00
Heikki Halmet
8f653ce4f8 Provisioning: Add sleep before killing gpg-agent in msys installation 
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
(cherry picked from commit 5f03b84e65)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-05-04 14:42:03 +03:00
Heikki Halmet
71043ca243 Provisioning: Update expired QNX license 
Task-number: QTQAINFRA-3708
Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-05-04 14:41:54 +03:00
Qt Submodule Update Bot
e2d2d25a57 Update submodules on '5.15.0' in qt5 
Change-Id: I4e92a9fdd0602c41477345169899623c036e5edb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-04-30 17:43:46 +00:00
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
 2020-04-30 18:35:08 +02:00
Qt Submodule Update Bot
ff4a1141f2 Update submodules on 'dev' in qt/qt5 
Change-Id: I96f194ffeecc40522b5ed69b0bd2d2e03045cfd9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-30 15:44:59 +02:00
Simon Hausmann
3265e93168 Try to build qtbase with cmake against Yocto 
This adds the basic armv7 configuration and passes through two
additional variables for use in the build instructions:

    * QT_YOCTO_ENVSETUP points to the environment-setup script that the
    Yocto SDK expects to be sourced before building against the target
    sysroot.

    * QT_CMAKE_DIR points to the directory that contains our cmake
    installation. Since the environment-setup prepends the Yocto host
    bin dir to the PATH, we'd end up picking the wrong cmake.

Also the choice of system Harfbuzz is disabled as Qt does not build
against the version shipping in Yocto.

Change-Id: I8d657e773143c4db0e2437d029d62372f7b7e638
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-30 12:02:42 +02:00
Heikki Halmet
5f03b84e65 Provisioning: Add sleep before killing gpg-agent in msys installation 
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2020-04-30 11:05:15 +03:00
Qt Submodule Update Bot
d937578404 Update submodules on '5.15.0' in qt/qt5 
Change-Id: I2fe48b7e734bdf86f159af47cd2b6f613172afa2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-29 12:14:01 +02:00
Alexandru Croitor
4aa9c4df11 CMake: Enable CMake builds for qtquick3d 
Change-Id: I9547c73e8a632754d043bff8c72c29c18449bfd9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2020-04-27 10:04:09 +02:00
Qt Submodule Update Bot
20668c9233 Update submodules on '5.15' in qt/qt5 
Change-Id: Ia0fb6c1f5f1ae1dafaf0999fdc7c1cc5ba765bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-26 23:45:55 +02:00
Qt Submodule Update Bot
d88858d98b Update submodules on '5.15.0' in qt/qt5 
Change-Id: Id2db92b9b2928ea7452edb313cc673581bf12b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-25 08:30:51 +02:00
Qt Submodule Update Bot
230e99400c Update submodules on '5.15' in qt/qt5 
Change-Id: I6dd7a38815ff1bd13b3b8d1c9a4042c3b0981784
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-24 23:46:00 +02:00
Liang Qi
3050559262 Merge remote-tracking branch 'origin/5.15' into 5.15.0 
Conflicts:
	.gitmodules

Change-Id: I72e0314fbc563a2386f2389239b927f57124c511
 2020-04-24 22:34:43 +02:00
Liang Qi
5b018f96af Update submodules on '5.15' in qt/qt5 
Change-Id: I06f83013c085e342e8391a705ba5ecf156bd5159
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-24 15:59:44 +02:00
Liang Qi
cc4fdea014 Merge remote-tracking branch 'origin/5.14' into 5.15 
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsdk.yaml
	coin/platform_configs/tqtc-qt-rta.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
 2020-04-24 15:31:01 +02:00
Qt Submodule Update Bot
ac8b28db57 Update submodules on '5.14' in qt/qt5 
Change-Id: I919625c0e3a2fdd5dea9dab691c9bc96f62161fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-24 09:48:03 +02:00
Liang Qi
882294edc3 Merge remote-tracking branch 'origin/5.14.2' into 5.14 
Conflicts:
	.gitmodules

Change-Id: I950588f85d1b39ba6ce994821db9f340b72fa6d2
 2020-04-23 12:27:46 +02:00
Qt Submodule Update Bot
10e07c7877 Update submodules on '5.14' in qt/qt5 
Change-Id: Ibdc80d4d7abad334e96f6c5d7c602e42a9d1b31f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-23 10:32:55 +02:00
Qt Submodule Update Bot
767711b44a Update submodules on '5.15.0' in qt/qt5 
Change-Id: Iba9ab3074ef49a9060ce594a0d30083891338e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-23 08:13:47 +02:00
Qt Submodule Update Bot
285f2c5690 Update submodules on '5.15' in qt/qt5 
Change-Id: I62fa79986a2ccbf3ee4e000f4f767731bf31fd2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-23 06:02:52 +02:00
Qt Submodule Update Bot
4d435697fa Update submodules on '5.15' in qt/qt5 
Change-Id: I0c4e65146b752463190fc98e9f670c3b00eac283
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-21 23:46:35 +02:00
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml 
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 16:46:47 +02:00
Qt Submodule Update Bot
133403b829 Update submodules on '5.15' in qt/qt5 
Change-Id: Ic1acfd2ae08a13f88e45e822a34b673e7470aa72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-21 10:57:24 +02:00
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml 
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 10:02:36 +02:00
Volker Hilsheimer
82ed571cde Add Pick-to footer for cherry-pick bot to commit template 
Change-Id: Idec00573bdbebda4d3b3481eee480c91c5d8d1de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2020-04-20 11:04:27 +02:00
Qt Submodule Update Bot
30b0878b18 Update submodules on '5.15' in qt/qt5 
Change-Id: I53ce054fd386e55c6b9b0954c8636716a4ae08b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-17 23:46:29 +02:00
Qt Submodule Update Bot
cafd0f0019 Update submodules on '5.14' in qt/qt5 
Change-Id: Ifdae4eace5516c6b2886560c7c5da46954b8e712
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-17 22:31:06 +02:00
Qt Submodule Update Bot
908afb868a Update submodules on '5.15' in qt/qt5 
Change-Id: I9c627825712c1c2bc196a8e0d3259189aa43d71b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-16 23:46:26 +02:00
Kari Oikarinen
f008144b88 Adjust submodule branches 2020-04-16 09:14:58 +03:00
Qt Submodule Update Bot
4d3751fe3b Update submodules on '5.15' in qt/qt5 
Change-Id: I2229401bd16f8f5a5f99f0b92c1ea29d03a661d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-15 23:46:40 +02:00
Mårten Nordheim
176d9ce09c Don't manually rerun conan Run-Conan-Install 
Modern conan will retry downloads on its own. Change default number of
attempts to 5 for more reliability.

Change-Id: Iafd4845b31c3e5fb296ba0b897cbf2030c412b04
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
v5.15.0-beta4 		2020-04-15 09:53:44 +03:00
Rami Potinkara
08b99e8def qdb building for mac 
Modified qdb.yaml and created and pkgconfig and libusb relates .sh
files so that QDB can be build for Mac OS due to USB Ethernet CDCECM enabling.

Task-number: QTBUG-82531
Change-Id: Ia5f970e5940b7d9116831c8174db0ea1b9231234
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
 2020-04-15 08:28:12 +03:00
Heikki Halmet
61267a7a78 Provisioning: Remove notifications and warnings from macOS 
Notifications and warnings in UI might affect RTA and autotests results

Change-Id: I447dab3ba839d2c577f633cbf96fc7f3e5fdfe25
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
 2020-04-14 14:21:19 +03:00
Qt Submodule Update Bot
8a5938bd22 Update submodules on '5.15' in qt/qt5 
Change-Id: Ie44a49c9f1d432865b37297323418c0a831b502c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-14 10:16:53 +03:00
Heikki Halmet
bb13978b01 Provisioning: Disable Connected User Experiences and Telemetry service 
Task-number: QTQAINFRA-3609
Change-Id: Ie4df9a3b47cf9adcfc0afa1eaf75386e9452fd42
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-11 08:33:29 +03:00
Qt Submodule Update Bot
606bbd68c4 Update submodules on '5.14' in qt/qt5 
Change-Id: Ic9e8123184a04c43ad06aee8cabc2f97006ca694
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-10 22:31:14 +02:00
Heikki Halmet
5148639647 Provisioning: Activate subscriptions 
Task-number: QTQAINFRA-3638
Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2020-04-09 14:08:24 +03:00
Qt Submodule Update Bot
f63b095561 Update submodules on 'dev' in qt/qt5 
Change-Id: Ie35c05cb101d3a5e44ec2fbe5cb8bad2e16f785a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2020-04-09 08:08:51 +02:00
Qt Submodule Update Bot
93f50f13fe Update submodules on 'dev' in qt/qt5 
Change-Id: I67165031f648c6e4f662e832635c4e55265a0c5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-09 00:00:09 +02:00
Qt Submodule Update Bot
2c10dd3510 Update submodules on '5.15' in qt/qt5 
Change-Id: I820f8ebf9e428fe2b71b0aa64e5c6aeca744b82e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-08 23:46:27 +02:00
Qt Submodule Update Bot
26526c4560 Update submodules on '5.14' in qt/qt5 
Change-Id: I4c3ec2af33f0fccb8b5864340ba27187028f8a1d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-08 22:31:17 +02:00
Qt Submodule Update Bot
ae846322ea Update submodules on 'dev' in qt/qt5 
Change-Id: Ib9c73befcbb68f5dbf4abb8931bfee41827c8e05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-08 00:00:23 +02:00