File 002-move_binaries-4.14.2.patch of Package qtcreator

Overview Repositories Revisions Requests Users Attributes Meta

File 002-move_binaries-4.14.2.patch of Package qtcreator

diff -uprN qt-creator-opensource-src-4.14.2-orig/qtcreator.pri qt-creator-opensource-src-4.14.2/qtcreator.pri
--- qt-creator-opensource-src-4.14.2-orig/qtcreator.pri	2021-03-19 10:58:48.000000000 +0100
+++ qt-creator-opensource-src-4.14.2/qtcreator.pri	2021-04-04 08:27:26.751996313 +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.14.2-orig/src/libs/utils/consoleprocess.cpp qt-creator-opensource-src-4.14.2/src/libs/utils/consoleprocess.cpp
--- qt-creator-opensource-src-4.14.2-orig/src/libs/utils/consoleprocess.cpp	2021-03-19 10:58:51.000000000 +0100
+++ qt-creator-opensource-src-4.14.2/src/libs/utils/consoleprocess.cpp	2021-04-04 08:27:26.751996313 +0200
@@ -472,8 +472,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,
@@ -569,8 +568,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()
                           << stubPath
                           << modeOption(d->m_mode)

Places

File 002-move_binaries-4.14.2.patch of Package qtcreator

Places