feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Add version number to puppet path

Browse Source 
Task-number: QDS-7985
Change-Id: I584e2b4a56e441dba207ebffbca8bf0baca7fcb6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2022-10-12 11:02:21 +02:00
parent 3baf305f9b
commit 329fac5510
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
View File

@@ -5,6 +5,7 @@
#include "qmldesignerplugin.h" #include "qmldesignerplugin.h"
#include <app/app_version.h>
#include <edit3d/edit3dviewconfig.h> #include <edit3d/edit3dviewconfig.h>
#include <itemlibraryimport.h> #include <itemlibraryimport.h>
#include <projectexplorer/kit.h> #include <projectexplorer/kit.h>
@@ -179,7 +180,9 @@ Utils::FilePath qmlPuppetWorkingDirectory(ProjectExplorer::Target *target,
QString qmlPuppetExecutablePath(const Utils::FilePath &workingDirectory) QString qmlPuppetExecutablePath(const Utils::FilePath &workingDirectory)
{ {
return workingDirectory.pathAppended("qml2puppet").withExecutableSuffix().toString(); return workingDirectory.pathAppended(QString{"qml2puppet-"} + Core::Constants::IDE_VERSION_LONG)
.withExecutableSuffix()
.toString();
} }
bool isForcingFreeType(ProjectExplorer::Target *target) bool isForcingFreeType(ProjectExplorer::Target *target)

2
src/tools/qml2puppet/CMakeLists.txt
View File

@@ -117,6 +117,8 @@ add_qtc_executable(qml2puppet
DESTINATION ${DESTDIR} DESTINATION ${DESTDIR}
) )
set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
extend_qtc_executable(qml2puppet extend_qtc_executable(qml2puppet
CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0 CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0
SOURCES_PREFIX "${SRCDIR}/" SOURCES_PREFIX "${SRCDIR}/"