Commit Graph

61 Commits

Author SHA1 Message Date
Eike Ziller
8e8ebc8f88 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	coin/instructions/build.yaml

Change-Id: I697b0107e75c6259989247de2180437d7987ff37
2023-05-17 14:55:02 +02:00
Eike Ziller
c06d291b11 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I4264592dbf3a8bf105ad507cb4496777cd0e92b3
2023-05-12 14:42:24 +02:00
Patrik Teivonen
8cd00ad279 Coin: Switch to the new packaging tools scripts location
Script location is changed from qtsdk.git to tqtc-qtsdk.git.
Adjust the coin instructions to use the new location.
This change should be picked to all the branches in use.

Task-number: QTQAINFRA-5506
Change-Id: I78abb36781cfaaff72870c297ba152066ac5f385
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 12:41:49 +00:00
Eike Ziller
7724f8653f Merge remote-tracking branch 'origin/10.0'
Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253
2023-05-05 10:39:47 +02:00
Eike Ziller
73d8b20d52 Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: Ic82c30a479a7ce7eab31b3c18abb3c46a71711cd
2023-04-28 11:03:36 +02:00
Patrik Teivonen
9e54d37ef6 Coin: Add instructions to install pyenv for qtsdk.git
Make sure that the required Python version for qtsdk can be
installed in the future.

Change-Id: Ie69cf79a33e4e4529dd34de7729d3014f8631fe2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-28 08:48:05 +00:00
Eike Ziller
44aaad4c2f COIN/GitHub: Bump to Qt 6.5.0
Change-Id: I8c2122b7f35d049f0249631fc6e045b79dff9fbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-21 06:37:23 +00:00
Eike Ziller
c842b96f77 COIN/GitHub: Use Qt 6.4.3 and LLVM 16.0.0
Change-Id: I95ddc7a95b5761d29b111f3eff3fdfc014efaa51
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-04-13 09:37:49 +00:00
Cristian Adam
53397306b9 LLVM/Clang: Update to version 16.0.0-rc2
This was the newest release tag last week.

Change-Id: Idd272db9dc7ff797023fac72ea8a252729d979b3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-22 11:40:31 +00:00
Patrik Teivonen
1b6d434c9c Coin: Update instruction yamls to run qtsdk scripts in Pipenv
Install the Python module dependencies for qtsdk from Pipfile and run
the install_qt.py and bld_sdktool.py script inside the Pipenv virtual
environment.

Change-Id: Id84733b822964ed2099883de3708f9da2e2d1818
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-12 15:22:50 +00:00
Eike Ziller
adc874f690 COIN/GitHub: Use Qt 6.4.2
Change-Id: Ia66ce7e0a8ebf988c1af9888ddb7e9461f0cac05
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-06 08:28:17 +00:00
Cristian Adam
d852ec53a1 GitHub Actions / COIN: Update Qt to 6.4.0
Amends 169f2c4af6 due to the task
number QTBUG-108593.

Change-Id: Id3ab685632e32fad953d837d2f7ab357b034d739
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-28 13:53:25 +00:00
Cristian Adam
169f2c4af6 GitHub Actions / COIN: Update Qt to 6.4.1
Change-Id: Icf1600c761989914e5de5ed024d7f4c4f2f01e18
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-15 17:27:06 +00:00
Eike Ziller
35a37c3450 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: I6a5cd79d60195579538ed8684010d295b4eea047
2022-11-15 09:50:05 +01:00
Eike Ziller
facb2bdb4d COIN: Adapt to changes in install_qt.py
Change-Id: Ie6acef0baafc5950fd025cc0fe9c3da9bb82a8d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-11-15 08:42:52 +00:00
Eike Ziller
5e99a16e46 COIN: Build sdktool
Adds a step to build sdktool against Qt 5.15.2, which we require to succeed
for packages.

Change-Id: I251ea928372e5c607e24c7b2b7d1e3dd23f2d26d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 06:59:24 +00:00
Eike Ziller
5ae23f8c66 Merge remote-tracking branch 'origin/8.0'
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
2022-09-13 11:15:16 +02:00
Eike Ziller
c9e0d08571 COIN/GitHub: Use Qt 6.3.2
Change-Id: If49d111eec5cd4b4a229c3f21ff282733dd3fbb2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-12 11:59:17 +00:00
Cristian Adam
91c88c7390 Clang: Update to LLVM/Clang 15.0.0
Change-Id: I31599c3f7e869be7553c21d889df8fa870b1b93f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-08 08:31:24 +00:00
Eike Ziller
3ec87e37ee Merge remote-tracking branch 'origin/8.0'
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
2022-07-20 12:03:40 +02:00
Eike Ziller
4c2306798d COIN: Include QtWebEngine in PRECHECK
Though we don't want to ship packages with it, it should still check
compilation.

Change-Id: I2ca018a564cf8164deb6d8ebc3e428c6969991cf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-07-15 11:06:50 +00:00
Eike Ziller
def3cb70ab COIN: Do not sign on Windows
We don't use this anywhere except when running tests in COIN,
so this is wasted time & resources.

Change-Id: Ied053e0ffcdf41b460cda6f093b7c85143e53d6f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-12 12:33:02 +00:00
Eike Ziller
90a03391d7 Merge remote-tracking branch 'origin/8.0'
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
2022-07-12 13:56:23 +02:00
Eike Ziller
aed367ceb6 COIN: Archive less data, instead provision before testing too
Larger archives seem to result in upload issues.

Change-Id: Id73bf203c609f07ad1174839e3ada0049416a66d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-07-12 11:08:45 +00:00
Eike Ziller
b338405477 Require Qt 6.2 for building Qt Creator
Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2022-07-11 13:36:18 +00:00
Eike Ziller
d059a610b1 COIN: Arm auto tests
Some of our auto tests fail, so add an EXCLUDE_FROM_PRECHECK option for
add_qtc_test, which sets a corresponding label on the ctest, and exclude
these when running ctest on COIN.

Disable the Googletest based unittests for now, they are inconsistently
failing on CI, e.g. sometimes timing out after 60 seconds for tests that
usually take only a fraction of a second.

tst_perfdata from the perfparser submodule also fails. Temporarily
disable it explicitly, until the EXCLUDE_FROM_PRECHECK change can be
merged there.

Change-Id: I7e9d7aded75bbe8800f82f7aa125c181271a2a1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-07-05 10:13:18 +00:00
Eike Ziller
70fb66f9ee COIN: Add test instructions
For now just run them without failing the precheck on failing tests.
The test results are only visible in the precheck details
on testresults.qt.io

Remove the fixed timeout of 5 seconds, since this depends on the test
setup where the tests are run, and it is not possible to override a
fixed timeout with the --timeout option of ctest.

Change-Id: Ib5f12092b64d0cf87e1213b031e1990973e18669
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-29 12:05:06 +00:00
Eike Ziller
4c4f787e84 COIN: Fix installing Qt after script updates
'wget' is now imported by one of the python scripts

Change-Id: I8e4fe32f813550586d19ccb76a55ec7ed13441c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-22 09:47:05 +00:00
Eike Ziller
6767b9b737 COIN/GitHub: Use Qt 6.3.1
Change-Id: I2485ef1ec0414d503a907d69fcc277f80d569286
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-17 11:20:41 +00:00
Eike Ziller
64fc40c3a5 COIN: Use Qt 6.3.0
Which we also use for packages

Change-Id: I6c3a413149586e3aac47ab7ba5166fc51b2dadb8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-19 07:51:47 +00:00
Cristian Adam
e608243ee5 GitHub Actions / Coin: Update LLVM/Clang to 14.0.3
To be in sync with the official packaging.

Change-Id: I28712ad1e8234d4911b2afcce949e1e919bf8e92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-18 10:59:27 +00:00
Eike Ziller
debd1b3d4b COIN: Fix precheck after some python3 related changes
Explicitly use Python3 for the scripts

The install_qt script was ported to Python3, and we now need to
explicitly state python3 as the interpreter.

Change-Id: If0d94fde127868ac024834f5f6eccecd1bbc0e6e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2022-04-20 07:21:15 +00:00
Eike Ziller
0c35d79e39 GitHub/COIN: Use LLVM 14.0.0 final
Change-Id: I03c25423a32cfe5084342f6a6293dfd159e93783
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-04-04 11:13:54 +00:00
Eike Ziller
a7fb61ee9d COIN: Add Qt 5 based build
Since we still support Qt 5 based builds, it is good to have it in
the precheck.

Change-Id: Iba58c9ac0c49fa87bf020e7dceef25f87c9aa454
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-04-01 07:33:11 +00:00
Eike Ziller
13a5a1f275 COIN: Rename the instruction files
There is no "qmake" or "make" involved anymore.

Change-Id: I9c587b51818eee0a8dcb13ab5be7623437282885
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-31 06:33:10 +00:00
Eike Ziller
4bdf03328b COIN: Remove version number from Qt install directory
It is not qt5 anymore, and the version number is not needed anyhow

Change-Id: I68d53547ce902225bd0d596457a583c5768a8e94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-31 06:32:40 +00:00
Eike Ziller
a85d9e11fe COIN: Use LLVM 14 and Qt 6.2.4
Change-Id: If1927edbc8ae2a76582bfaea3506b0d1e58a2b2b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-31 06:32:30 +00:00
Eike Ziller
a50561591a Bump Qt version for GitHub and COIN to what we use in official binaries
Disable MinGW build on GitHub because of toolchain incompatibilities.

Change-Id: Ie5f09e3463b05f7cda8694180c9d7e562a7624e7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-11 10:26:00 +00:00
Eike Ziller
b07e29eb79 COIN: Build with Qt 6.2.0 final
Change-Id: I91c7697b1fd7d8fa1a19f24bfc53efa23c415c65
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-04 12:34:27 +00:00
Eike Ziller
24e3cb3ab9 COIN: Use Qt 6.2.0 RC
Change-Id: Ic995d0b139de4c3203c8ad9672c46ac8edd5a4b1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-20 06:14:37 +00:00
Alessandro Portale
9eb7d5246a CMake build: Define common output directory for qt_add_qml_module
In order to enable tools like qmllint and in order to avoid the
following warning, define QT_QML_OUTPUT_DIRECTORY

Warning message:
The Tracing target is a QML module with target path QtCreator/FooBar.
It uses an OUTPUT_DIRECTORY of foobar, which should end in the same
target path, but doesn't. Tooling such as qmllint may not work
correctly.

Since this change is relevant for the build against Qt 6.2-Beta4,
common_environment.yaml gets bumped, accordingly.

Change-Id: Ic6766cf29baddd7c22b68270a0f1702aade7c53f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-10 10:57:44 +00:00
Alessandro Portale
c568ab89c5 Tracing/QmlProfiler/PerfProfiler: Fix qt_add_qml_module call
This change fixes the failing configuration against a recent Qt (post
6.2-Beta2) build:

CMake Error at QTDIR/qtbase/lib/cmake/Qt6Qml/Qt6QmlMacros.cmake:196
(message):
  PLUGIN_TARGET must also be provided when NO_CREATE_PLUGIN_TARGET is
  used.
  If you want to disable creating a plugin altogether, use the NO_PLUGIN
  option instead.

Change-Id: If1dbfb09bda8e8cdd07cc575076dd6ccec1a4d39
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-08-20 07:03:24 +00:00
Eike Ziller
2d8d6e31b6 COIN: Use 6.2 branch for VMs
Change-Id: Id3e06e0cd36e79760e5d7ba5a83de07c26bde836
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-18 07:56:04 +00:00
Eike Ziller
4e3d1f6f0e COIN: Build with Qt 6.2 beta2
It is a stable base to run the precheck on.

Change-Id: Ie5e0699b9067dccba85a3ad4e1b9102799ca5d0f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-12 06:45:03 +00:00
Eike Ziller
905f5d4e1b Merge remote-tracking branch 'origin/4.15'
Conflicts:
	coin/instructions/common_environment.yaml

Change-Id: I2084c24f7e052b9647b30f810207b3c8beecce3c
2021-06-16 11:48:08 +02:00
Eike Ziller
65870f804b COIN: Add deployment target for macOS
Minimum deployment target for Qt 6 is 10.14

Change-Id: If85f34d89a39b92eedc42b0ff9a581264917a589
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-06-15 12:17:40 +00:00
Eike Ziller
58db5d5e71 COIN: Remove unused LLVM environment variable
We are passing it explicitly to the build script and don't use the
provisioned version anyhow.

Change-Id: Id136e06023621389763eeeda021fa64551a148a3
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-06-15 12:17:32 +00:00
Eike Ziller
a3c51cdd4a COIN: Build with LLVM 12
Change-Id: I6f6b3ba4d5c8c6f521792a95cc81886d61664f24
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-27 08:40:21 +00:00
Eike Ziller
627f298ce1 COIN: Increase number of CPUs
There is some fancy logic in COIN that sets different number of
CPUs depending on configuration, which lead to our Linux machines
crawling, while macOS and Windows at least got 4 CPUs.

Fix (and increase) the number of CPUs for all platforms.

Change-Id: I3191f1645420805f5899af8966fd1d377a89bf85
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-25 06:55:24 +00:00
Eike Ziller
5b828f84fb COIN: Turn off python output buffering for all platforms
Was missing for some.

Change-Id: I53aad1dbe352ed62c0c41376771c961aeca960e9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-18 11:15:50 +00:00