Commit Graph

3792 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
e7f83d3965 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I772c45349591464651967f6af6768da7b5bc8488
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-14 07:03:06 +00:00
Qt Submodule Update Bot
0412433d78 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ibdff612fbed373a813ca3add2a00a6c06016f64d
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-11 10:09:19 +00:00
Leander Beernaert
b01225fb32 Read module list from .gitmodules
This patch mimics the behavior of qt.pro, where the module list is
extracted from the .gitmodules file and then topologically sorted
based on the modules dependencies.

This patch also introduces a small check to make sure all the required
dependencies are met and will be built.

Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-01-10 14:49:51 +00:00
Qt Submodule Update Bot
79bdf27954 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I17a3efcedb0bffc5a2cbfb8ed091c6c2448c4706
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-10 13:00:18 +00:00
Liang Qi
6ee5857ec8 Add macextras to the qt5 build
Change-Id: I16b1ca99bff69f203aea27b144c537f2834b1620
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-09 19:32:17 +00:00
Kevin Funk
7509458d5f Start the CMake superbuild
Also import and use ECMOptionalAddSubdirectory.cmake to add other
module's as subdirectories, in case the directories exist. Additionally
this module allows to disable the build of submodules by passing e.g.
BUILD_qtsvg=OFF.

This probably needs more though on how to hande the intermodule dependencies,
but it's a start.

Task-number: QTBUG-75582
Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-01-08 13:11:16 +00:00
Qt Submodule Update Bot
1f017ffbff Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I7a522eaf1449708afa1c1b965c23eded7f769c61
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-08 12:50:53 +00:00
Qt Submodule Update Bot
0f361744ed Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I451ad6e95b4167ff1cfd61856019d1e3dbc2d283
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-07 14:37:29 +00:00
Alexandru Croitor
0a3a855774 Build an iOS configuration in Coin
Install ninja from homebrew.

Provision freetype and pcre2 for host builds, like in the
macOS 10.13 case.

Provision homebrew gcc 9 to build vcpkg.
We can't use Xcode 11 clang to build vcpkg, because std::filesystem
is only implemented for macOS 10.15, so the deployment target needs
to be 10.15, and we don't have any 10.15 VMs currently.
Whereas the std::filesystem implementation provided by gcc can work
on lower macOS versions.

When building vcpkg using the Xcode default provided system headers,
the build will fail with the following error:

stdio.h:222:7: error: conflicting declaration of 'char* ctermid(char*)'
with 'C' linkage

_ctermid.h:26:10: note: previous declaration with 'C++' linkage

The Xcode SDK is missing some C++ headers. Usually these are
installed manually via an additional step like the one below,
but only after installing the command line tools.

sudo installer -pkg
/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg
-target /

Apparently not all command line tool packages ship this extra header
package, so instead switch the active toolchain to the CLT via
xcode-select -p, which seems to always have the necessary headers
(at least from my testing).

That's why we use the CLT for vcpkg.

Bootstrap vcpkg, and install the iOS 3rd party packages using vcpkg.

Finally add a configuration to build qtbase targeting iOS.

Task-number: QTBUG-75576
Change-Id: Idec885d62b12f96c4830b9ec02b63a89b9cc7b8c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-12-17 20:45:05 +00:00
Leander Beernaert
66d9087cf5 Update QtTools submodule
This is required for QtTranslations to work properly.

Change-Id: I0e8373b4199eb8bdc5e4f7a9429056c58847c262
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-17 10:52:22 +00:00
Alexandru Croitor
3aef268464 Update vcpkg snapshot
The snapshot uses the previous snapshot as a based. It was rebased
on latest master as of 2019-12-05, and also contains cherry-picked
patches to target iOS.

Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-12-11 20:58:03 +00:00
Qt Submodule Update Bot
bbe2ca1f14 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia8dbab68e5a7dd4f136e6345d6c1da9705d4be69
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-11 02:31:30 +00:00
Qt Submodule Update Bot
d47213e974 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I8a50e284b785b7441826ed4f199a5db4c2be6f6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-10 05:06:00 +00:00
Qt Submodule Update Bot
f38665a06a Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I0c29a5b3944a20d6652c0c8cb1199abae9683f93
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-07 21:58:23 +00:00
Qt Submodule Update Bot
ec79fbe5ec Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-04 08:41:15 +00:00
Alexandru Croitor
8c94279a59 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-03 16:48:34 +00:00
Qt Submodule Update Bot
d7a4a50e2d Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-12-03 05:52:31 +00:00
Qt Submodule Update Bot
096fd23eb8 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 17:43:05 +00:00
Liang Qi
bdaf92aa41 Correct branches for .gitmodules
This amends eabc1ed5bd.

Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 15:55:39 +00:00
Liang Qi
61ffa2778f Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 15:44:24 +00:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-29 10:00:50 +00:00
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
2019-11-28 19:44:30 +01:00
Liang Qi
0d6ae070f4 Update submodules on 'dev' in qt/qt5
Only qtwebengine and qtmultimedia this round.

Change-Id: If5f67c96d26d7721fdb350bb27fbea82aced8e14
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-27 06:10:06 +01:00
Leander Beernaert
3ba8bdeda0 Update qt5.git
Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-25 16:40:40 +00:00
Liang Qi
86b9edca68 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml

Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
2019-11-22 17:26:28 +01:00
Liang Qi
b5c9819be2 Update submodules on '5.15' in qt/qt5
Only qtmultimedia this round.

Change-Id: I00a94d159457f50a70a9b9eddedd3efd56870e51
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-21 18:42:57 +01:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
2019-11-20 07:29:43 +01:00
Heikki Halmet
dcfef7226f Provisioning: Change JDK script to use 'Remove' function from helpers
Task-number: QTQAINFRA-3369
Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 08:08:10 +02:00
Heikki Halmet
0335e9c4e5 Provisioning: Remove shell scripts under windows
Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 09:08:04 +03:00
Heikki Halmet
601a9d39b2 Provisioning: Install python modules needed by packaging
Needed by packaging scripts

Task-number: COIN-214
Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-11-20 08:07:58 +02:00
Liang Qi
edb5ebfb7e Update submodules on '5.14' in qt/qt5
Change-Id: Ia052f103935e8451e10258315370009b9b24f596
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-20 07:07:48 +01:00
Liang Qi
6d7ae7ebe1 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/common/linux/docker.sh

Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
2019-11-18 19:21:53 +01:00
Heikki Halmet
d8eaed9b09 Provisioning: Update Android NDK version to r20 for macOS 10.14
Task-number: QTQAINFRA-3337
Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-11-18 14:23:08 +02:00
Qt Submodule Update Bot
a72db33bfc Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-16 21:42:42 +00:00
Alexandru Croitor
eabc1ed5bd Add a few more ported repos to qt5.git wip/cmake
Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-15 13:02:52 +00:00
Jani Heikkinen
5d5ef9c32b Enable dSYM files for release builds in macOS
Same flag is used in windows and linux ones and it seems that is needed
to enable dSYM files for release builds

Task-number: QTBUG-3934
Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-15 06:22:55 +02:00
Tor Arne Vestbø
6bf7a970e7 Use Xcode 11 on macOS 10.14
Fixes: QTQAINFRA-3261
Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:04:33 +00:00
Tor Arne Vestbø
40cca42c39 Use macOS 10.14 to build iOS/tvOS/watchOS
Allows us to (as a follow-up) use Xcode 11.

Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:08:00 +01:00
Qt Submodule Update Bot
3903c2a72d Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I28901d350b1f16b9a6b3d9776ee8055ea3356ade
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-14 14:55:50 +00:00
Qt Submodule Update Bot
4728ffb620 Update submodules on '5.13' in qt/qt5
Change-Id: I7ba7a20377d5fbe2b390ec1aeed82e74eb974eba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-14 08:46:24 +01:00
Dimitrios Apostolou
ef7481b9cd Workaround broken local apt mirror
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>
2019-11-14 08:46:22 +01:00
Dimitrios Apostolou
33d2547817 Keep debug trace off to avoid polluting the logs
Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:20 +01:00
Dimitrios Apostolou
a270bcdb6b Docker installation: do not depend on external repositories
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>
2019-11-14 08:46:18 +01:00
Dimitrios Apostolou
fafd3d655d Fix cache URL for telegraf windows package
Fixes: QTQAINFRA-3340
Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-14 08:46:16 +01:00
Dimitrios Apostolou
6cc2215b8c DownloadURL last argument (targetFile) is now optional
Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:14 +01:00
Qt Submodule Update Bot
df8310ced1 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I26274b1707fd4d12a4da5503b9a414414f29148b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-13 21:25:12 +00:00
Simon Hausmann
1aa25c1084 Bump vcpkg to a new snapshot
Some patches were upstreamed and this beings the version in line with
what we need for Android. This patch also centralizes the version into a
shared file, for future use.

Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-13 09:57:53 +00:00
Leander Beernaert
8eab11f696 Update CMake to version 3.15.5
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-12 13:27:23 +00:00
Heikki Halmet
569fd1dabc Provisioning: Install pre-builded openssl for Windows 7
Task-number: QTQAINFRA-3224
Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-12 07:09:49 +02:00
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
2019-11-11 10:52:16 +01:00