diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-07-20 11:53:36 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-20 12:03:40 +0200 |
| commit | 3ec87e37ee5fa42ea217e840c6ec9748e8b8b898 (patch) | |
| tree | 3ae63a692792c467244d529ce68671b5daacb263 /coin | |
| parent | 034acdeeb2198b5a0b8748c0e7a78aa356f2754e (diff) | |
| parent | e1b0ba2473abd61263482349cfcc16ebef55af11 (diff) | |
| download | qt-creator-3ec87e37ee5fa42ea217e840c6ec9748e8b8b898.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Conflicts:
src/plugins/todo/optionsdialog.cpp
src/plugins/todo/todoprojectsettingswidget.cpp
Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/build.yaml | 9 | ||||
| -rw-r--r-- | coin/instructions/common_environment.yaml | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index a4bd50a059..43e2e15b39 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -138,15 +138,6 @@ instructions: property: target.arch equals_value: X86 - - type: SignPackage - directory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/install/" - maxTimeInSeconds: 1200 - maxTimeBetweenOutput: 1200 - enable_if: - condition: property - property: host.os - equals_value: Windows - - type: UploadArtifact archiveDirectory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" transferType: UploadModuleBuildArtifact diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 2df7ad16e3..51b8654ade 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -16,7 +16,7 @@ instructions: variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.1-final-released/Qt6.3.1" - type: EnvironmentVariable variableName: QTC_QT_MODULES - variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations" + variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine" - type: EnvironmentVariable variableName: MACOSX_DEPLOYMENT_TARGET variableValue: 10.14 |