From 13a5a1f275facc19d2d433c1174b3779abdb2adc Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 30 Mar 2022 10:23:04 +0200 Subject: [PATCH] COIN: Rename the instruction files There is no "qmake" or "make" involved anymore. Change-Id: I9c587b51818eee0a8dcb13ab5be7623437282885 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: David Schulz --- coin/instructions/{make_instructions.yaml => build.yaml} | 0 coin/instructions/{qmake_module_build.yaml => provision.yaml} | 2 -- coin/module_config.yaml | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) rename coin/instructions/{make_instructions.yaml => build.yaml} (100%) rename coin/instructions/{qmake_module_build.yaml => provision.yaml} (98%) diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/build.yaml similarity index 100% rename from coin/instructions/make_instructions.yaml rename to coin/instructions/build.yaml diff --git a/coin/instructions/qmake_module_build.yaml b/coin/instructions/provision.yaml similarity index 98% rename from coin/instructions/qmake_module_build.yaml rename to coin/instructions/provision.yaml index 1cfd04643c8..86c7ca32f63 100644 --- a/coin/instructions/qmake_module_build.yaml +++ b/coin/instructions/provision.yaml @@ -76,5 +76,3 @@ instructions: property: target.arch equals_value: X86_64 - - !include "{{qt-creator/qt-creator}}/make_instructions.yaml" - diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 05175f38cd1..163721ea254 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -60,7 +60,8 @@ common_environment: &common_environment make_instructions: &make_instructions type: Group instructions: - - !include "{{qt-creator/qt-creator}}/qmake_module_build.yaml" + - !include "{{qt-creator/qt-creator}}/provision.yaml" + - !include "{{qt-creator/qt-creator}}/build.yaml" instructions: