From 4ef5338229d6f9ceba1c35a75c27c1669cc5bcdc Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 29 Feb 2024 13:36:22 +0100 Subject: [PATCH] qml2puppet: use branding from qtcreator repository To build a correct puppet with the correct version number do: cmake -DBUILD_DESIGNSTUDIO=ON no branding argument necessary anymore Change-Id: I74b25e3da296fe77d83892d0596f5da3c38ed6cf Reviewed-by: Mahmoud Badri --- src/tools/qml2puppet/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 092c2473615..b2f5edf2c91 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 3.16) +# standalone build if (NOT QT_CREATOR_API_DEFINED) - # standalone build + option(BUILD_DESIGNSTUDIO "Build puppet with Qt Design Studio version in the binary name." OFF) + if (BUILD_DESIGNSTUDIO) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../dist/branding/qtdesignstudio") + endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake") project(qml2puppet)