File 002-move_binaries-3.6.0.patch of Package qtcreator
diff -uprN qt-creator-opensource-src-3.6.0-orig/qtcreator.pri qt-creator-opensource-src-3.6.0/qtcreator.pri
--- qt-creator-opensource-src-3.6.0-orig/qtcreator.pri 2015-12-11 13:45:01.000000000 +0100
+++ qt-creator-opensource-src-3.6.0/qtcreator.pri 2016-01-31 23:24:19.819539268 +0100
@@ -116,10 +116,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
@@ -146,8 +143,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 += QT_CREATOR QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
diff -uprN qt-creator-opensource-src-3.6.0-orig/src/libs/utils/consoleprocess_unix.cpp qt-creator-opensource-src-3.6.0/src/libs/utils/consoleprocess_unix.cpp
--- qt-creator-opensource-src-3.6.0-orig/src/libs/utils/consoleprocess_unix.cpp 2015-12-11 13:45:01.000000000 +0100
+++ qt-creator-opensource-src-3.6.0/src/libs/utils/consoleprocess_unix.cpp 2016-01-31 23:07:23.376098500 +0100
@@ -151,8 +151,7 @@ bool ConsoleProcess::start(const QString
}
}
- 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 = xtermArgs.toUnixArgs();
allArgs << stubPath
<< modeOption(d->m_mode)
diff -uprN qt-creator-opensource-src-3.6.0-orig/src/libs/utils/consoleprocess_win.cpp qt-creator-opensource-src-3.6.0/src/libs/utils/consoleprocess_win.cpp
--- qt-creator-opensource-src-3.6.0-orig/src/libs/utils/consoleprocess_win.cpp 2015-12-11 13:45:01.000000000 +0100
+++ qt-creator-opensource-src-3.6.0/src/libs/utils/consoleprocess_win.cpp 2016-01-31 22:45:54.523916365 +0100
@@ -138,8 +138,7 @@ bool ConsoleProcess::start(const QString
<< 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,