diff --git a/dev-qt/qt_creator/patches/qt_creator-4.6.0.patchset b/dev-qt/qt_creator/patches/qt_creator-4.6.2.patchset similarity index 74% rename from dev-qt/qt_creator/patches/qt_creator-4.6.0.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.6.2.patchset index 530a4f076..6e24723ac 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.6.0.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.6.2.patchset @@ -1,4 +1,4 @@ -From b4dae48a119f62493fc1bf1186539a7f4ac3fdd7 Mon Sep 17 00:00:00 2001 +From 1272e7247817315ab22bea85d4bac628f0b0d41a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 15:42:32 +0200 Subject: apply patch from 4.1.0. @@ -18,10 +18,10 @@ index 449e4ff..5ddf877 100644 #elif defined(Q_OS_WIN) SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -index 5a10394..2848740 100644 +index 3959938..198a607 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -@@ -23,7 +23,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc +@@ -18,7 +18,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc DISTFILES += Info.plist @@ -31,7 +31,7 @@ index 5a10394..2848740 100644 osx { CONFIG -= app_bundle diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri -index 9160fba..3d84ea5 100644 +index 66905e6..510462d 100644 --- a/src/libs/sqlite/sqlite-lib.pri +++ b/src/libs/sqlite/sqlite-lib.pri @@ -6,7 +6,7 @@ shared { @@ -97,20 +97,20 @@ index 58a082f..808a15e 100644 # error Missing implementation of processNameByPid for this platform. #endif -- -2.12.2 +2.16.4 -From 1afc974f9f983c6937da1eb7b25308652292e8f3 Mon Sep 17 00:00:00 2001 +From 16905d1053943afd63d88b3c855b0f7b48397486 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 18:20:31 +0200 Subject: Fix rpath handling. diff --git a/qtcreator.pro b/qtcreator.pro -index e25e8cc..8a535c3 100644 +index f52b6c2..753e2db 100644 --- a/qtcreator.pro +++ b/qtcreator.pro -@@ -50,7 +50,7 @@ exists(src/shared/qbs/qbs.pro) { +@@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) { QBS_APPS_RPATH_DIR = @loader_path/../Frameworks } else { QBS_PLUGINS_BUILD_DIR = $$IDE_PLUGIN_PATH @@ -148,10 +148,10 @@ index 0d8911a..03c86f4 100644 + QMAKE_RPATHDIR += $ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator +} diff --git a/src/shared/qbs/src/app/app.pri b/src/shared/qbs/src/app/app.pri -index 5904c9d..c10148f 100644 +index 49bbd90..48730b8 100644 --- a/src/shared/qbs/src/app/app.pri +++ b/src/shared/qbs/src/app/app.pri -@@ -6,6 +6,7 @@ TEMPLATE = app +@@ -7,6 +7,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START else:DESTDIR = ../../../bin !isEmpty(QBS_APPS_RPATH_DIR) { @@ -160,5 +160,57 @@ index 5904c9d..c10148f 100644 macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR} } -- -2.12.2 +2.16.4 + + +From 8dea17be7402f638ba1e7c7d40dd0f9cc342e091 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Mon, 25 Jun 2018 16:18:26 +0300 +Subject: Enable Terminal on Haiku + + +diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp +index 223f8eb..2a48ebd 100644 +--- a/src/libs/utils/consoleprocess_unix.cpp ++++ b/src/libs/utils/consoleprocess_unix.cpp +@@ -345,6 +345,9 @@ struct Terminal { + + static const Terminal knownTerminals[] = + { ++#ifdef Q_OS_HAIKU ++ {"Terminal", ""}, ++#endif + {"x-terminal-emulator", "-e"}, + {"xterm", "-e"}, + {"aterm", "-e"}, +@@ -374,7 +377,11 @@ QString ConsoleProcess::defaultTerminalEmulator() + return result; + } + } ++#ifdef Q_OS_HAIKU ++ return QLatin1String("/system/apps/Terminal"); ++#else + return QLatin1String("xterm -e"); ++#endif + } + + QStringList ConsoleProcess::availableTerminalEmulators() +diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp +index 7db05c2..0814fed 100644 +--- a/src/libs/utils/unixutils.cpp ++++ b/src/libs/utils/unixutils.cpp +@@ -34,7 +34,11 @@ using namespace Utils; + + QString UnixUtils::defaultFileBrowser() + { ++#ifdef Q_OS_HAIKU ++ return QLatin1String("open %d"); ++#else + return QLatin1String("xdg-open %d"); ++#endif + } + + QString UnixUtils::fileBrowser(const QSettings *settings) +-- +2.16.4 diff --git a/dev-qt/qt_creator/qt_creator-4.6.0.recipe b/dev-qt/qt_creator/qt_creator-4.6.2.recipe similarity index 97% rename from dev-qt/qt_creator/qt_creator-4.6.0.recipe rename to dev-qt/qt_creator/qt_creator-4.6.2.recipe index 216b7d580..f6b0f6bd2 100644 --- a/dev-qt/qt_creator/qt_creator-4.6.0.recipe +++ b/dev-qt/qt_creator/qt_creator-4.6.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2018 The Qt Company Ltd" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.6/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="36e6a9146fbd07f045ea19301176c66f8234afd42bae0a7a17c91e1832fc4882" +CHECKSUM_SHA256="bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in"