Just to be consistent with the rest of the files.
Amends 803eb987ad
Task-number: QTBUG-80899
Change-Id: I26212c5367da7b8bf14e4a7d46b96ffb82bf9aab
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Add simple instructions to only configure and not build top-level
builds, similar to what the qmake configurations do.
The CMake configurations need to be copy-pasted again into qt5.yaml.
We can't use default.yaml because that would enable CMake
configurations for repositories that are not ported to CMake, and
thus break the integrations.
Update qtqa sha1 to a dev branch one which contains the
module_config.yaml instructions to build qtqa with CMake.
Task-number: QTBUG-84874
Task-number: QTBUG-84918
Change-Id: I8c64f5e0acc96e14a4952abb6c77fe5c8e27a0ec
Reviewed-by: Liang Qi <liang.qi@qt.io>
Coin now has CMake 3.17, so iOS multi-arch builds should
successfully build.
Switch the iOS CMake configurations to simulator_and_device ones.
Task-number: QTBUG-80899
Change-Id: I9c8bde9f1a3c483ea296f3d9d06f089cbfdf2416
Reviewed-by: Liang Qi <liang.qi@qt.io>
We can re-add them later when issue got fixed.
Task-number: QTBUG-84924
Task-number: QTBUG-84925
Change-Id: I2545e5fe03fd44a6016305723b57db8c0d6e9470
Reviewed-by: Liang Qi <liang.qi@qt.io>
There's a new dev branch for qtqa, so we can re-enable CMake builds
of qtqa using that branch, without breaking builds of other branches.
This reverts commit 33e8275ee5.
Task-number: QTBUG-84233
Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Mostly duplicate anyway, and not currently possible to install node.js
on.
Change-Id: I23a81ddb45b0597f31b1402e362f83957b5be8ae
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Revert the change because the qtqa instructions have been
temporarily removed to unblock other branches.
This reverts commit a10584e57c.
Change-Id: I76646026b099d3b039eec6cdaecfbbce6df43aa2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This is only a cosmetic fix. That value is not used anywhere anymore.
Task-number: QTQAINFRA-3757
Change-Id: Iabba6202e7ddbb08e58901a591ba0171e8dd1fc9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Only includes one MinGW configuration, to mirror what Coin does
with the qmake builds of qtqa.
Switching the Coin instructions to do license checking and binary
compatibility testing using CMake will require a different change.
Most likely this change will have to wait until all of qt5.git/dev
is moved to use yaml instructions for building, rather than the
hardcoded instructions provided by Coin.
Besides, the binary compatibility test still depends on finding
qmake to run its test, which might have to be changed in the future.
Task-number: QTBUG-84233
Change-Id: I5ab7120e965f7729968697abf9e0db602c216cd9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
And configure with two configurations, RelWithDebInfo and Debug.
This is equivalent to qmake's
--debug-and-release --force-debug-info
This should give us minimal coverage for debug-and-release builds,
as well as avoid regressions with NMC aka multiple configurations.
If the qtbase builds successfully, we can try to extend the rest of
the repositories to also build with NMC on Windows.
We can't add such a configuration to macOS for now, because it
requires CMake 3.18, which is not released yet.
Disable PCH because it seems to fail the build when used together
with Ninja Multi-Config.
Task-number: QTBUG-80900
Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This is in preparation to turning this off by default in configure,
as it increases build times significantly.
Change-Id: I2d601595ce8c093765194f36ec5235f79dd4dd7d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
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>
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>
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>
We can't build the wasm version of qtbase any longer
Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
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>
Needed for enabling all the various OpenSSL classes in Qt.
Change-Id: Ic20ab464552317a2753ae0e35043e16cc6c60ab3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
These are also updated to tier1 image:
msvc 2017: Not installed
msvc 2019: version 16.4.4
msvc 2019 build tools: version 16.4.4
Task-number: QTQAINFRA-3623
Task-number: QTQAINFRA-3417
Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Commit 89fceff6a4 added -qt-zlib to all Windows configure lines.
This also affected QNX. Instead, only pass -qt-zlib to native builds.
Fixes: QTBUG-82254
Change-Id: I116cae82ab971170e633b5a8602dd573407be96f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This is needed to include various fixes to allow building the CMake port
against the contained sysroots.
Change-Id: I42fc055a0e1e2abe5567b9ac3e1bc5e20fcd9900
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Apparently standalone Debug iOS builds are not supported in qmake
at the moment as per QTBUG-71990.
While we keep the same configure.json error reports for both qmake and CMake
it's simpler to switch the config to Release.
Once we get Ninja Multi-Config in Coin working, we can switch to
debug_and_release.
Change-Id: I406012918fd402ad0ff29bbdc151e247699eea72
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Now that qtbase supports building bundled 3rd party libraries, we
should have no need for vcpkg in Coin anymore.
Change-Id: I7aa7b0323416b60ffb0cd70eec287e5f25963d9a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>