From 6d18df620796428f59acb6176894ce58176170e8 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 16 Aug 2021 12:16:49 +0200
Subject: [PATCH] Remove QTC_REL_TOOLS_PATH and use RELATIVE_LIBEXEC_PATH
 instead

Change-Id: If737d7050985f2ae03d543c63347ea465a65c648
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/CMakeLists.txt              | 2 --
 src/libs/utils/consoleprocess.cpp          | 2 +-
 src/libs/utils/utils-lib.pri               | 9 ---------
 src/libs/utils/utils.qbs                   | 4 +---
 tests/unit/echoserver/echoserver.pro       | 4 ----
 tests/unit/unittest/creator_dependency.pri | 4 ----
 6 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index f72fbfad708..e5292624a07 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -3,8 +3,6 @@ add_qtc_library(Utils
   PUBLIC_DEPENDS
     Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Gui Qt5::Widgets
     Qt6Core5Compat
-  DEFINES
-    "QTC_REL_TOOLS_PATH=\"${RELATIVE_LIBEXEC_PATH}\""
   SOURCES
     ../3rdparty/optional/optional.hpp
     ../3rdparty/variant/variant.hpp
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp
index 04240e0ec8a..d0979accde3 100644
--- a/src/libs/utils/consoleprocess.cpp
+++ b/src/libs/utils/consoleprocess.cpp
@@ -571,7 +571,7 @@ bool ConsoleProcess::start()
     }
 
     const QString stubPath = QCoreApplication::applicationDirPath()
-            + QLatin1String("/" QTC_REL_TOOLS_PATH "/qtcreator_process_stub");
+            + QLatin1String("/" RELATIVE_LIBEXEC_PATH "/qtcreator_process_stub");
 
     QStringList allArgs = terminalArgs.toUnixArgs();
     if (d->m_runAsRoot)
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index bcd11072a8b..176fda8f03b 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -4,15 +4,6 @@ shared {
     DEFINES += QTCREATOR_UTILS_STATIC_LIB
 }
 
-!win32:{
-    isEmpty(IDE_LIBEXEC_PATH) | isEmpty(IDE_BIN_PATH): {
-        warning("using utils-lib.pri without IDE_LIBEXEC_PATH or IDE_BIN_PATH results in empty QTC_REL_TOOLS_PATH")
-        DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"\")
-    } else {
-        DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")
-    }
-}
-
 QT += widgets gui network qml xml
 greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
 
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index f33ed5a63af..a11d2d75ab9 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -7,9 +7,7 @@ Project {
     QtcLibrary {
 
         cpp.defines: base.concat([
-            "UTILS_LIBRARY",
-            "QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath('/' + qtc.ide_bin_path,
-                                                            '/' + qtc.ide_libexec_path) + "\""
+            "UTILS_LIBRARY"
         ])
         cpp.dynamicLibraries: {
             var libs = [];
diff --git a/tests/unit/echoserver/echoserver.pro b/tests/unit/echoserver/echoserver.pro
index 38d0ff20780..55bcb7222e2 100644
--- a/tests/unit/echoserver/echoserver.pro
+++ b/tests/unit/echoserver/echoserver.pro
@@ -8,10 +8,6 @@ TEMPLATE = app
 
 unix:LIBS += -ldl
 
-# Set IDE_LIBEXEC_PATH and IDE_BIN_PATH to silence a warning about empty
-# QTC_REL_TOOLS_PATH, which is not used by the tests.
-IDE_LIBEXEC_PATH=$$PWD
-IDE_BIN_PATH=$$PWD
 include($$PWD/../../../src/libs/utils/utils-lib.pri)
 
 include(../../../qtcreator.pri)
diff --git a/tests/unit/unittest/creator_dependency.pri b/tests/unit/unittest/creator_dependency.pri
index 9c28b4c3900..848e927d4d1 100644
--- a/tests/unit/unittest/creator_dependency.pri
+++ b/tests/unit/unittest/creator_dependency.pri
@@ -1,7 +1,3 @@
-# Set IDE_LIBEXEC_PATH and IDE_BIN_PATH to silence a warning about empty
-# QTC_REL_TOOLS_PATH, which is not used by the tests.
-IDE_LIBEXEC_PATH=$$PWD
-IDE_BIN_PATH=$$PWD
 include($$PWD/../../../src/libs/utils/utils-lib.pri)
 
 include($$PWD/../../../src/libs/3rdparty/yaml-cpp/yaml-cpp.pri)