diff --git a/dev-qt/qt_creator/patches/qt_creator-16.0.2.patchset b/dev-qt/qt_creator/patches/qt_creator-17.0.0.patchset similarity index 89% rename from dev-qt/qt_creator/patches/qt_creator-16.0.2.patchset rename to dev-qt/qt_creator/patches/qt_creator-17.0.0.patchset index 32e190fd0..ff508395d 100644 --- a/dev-qt/qt_creator/patches/qt_creator-16.0.2.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-17.0.0.patchset @@ -1,4 +1,4 @@ -From ee9f25819c72d9a1e5f4ed74eab8c7d54e9a285f Mon Sep 17 00:00:00 2001 +From c2efafec18893f918565cc97a00a8187dbc1aa18 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Fri, 29 Sep 2023 16:03:27 +0000 Subject: Port 6.0.3 changes to 11.0.03 @@ -69,10 +69,10 @@ index f0e73be..13d1902 100644 #define HAVE_USLEEP 1 #endif diff --git a/src/libs/3rdparty/sqlite/sqlite3.c b/src/libs/3rdparty/sqlite/sqlite3.c -index 2886d04..6f69493 100644 +index 37b534a..7eaf35d 100644 --- a/src/libs/3rdparty/sqlite/sqlite3.c +++ b/src/libs/3rdparty/sqlite/sqlite3.c -@@ -42126,7 +42126,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ +@@ -42259,7 +42259,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ */ if( rc ) rc = fsync(fd); @@ -95,7 +95,7 @@ index 78baa41..bb91104 100644 int size = backtrace(bt, maxdepth); char **lines = backtrace_symbols(bt, size); diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp -index 49bc4e4..84aa032 100644 +index 9f67fd1..2893364 100644 --- a/src/libs/utils/savefile.cpp +++ b/src/libs/utils/savefile.cpp @@ -113,7 +113,7 @@ bool SaveFile::commit() @@ -108,7 +108,7 @@ index 49bc4e4..84aa032 100644 #else fsync(handle()); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp -index ad971eb..1f6feb2 100644 +index 7dd26a8..3f47a3a 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -227,16 +227,20 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, @@ -132,7 +132,7 @@ index ad971eb..1f6feb2 100644 case PM_ToolBarItemMargin: case PM_ToolBarItemSpacing: if (panelWidget(widget)) -@@ -865,6 +869,7 @@ void ManhattanStyle::drawControl( +@@ -919,6 +923,7 @@ void ManhattanStyle::drawControl( } switch (element) { @@ -140,7 +140,7 @@ index ad971eb..1f6feb2 100644 case CE_MenuItem: painter->save(); if (const auto mbi = qstyleoption_cast(option)) { -@@ -883,6 +888,7 @@ void ManhattanStyle::drawControl( +@@ -937,6 +942,7 @@ void ManhattanStyle::drawControl( } painter->restore(); break; @@ -148,7 +148,7 @@ index ad971eb..1f6feb2 100644 case CE_MenuBarItem: painter->save(); -@@ -1025,6 +1031,7 @@ void ManhattanStyle::drawControl( +@@ -1079,6 +1085,7 @@ void ManhattanStyle::drawControl( } break; @@ -156,7 +156,7 @@ index ad971eb..1f6feb2 100644 case CE_MenuBarEmptyArea: { if (creatorTheme()->flag(Theme::FlatMenuBar)) painter->fillRect(option->rect, StyleHelper::baseColor()); -@@ -1038,6 +1045,7 @@ void ManhattanStyle::drawControl( +@@ -1092,6 +1099,7 @@ void ManhattanStyle::drawControl( painter->restore(); } break; @@ -180,10 +180,10 @@ index ef34150..e054754 100644 os = LinuxOS; subos = GenericFlavor; diff --git a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt -index fbbcd21..1821143 100644 +index 670bcf5..61c1bd4 100644 --- a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt +++ b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt -@@ -73,7 +73,7 @@ extend_qtc_library(QmlDesignerCore +@@ -71,7 +71,7 @@ extend_qtc_library(QmlDesignerCore PUBLIC_DEFINES QDS_BUILD_QMLPARSER ) extend_qtc_library(QmlDesignerCore @@ -206,7 +206,7 @@ index 52963e7..749b312 100644 #else # error Missing implementation of processNameByPid for this platform. diff --git a/src/tools/process_stub/main.cpp b/src/tools/process_stub/main.cpp -index 088e42e..f975fe8 100644 +index af2e73e..bb010cd 100644 --- a/src/tools/process_stub/main.cpp +++ b/src/tools/process_stub/main.cpp @@ -50,7 +50,7 @@ std::optional environmentVariables; @@ -214,11 +214,11 @@ index 088e42e..f975fe8 100644 int inferiorId{0}; -#ifdef Q_OS_DARWIN -+#ifdef Q_OS_DARWIN || defined(Q_OS_HAIKU) ++#if defined(Q_OS_DARWIN) || defined(Q_OS_HAIKU) // A memory mapped helper to retrieve the pid of the inferior process in debugMode static int *shared_child_pid = nullptr; #endif -@@ -250,7 +250,7 @@ void onInferiorStarted() +@@ -255,7 +255,7 @@ void onInferiorStarted() #ifdef Q_OS_WIN sendThreadId(win_process_information->dwThreadId); sendPid(inferiorId); @@ -227,17 +227,17 @@ index 088e42e..f975fe8 100644 // In debug mode we use the poll timer to send the pid. if (!debugMode) sendPid(inferiorId); -@@ -280,7 +280,7 @@ void setupUnixInferior() +@@ -285,7 +285,7 @@ void setupUnixInferior() #ifdef Q_OS_UNIX if (debugMode) { qCInfo(log) << "Debug mode enabled"; -#ifdef Q_OS_DARWIN -+#ifdef Q_OS_DARWIN || defined(Q_OS_HAIKU) ++#if defined(Q_OS_DARWIN) || defined(Q_OS_HAIKU) // We are using raise(SIGSTOP) to stop the child process, macOS does not support ptrace(...) inferiorProcess.setChildProcessModifier([] { // Let the parent know our pid ... diff --git a/src/tools/qmlpuppet/CMakeLists.txt b/src/tools/qmlpuppet/CMakeLists.txt -index 0d3f4bb..08eca93 100644 +index 19bc66e..5683233 100644 --- a/src/tools/qmlpuppet/CMakeLists.txt +++ b/src/tools/qmlpuppet/CMakeLists.txt @@ -64,7 +64,7 @@ extend_qtc_executable(qmlpuppet @@ -253,14 +253,14 @@ index 0d3f4bb..08eca93 100644 2.48.1 -From fb84058d43745763f870c6d78b829e3bec749079 Mon Sep 17 00:00:00 2001 +From c026bc03c2068079ba9f8b44851249d6f1fc59e9 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 15 Apr 2024 21:42:18 +1000 Subject: nanotrace: haiku support diff --git a/src/libs/nanotrace/nanotracehr.cpp b/src/libs/nanotrace/nanotracehr.cpp -index 0006227..75436ad 100644 +index b99907c..735b196 100644 --- a/src/libs/nanotrace/nanotracehr.cpp +++ b/src/libs/nanotrace/nanotracehr.cpp @@ -18,6 +18,10 @@ @@ -291,19 +291,19 @@ index 0006227..75436ad 100644 2.48.1 -From 7cd4aae5e9c94dc2bf40c82c4fd40e6611e920b5 Mon Sep 17 00:00:00 2001 +From 1889c71084f3f5b8ee99611aa5c7467a7b04b476 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 20 Aug 2024 22:53:45 +1000 Subject: Implement ProcessInfo for Haiku diff --git a/src/libs/utils/processinfo.cpp b/src/libs/utils/processinfo.cpp -index 8139eba..565f58c 100644 +index 8f0eceb..5a2b645 100644 --- a/src/libs/utils/processinfo.cpp +++ b/src/libs/utils/processinfo.cpp -@@ -19,6 +19,10 @@ - #include +@@ -22,6 +22,10 @@ #include + #include #endif +#if defined(Q_OS_HAIKU) +#include @@ -312,14 +312,11 @@ index 8139eba..565f58c 100644 namespace Utils { -@@ -190,7 +194,38 @@ static QList processInfoListUnix(const FilePath &deviceRoot) - return getLocalProcessesUsingPs(deviceRoot); +@@ -238,6 +242,35 @@ static Result> processInfoListUnix(const FilePath &deviceRoot } --#if defined(Q_OS_UNIX) + Result> ProcessInfo::processInfoList(const FilePath &deviceRoot) +#if defined(Q_OS_HAIKU) -+ -+QList ProcessInfo::processInfoList(const FilePath &deviceRoot) +{ + if (deviceRoot.needsDevice()) + return processInfoListUnix(deviceRoot); @@ -347,23 +344,29 @@ index 8139eba..565f58c 100644 + + return processes; +} -+ -+#elif defined(Q_OS_UNIX) - - QList ProcessInfo::processInfoList(const FilePath &deviceRoot) ++#else { + if (deviceRoot.osType() != OsType::OsTypeWindows) + return processInfoListUnix(deviceRoot); +@@ -271,5 +304,6 @@ Result> ProcessInfo::processInfoList(const FilePath &deviceRo + + return {}; + } ++#endif + + } // namespace Utils -- 2.48.1 -From d4772dd26bb7dc73fdd84a03a2f61f17a7b8d478 Mon Sep 17 00:00:00 2001 +From fcf7b34c45c08a3be3bfbeae48035787651c2216 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 5 Sep 2024 17:25:10 +1000 Subject: Add Haiku provider for AppStatisticsMonitor plugin diff --git a/src/plugins/appstatisticsmonitor/idataprovider.cpp b/src/plugins/appstatisticsmonitor/idataprovider.cpp -index 0d5d8a2..a4f7f32 100644 +index 1f6d985..1e0c573 100644 --- a/src/plugins/appstatisticsmonitor/idataprovider.cpp +++ b/src/plugins/appstatisticsmonitor/idataprovider.cpp @@ -31,6 +31,11 @@ diff --git a/dev-qt/qt_creator/qt_creator-16.0.2.recipe b/dev-qt/qt_creator/qt_creator-17.0.0.recipe similarity index 93% rename from dev-qt/qt_creator/qt_creator-16.0.2.recipe rename to dev-qt/qt_creator/qt_creator-17.0.0.recipe index 74ad4d183..9a51677fd 100644 --- a/dev-qt/qt_creator/qt_creator-16.0.2.recipe +++ b/dev-qt/qt_creator/qt_creator-17.0.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2025 The Qt Company Ltd" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="516cb164ae17ccbf12a9491fa8d53e71bdb63fd8c4c639fa4642d5d44b37d982" +CHECKSUM_SHA256="616dfea43a6162bc1a8ccf440e1df6a74b977fcb028d76b7c779a1fb8de39e8c" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in" @@ -20,7 +20,7 @@ clangVer="20" PROVIDES=" qt_creator$secondaryArchSuffix = $portVersion - app:QtCreator$secondaryArchSuffix = $portVersion + app:QtCreator = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -29,6 +29,8 @@ REQUIRES=" lib:libexecinfo$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libLLVM$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + # Qt6 lib:libQt6Charts$secondaryArchSuffix lib:libQt6Concurrent$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix @@ -50,17 +52,22 @@ REQUIRES=" lib:libQt6Svg$secondaryArchSuffix lib:libQt6Widgets$secondaryArchSuffix lib:libQt6Xml$secondaryArchSuffix - lib:libsqlite3$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - qt6_tools${secondaryArchSuffix}_devel + devel:libarchive$secondaryArchSuffix devel:libclang$secondaryArchSuffix >= $clangVer devel:libclang_cpp$secondaryArchSuffix >= $clangVer devel:libexecinfo$secondaryArchSuffix devel:libGL$secondaryArchSuffix devel:libLLVM_$clangVer$secondaryArchSuffix + devel:libomp$secondaryArchSuffix + devel:libsecret_1$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libyaml_cpp$secondaryArchSuffix >= 0.8 + # Qt6 + qt6_tools${secondaryArchSuffix}_devel devel:libQt6Charts$secondaryArchSuffix devel:libQt6Concurrent$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix @@ -70,7 +77,6 @@ BUILD_REQUIRES=" devel:libQt6Gui$secondaryArchSuffix devel:libQt6Help$secondaryArchSuffix devel:libQt6Network$secondaryArchSuffix - devel:libomp$secondaryArchSuffix devel:libQt6OpenGL$secondaryArchSuffix devel:libQt6PrintSupport$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix @@ -83,8 +89,6 @@ BUILD_REQUIRES=" devel:libQt6Svg$secondaryArchSuffix devel:libQt6Widgets$secondaryArchSuffix devel:libQt6Xml$secondaryArchSuffix - devel:libsqlite3$secondaryArchSuffix - " BUILD_PREREQUIRES=" cmd:cmake @@ -92,7 +96,7 @@ BUILD_PREREQUIRES=" cmd:ninja cmd:perl cmd:pkg_config$secondaryArchSuffix - cmd:python3 + cmd:python3.10 cmd:qdoc6$secondaryArchSuffix cmd:which " @@ -101,7 +105,9 @@ BUILD() { cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_AUTOGEN_PARALLEL=1 \ + -DQTC_USE_SYSTEM_LIBARCHIVE=ON \ -Wno-dev + cmake --build build $jobArgs }