File 002-move_binaries-3.4.2.patch of Package qtcreator
diff -uprN qt-creator-opensource-src-3.4.2-orig/qtcreator.pri qt-creator-opensource-src-3.4.2/qtcreator.pri
--- qt-creator-opensource-src-3.4.2-orig/qtcreator.pri 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/qtcreator.pri 2015-08-01 21:02:54.424644009 +0200
@@ -115,8 +115,10 @@ LIBS += -L$$IDE_LIBRARY_PATH
!isEmpty(vcproj) {
DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\"
+ DEFINES += QTC_PROGS_DIR=\"$$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/bin\"
} else {
DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\"
+ DEFINES += QTC_PROGS_DIR=\\\"$$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/bin\\\"
}
DEFINES += QT_CREATOR QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
diff -uprN qt-creator-opensource-src-3.4.2-orig/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri qt-creator-opensource-src-3.4.2/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
--- qt-creator-opensource-src-3.4.2-orig/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri 2015-08-01 21:04:08.486091909 +0200
@@ -42,6 +42,6 @@ osx {
CONFIG -= app_bundle
QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,$$system_quote($$PWD/Info.plist)
} else {
- target.path = $$QTC_PREFIX/bin
+ target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/bin
INSTALLS += target
}
diff -uprN qt-creator-opensource-src-3.4.2-orig/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri qt-creator-opensource-src-3.4.2/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
--- qt-creator-opensource-src-3.4.2-orig/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri 2015-08-01 21:03:44.204272922 +0200
@@ -31,6 +31,6 @@ macx {
CONFIG -= app_bundle
QMAKE_LFLAGS += -Wl,-sectcreate,__TEXT,__info_plist,\"$$PWD/Info.plist\"
} else {
- target.path = $$QTC_PREFIX/bin
+ target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/bin
INSTALLS += target
}
diff -uprN qt-creator-opensource-src-3.4.2-orig/src/libs/utils/consoleprocess_unix.cpp qt-creator-opensource-src-3.4.2/src/libs/utils/consoleprocess_unix.cpp
--- qt-creator-opensource-src-3.4.2-orig/src/libs/utils/consoleprocess_unix.cpp 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/src/libs/utils/consoleprocess_unix.cpp 2015-08-01 17:13:30.738228258 +0200
@@ -151,7 +151,7 @@ bool ConsoleProcess::start(const QString
}
}
- QString stubPath = QCoreApplication::applicationDirPath();
+ QString stubPath = QLatin1String(QTC_PROGS_DIR);
if (HostOsInfo::isMacHost())
stubPath.append(QLatin1String("/../Resources/qtcreator_process_stub"));
else
diff -uprN qt-creator-opensource-src-3.4.2-orig/src/libs/utils/consoleprocess_win.cpp qt-creator-opensource-src-3.4.2/src/libs/utils/consoleprocess_win.cpp
--- qt-creator-opensource-src-3.4.2-orig/src/libs/utils/consoleprocess_win.cpp 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/src/libs/utils/consoleprocess_win.cpp 2015-08-01 15:18:20.865878998 +0200
@@ -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,
diff -uprN qt-creator-opensource-src-3.4.2-orig/src/libs/utils/process_stub.pro qt-creator-opensource-src-3.4.2/src/libs/utils/process_stub.pro
--- qt-creator-opensource-src-3.4.2-orig/src/libs/utils/process_stub.pro 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/src/libs/utils/process_stub.pro 2015-08-02 09:10:06.728718881 +0200
@@ -20,5 +20,5 @@ unix {
LIBS += -lshell32
}
-target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
+target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/bin
INSTALLS += target
diff -uprN qt-creator-opensource-src-3.4.2-orig/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp qt-creator-opensource-src-3.4.2/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp
--- qt-creator-opensource-src-3.4.2-orig/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp 2015-08-01 17:16:45.898769980 +0200
@@ -320,7 +320,7 @@ QString PuppetCreator::qmlPuppetDirector
QString PuppetCreator::qmlPuppetFallbackDirectory() const
{
- return QCoreApplication::applicationDirPath();
+ return QStringLiteral(QTC_PROGS_DIR);
}
QString PuppetCreator::qml2PuppetPath(PuppetType puppetType) const
diff -uprN qt-creator-opensource-src-3.4.2-orig/src/tools/qml2puppet/qml2puppet/qml2puppet.pro qt-creator-opensource-src-3.4.2/src/tools/qml2puppet/qml2puppet/qml2puppet.pro
--- qt-creator-opensource-src-3.4.2-orig/src/tools/qml2puppet/qml2puppet/qml2puppet.pro 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/src/tools/qml2puppet/qml2puppet/qml2puppet.pro 2015-08-02 09:11:12.123228970 +0200
@@ -4,7 +4,7 @@ TEMPLATE = app
include(../../../../qtcreator.pri)
-DESTDIR = $$IDE_BIN_PATH
+DESTDIR = $$IDE_LIBEXEC_PATH
include(../../../rpath.pri)
diff -uprN qt-creator-opensource-src-3.4.2-orig/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro qt-creator-opensource-src-3.4.2/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro
--- qt-creator-opensource-src-3.4.2-orig/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro 2015-06-22 17:07:17.000000000 +0200
+++ qt-creator-opensource-src-3.4.2/src/tools/qmlpuppet/qmlpuppet/qmlpuppet.pro 2015-08-02 09:10:51.072386675 +0200
@@ -3,7 +3,7 @@ TARGET = qmlpuppet
TEMPLATE = app
include(../../../../qtcreator.pri)
-DESTDIR = $$IDE_BIN_PATH
+DESTDIR = $$IDE_LIBEXEC_PATH
include(../../../rpath.pri)
include(../../../../share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri)
