1 --- qt-creator-opensource-src-3.6.0/qtcreator.pri.libexec 2016-02-14 13:10:37.151868039 +0100
2 +++ qt-creator-opensource-src-3.6.0/qtcreator.pri 2016-02-14 13:12:02.182955481 +0100
3 @@ -108,7 +108,7 @@ osx {
5 IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
7 - IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/libexec/qtcreator
8 + IDE_LIBEXEC_PATH = $$IDE_LIBRARY_PATH
9 !isEqual(IDE_SOURCE_TREE, $$IDE_OUTPUT_PATH):copydata = 1
11 LINK_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
12 @@ -119,7 +119,7 @@ osx {
14 INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/bin
16 - INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/libexec/qtcreator
17 + INSTALL_LIBEXEC_PATH = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
18 INSTALL_DATA_PATH = $$QTC_PREFIX/share/qtcreator
19 INSTALL_DOC_PATH = $$QTC_PREFIX/share/doc/qtcreator
20 INSTALL_BIN_PATH = $$QTC_PREFIX/bin
21 --- qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/icore.cpp.orig 2016-03-08 12:30:19.000000000 +0100
22 +++ qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/icore.cpp 2016-09-27 22:33:01.376312984 +0200
25 QString ICore::libexecPath()
28 - switch (Utils::HostOsInfo::hostOs()) {
29 - case Utils::OsTypeWindows:
30 - path = QCoreApplication::applicationDirPath();
32 - case Utils::OsTypeMac:
33 - path = QCoreApplication::applicationDirPath() + QLatin1String("/../Resources");
35 - case Utils::OsTypeLinux:
36 - case Utils::OsTypeOtherUnix:
37 - case Utils::OsTypeOther:
38 - path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator");
41 - return QDir::cleanPath(path);
42 + return QDir::cleanPath(QLatin1String("/usr/" IDE_LIBRARY_BASENAME "/qtcreator"));
45 static QString compilerString()