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

@@ -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

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)

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
 

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 = [];

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)

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)