File 002-move_binaries-4.15.1.patch of Package qtcreator
diff -uprN qt-creator-opensource-src-4.15.1-orig/qtcreator.pri qt-creator-opensource-src-4.15.1/qtcreator.pri
--- qt-creator-opensource-src-4.15.1-orig/qtcreator.pri 2021-06-08 14:11:06.000000000 +0200
+++ qt-creator-opensource-src-4.15.1/qtcreator.pri 2021-06-12 11:27:34.491360227 +0200
@@ -148,10 +148,7 @@ osx {
INSTALL_LIBRARY_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
INSTALL_PLUGIN_PATH = $$INSTALL_LIBRARY_PATH/plugins
- win32: \
- INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
- else: \
- INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
+ INSTALL_LIBEXEC_PATH = $$INSTALL_LIBRARY_PATH/bin
INSTALL_DATA_PATH = $$QTC_PREFIX/share/qtcreator
INSTALL_DOC_PATH = $$QTC_PREFIX/share/doc/qtcreator
INSTALL_BIN_PATH = $$QTC_PREFIX/bin
@@ -205,8 +202,10 @@ exists($$IDE_LIBRARY_PATH): LIBS *= -L$$
!isEmpty(vcproj) {
DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
+ DEFINES += QTC_PROGS_DIR=\"$$INSTALL_LIBEXEC_PATH\"
} else {
DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+ DEFINES += QTC_PROGS_DIR=\\\"$$INSTALL_LIBEXEC_PATH\\\"
}
DEFINES += \
diff -uprN qt-creator-opensource-src-4.15.1-orig/src/libs/utils/consoleprocess.cpp qt-creator-opensource-src-4.15.1/src/libs/utils/consoleprocess.cpp
--- qt-creator-opensource-src-4.15.1-orig/src/libs/utils/consoleprocess.cpp 2021-06-08 14:11:09.000000000 +0200
+++ qt-creator-opensource-src-4.15.1/src/libs/utils/consoleprocess.cpp 2021-06-12 11:39:38.121461398 +0200
@@ -473,8 +473,7 @@ bool ConsoleProcess::start()
<< createWinCommandline(pcmd, pargs)
<< msgPromptToClose();
- const QString cmdLine = createWinCommandline(
- QCoreApplication::applicationDirPath() + QLatin1String("/qtcreator_process_stub.exe"), stubArgs);
+ const QString cmdLine = createWinCommandline(QLatin1String(QTC_PROGS_DIR "/qtcreator_process_stub.exe"), stubArgs);
bool success = CreateProcessW(0, (WCHAR*)cmdLine.utf16(),
0, 0, FALSE, CREATE_NEW_CONSOLE,
@@ -571,8 +570,7 @@ bool ConsoleProcess::start()
}
}
- const QString stubPath = QCoreApplication::applicationDirPath()
- + QLatin1String("/" QTC_REL_TOOLS_PATH "/qtcreator_process_stub");
+ const QString stubPath = QLatin1String(QTC_PROGS_DIR "/qtcreator_process_stub");
QStringList allArgs = terminalArgs.toUnixArgs();
if (d->m_runAsRoot)