Commit Graph

4063 Commits

Author SHA1 Message Date
Dimitrios Apostolou
db23c64876 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>
2020-02-15 07:38:45 +01:00
Dimitrios Apostolou
2693e482b6 Extract archive directly to destination filesystem
Save some seconds or even minutes during provisioning, by avoiding copying
many files across filesystems, from /tmp to /usr/local. We now install
directly to /usr/local.

Change-Id: I3a8f545f1400995095193c4eb337f9dd8534ef72
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:43 +01:00
Dimitrios Apostolou
fc2d0b5150 Create more meaningful temporary file names
Change-Id: I4bbc94993e51502ea08109a4c99f3e212349ab24
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:41 +01:00
Dimitrios Apostolou
b018b841c1 Do not complain about existing empty files
Sometimes we pre-create the target filename using mktemp. In that case of
course the hash will not match, so avoid comparing.

Change-Id: Id0feb0178d659e03f5ceb000f738167cdc28a3ec
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:39 +01:00
Dimitrios Apostolou
25fcda6ff3 Alias expansion is not working reliably in non-interactive shells
It happened that old bash version on macOS the alias was not being expanded
for non-interactive shells running under "bash" but was being expanded fine
when under "sh". Using functions is the recommended way.

Here we define a function conditionally.

Change-Id: I607b265cb9e88b2b529ed170121e5a0833003acd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:37 +01:00
Dimitrios Apostolou
c0033df4b9 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>
2020-02-15 07:38:35 +01:00
Dominik Holland
7b4b2f86a0 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>
2020-02-15 07:38:32 +01:00
Alexandru Croitor
aa977addd2 Bump CMake CMAKE_OSX_DEPLOYMENT_TARGET to 10.14
To hopefully get proper macOS C++17 support.

Change-Id: Icd7fcf49de319e4d20693db356e85f3c5332581e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-14 11:29:00 +01:00
Liang Qi
d6d9806883 Merge remote-tracking branch 'origin/5.14' into 5.15
Disable a no-gui build on Ubuntu 18.04 for 5.15.

 Conflicts:
	coin/platform_configs/default.yaml

Task-number: QTQAINFRA-3406
Change-Id: Ida5271d29b89375c045de0c4e6dc20840a0bc748
2020-02-14 09:49:03 +01:00
Heikki Halmet
fd7bfcc0c5 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>
2020-02-14 05:08:31 +02:00
Alexandru Croitor
dad8e600bd Disable iOS CMake builds until vcpkg is provisioned on macOS
It will be reinstated later once confirmed that all the necessary
bits are there.

Change-Id: I04ca0dda3f9feece8acc9039c8372d346b4f3cd4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-02-13 12:54:44 +01:00
Jani Heikkinen
bb39b8730a Remove 'TP' status from submodules
From Qt 5.15 ->
   - QtQuick3D will be officially supported
   - QtLottie will be officially supported
   - QtQuickTimeline will be officially supported

Task-number: QTBUG-81818
Task-number: QTBUG-81834
Task-number: QTBUG-81922
Change-Id: I5e6efd5ccaf0bb25c83c9b88cc6cc2f8146993e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-13 13:26:46 +02:00
Simon Hausmann
dfb773505c Prospective fix for macOS CMake builds
Adjust the SDK root path to match what's on the system. This should
ideally not be hardcoded here but detected, but for now fixing the build
is highest priority.

Change-Id: I317fe9a4e038cb62cf6cdf06f10a60aa9d975e15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-02-13 09:48:00 +01:00
Qt Submodule Update Bot
59a1bcec4e Update submodules on '5.15' in qt/qt5
Change-Id: I3b32b99876b25e76319a4ed90770c54256649958
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-13 07:08:54 +01:00
Simon Hausmann
4d0a52ddbf Prospective fix for broken cmake builds on 10.14
Add missing dependencies that were there on 10.13.

Change-Id: I1d81e9f50a83486784bef02bf904e3e8c53c4f11
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 22:32:15 +01:00
Alexandru Croitor
de86e584d5 Add iOS CMake builds for qtbase and qtsvg
Change-Id: I8a14aefd0d28f13cb3fe9e80aac2d480a4ad16af
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 19:19:39 +01:00
Alexandru Croitor
f246adc1bd Add CMake builds for qtsvg
Change-Id: Ia219be907e44f3e5ab9cb79cf9bd57ca15b11587
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 19:19:35 +01:00
Samuli Piippo
fe84957439 Change meta-boot2qt platform configs to Module only
This is a workaround for Coin issues where it combines both
Legacy instruction platforms from default.yaml and module_config.yaml
platforms from meta-boot2qt.yaml.

Task-number: COIN-508
Change-Id: I970400cd7d326788ec274c38789d61b4a524989b
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2020-02-12 16:38:39 +00:00
Alexandru Croitor
431eb132a9 Provision Ninja for macOS 10.14 template
Change-Id: I62ad67561de3459fe1a09e645dcc9b40dd2dbb1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-02-12 13:11:03 +01:00
Alexandru Croitor
cd2ac9df6b Fix template name for CMake macOS builds
Change-Id: I5709145b8a1642e27b1de14c37a6d8ccee89107a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-12 13:10:43 +01:00
Simon Hausmann
c802afc31b Remove ICC also for cmake
Switch the static build to GCC instead.

Amends commit 4c55e1cfa7

Change-Id: Id752dcd86c2bda8811427a7bf7b756eee7247992
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-12 08:50:34 +01:00
Simon Hausmann
68419bc36c Switch the cmake build also to macOS 10.14
We've switched the qmake configs as well, so cmake should follow.

Change-Id: Ib0cf4b3ade56714b4437afd5ce301204e5b31d24
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-12 07:47:14 +00:00
Qt Submodule Update Bot
e01ec6d6f5 Update submodules on '5.15' in qt/qt5
Change-Id: I558493f1e9f079824cd1a0e3752dbd1e498c6a27
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.15.0-alpha1
2020-02-12 03:48:05 +01:00
Alexandru Croitor
04e09db02a Enable CMake Coin configurations
This change enables building a few CMake configurations of qtbase in
Coin.
It should only be merged once qtbase wip/cmake -> dev change is
merged.

Change-Id: I7542af91c7f0004219d0155cad485582883e8e95
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-11 16:11:42 +01:00
Samuli Piippo
d4eac1cc92 Don't use legacy instructions for meta-boot2qt project
meta-boot2qt is already using module_config.yaml to define
the CI instructions.

Change-Id: I67e4f8005dce55aea0143236c4aad0bbedaa8def
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-02-11 14:36:47 +02:00
Qt Submodule Update Bot
5f01869f16 Update submodules on '5.15' in qt/qt5
Change-Id: I9b97f5ba649f7deb44c27080f8e5ea7f06ee0df6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-11 06:28:19 +01:00
Qt Submodule Update Bot
e47c4ab772 Update submodules on '5.14' in qt/qt5
Change-Id: Ia508250715b673a2d9e7719b82bd4c6032ef7bda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-10 05:48:25 +01:00
Qt Submodule Update Bot
cf13f18a1f Update submodules on '5.14' in qt/qt5
Change-Id: I11fe2e6c9403823cca54d8ec2cd8c7b79e28170d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-07 08:47:40 +01:00
Qt Submodule Update Bot
704ef6207d Update submodules on '5.15' in qt/qt5
Change-Id: Ib241a47a09ff3a86e3bc1c942e266269e0854950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-07 08:12:38 +01:00
Dimitrios Apostolou
eee60c0824 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>
2020-02-05 22:25:34 +01:00
Qt Submodule Update Bot
24cb0b8afe Update submodules on '5.14' in qt/qt5
Change-Id: I4849b30f1eff5a005d69b68337d7997e38f9e950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-05 18:00:09 +01:00
Sona Kurazyan
601c1bd79b Add qt5compat to submodules list in dev
Task-number: QTBUG-81630
Change-Id: I85f3d4a5ddbef28c217903816568e0420902f694
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-02-04 20:01:02 +01:00
Simon Hausmann
2a64418358 Transition to macOS 10.14 step 1
We want to run all tests on macOS 10.14, which requires some more fixes
in qtquickcontrols2. That however isn't passing due to unrelated changes
in base/declarative blocking us from moving forward. So to decouple the
two, this change limits macOS tests to qtbase and declarative but on
10.14. This will allow us to switch qtbase over to C++17 and once we've
got qqc2 updated in qt5.git, we can globally re-enable tests for 10.14.

Task-number: QTQAINFRA-3108
Change-Id: I0f835a1da87187c6bb69e3d4019196e1411095fd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-02-04 16:54:05 +01:00
Jani Heikkinen
eaf196219b Update qtwebengine
Update QtWebengine for Qt 5.15 Alpha: We need to have
4455081eabc8610112d1cce56a6f6fc64c0be236 in alpha

Task-number: QTBUG-81128
Change-Id: I0030bb44bbb24813e6bb57d8c4b05c83defb6d57
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2020-02-04 13:00:39 +02:00
Qt Submodule Update Bot
f8ab18df91 Update submodules on '5.15' in qt/qt5
Change-Id: I9852c8b494db112d0db24f4d14e355c169b3fecf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-04 09:27:34 +01:00
Qt Submodule Update Bot
8405c73f8e Update submodules on '5.14' in qt/qt5
Change-Id: I8d193d3412712550cf1c3b6beec32365c89185bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-04 06:16:42 +01:00
Alexandru Croitor
25e0073720 Use legacy instructions when building all qmake configurations
This change is preparation for merging qtbase wip/cmake -> dev,
because that will bring in the new yaml instructions on how
to build the CMake configurations, which means that legacy
instructions provided by Coin itself need to be used for all
the existing qmake configurations.

Change-Id: I7005835719b83b7186138292a2e1baf4d2a4a3e0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-02-03 14:15:33 +01:00
Tuomas Heimonen
eb3d2ed68b Provisioning: Remove unistd.h from postreSQL from 64 bit Windows
PostreSQL 9.6 version creates emtpy unistd.h file which will cause
failure in Qt Safe Renderer' MinGW build. By removing it the system
should use the one from the MinGW environment.

Task-number: COIN-488
Change-Id: I76d3f34dd9726dc4f0aac06c410f306dffc8f365
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-02 10:57:42 +02:00
Simon Hausmann
486139715b Disable warnings-are-errors for the doc build
We're not really interested in catching the C++ warnings at this late
stage (Qt5 build), especially not for building documentation.

Change-Id: I48c621ce6de199de61fab8de6517f4c0b099bf11
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-31 12:38:45 +01:00
Lars Knoll
a23bc16dcc Remove wasm on windows for now
The compiler fails to pass the c++14 configure test.

Change-Id: I2253d1654eda19351154467cd3b076ba726c10d7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Qt Submodule Update Bot
09a78c7e84 Update submodules on 'dev' in qt/qt5
Change-Id: I16a797f24169c42eb1b11f9d62905c687af7da4f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Laszlo Agocs
5b56192bc1 Add qtshadertools as a submodule in dev
Task-number: QTBUG-78589
Change-Id: I64da5b9f46ace924e3dd24a1ea062379450f8ca3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Qt Submodule Update Bot
311e9abd1e Update submodules on '5.14' in qt/qt5
Change-Id: Ie3c04cf02a3cf7daeb20408bc7afc7c42c88453f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-31 06:45:02 +01:00
Jani Heikkinen
89fceff6a4 Add '-qt-zlib' as a configure argument for windows builds
This is needed to use the bundled zlib in windows builds. In Qt 5.14.0
windows packages were using bundled one but in Qt 5.14.1 not anymore. So
this change is to restore same behavior than in Qt 5.14.0.

Linux and macOS packages seems to use system zlib also in 5.14.0; that's
why no changes needed there

Task-number: QTBUG-81724
Change-Id: Ife531d96c8438491e5d7b1f97f5338c4627be7e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-01-31 05:43:18 +00:00
Simon Hausmann
3c6f8b1af5 Re-add qtimageformats
Qt Quick Controls 2 styles use webp, which in turn is instantiated by
tests.

Change-Id: I7a9a98f96beecb1f214e9e2caef0062a5716d31e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-30 09:26:13 +01:00
Simon Hausmann
24d977a188 Reduce the set of modules for Qt6 development
Change the amount of modules that are tested together by the CI (and
then used for initial Qt 6 snapshots) to the core essential modules. All
others are set to "ignore" and the objective is to bring them back later
when qtbase/declarative/quick3d development has settled.

Notable exceptions are svg and graphicaleffects due to their strong
dependency from qtvirtualkeyboard as well as qtquickcontrols2.

Change-Id: I972d7b353add1f5dbad5104ce84c4cc5b8c6f616
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-29 10:39:01 +01:00
Heikki Halmet
e7cf4b21f1 Provisioning: Remove unistd.h from postreSQL
PostreSQL 9.6 version creates emtpy unistd.h file which will cause
failure in Qt Safe Renderer' MinGW build. By removing it the system
should use the one from the MinGW environment.

Task-number: COIN-488
Change-Id: Id7f2f5024998cc5fbeb61e144bcd87f6e09b2bb1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2020-01-28 17:07:16 +02:00
Liang Qi
eee24c15d7 Merge remote-tracking branch 'origin/5.14.1' into 5.14
Change-Id: Ie43351d7e64b121137e9a923c79a0f26ae7e086a
2020-01-28 13:14:41 +01:00
Lars Knoll
4c55e1cfa7 Remove ICC from our list of tested platforms for now
ICC 18 doesn't support C++17, so let's remove it.

Change-Id: If87010fe73111324f78ccd26f25e55ec7e6afbca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-28 12:23:36 +01:00
Qt Submodule Update Bot
0e336aea87 Update submodules on '5.14' in qt/qt5
Change-Id: I35cf6c5d4c63ed0dddda80ac85cd7e675334992b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-28 10:53:05 +01:00