qt_creator, bump to 18.0.0 (#13165)

This commit is contained in:
Schrijvers Luc
2025-10-31 07:45:50 +01:00
committed by GitHub
parent c9b66b63f8
commit c1acab9650
2 changed files with 24 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
From 652ec6725b165ca86b830d0d01870e04785fa9cd Mon Sep 17 00:00:00 2001
From 07bb9672e938837fc3c192e4aa9e104504f5e4b8 Mon Sep 17 00:00:00 2001
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
Date: Fri, 29 Sep 2023 16:03:27 +0000
Subject: Port 6.0.3 changes to 11.0.03
@@ -82,7 +82,7 @@ index 37b534a..7eaf35d 100644
** so currently we default to the macro that redefines fdatasync to fsync
*/
diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp
index 78baa41..bb91104 100644
index c139eb3..37b810e 100644
--- a/src/libs/utils/qtcassert.cpp
+++ b/src/libs/utils/qtcassert.cpp
@@ -29,7 +29,7 @@ void dumpBacktrace(int maxdepth)
@@ -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 9f67fd1..2893364 100644
index d1b4347..c336ee4 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 9f67fd1..2893364 100644
#else
fsync(handle());
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 7dd26a8..3f47a3a 100644
index afe7553..335bbef 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 7dd26a8..3f47a3a 100644
case PM_ToolBarItemMargin:
case PM_ToolBarItemSpacing:
if (panelWidget(widget))
@@ -919,6 +923,7 @@ void ManhattanStyle::drawControl(
@@ -923,6 +927,7 @@ void ManhattanStyle::drawControl(
}
switch (element) {
@@ -140,7 +140,7 @@ index 7dd26a8..3f47a3a 100644
case CE_MenuItem:
painter->save();
if (const auto mbi = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
@@ -937,6 +942,7 @@ void ManhattanStyle::drawControl(
@@ -941,6 +946,7 @@ void ManhattanStyle::drawControl(
}
painter->restore();
break;
@@ -148,7 +148,7 @@ index 7dd26a8..3f47a3a 100644
case CE_MenuBarItem:
painter->save();
@@ -1079,6 +1085,7 @@ void ManhattanStyle::drawControl(
@@ -1083,6 +1089,7 @@ void ManhattanStyle::drawControl(
}
break;
@@ -156,7 +156,7 @@ index 7dd26a8..3f47a3a 100644
case CE_MenuBarEmptyArea: {
if (creatorTheme()->flag(Theme::FlatMenuBar))
painter->fillRect(option->rect, StyleHelper::baseColor());
@@ -1092,6 +1099,7 @@ void ManhattanStyle::drawControl(
@@ -1096,6 +1103,7 @@ void ManhattanStyle::drawControl(
painter->restore();
}
break;
@@ -165,10 +165,10 @@ index 7dd26a8..3f47a3a 100644
case CE_ToolBar:
{
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index ef34150..e054754 100644
index d351129..611be40 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -1157,6 +1157,10 @@ Abi Abi::hostAbi()
@@ -1167,6 +1167,10 @@ Abi Abi::hostAbi()
subos = WindowsMSysFlavor;
#endif
format = PEFormat;
@@ -180,7 +180,7 @@ 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 670bcf5..61c1bd4 100644
index 95ed14f..1826875 100644
--- a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
+++ b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
@@ -71,7 +71,7 @@ extend_qtc_library(QmlDesignerCore
@@ -237,10 +237,10 @@ index af2e73e..bb010cd 100644
inferiorProcess.setChildProcessModifier([] {
// Let the parent know our pid ...
diff --git a/src/tools/qmlpuppet/CMakeLists.txt b/src/tools/qmlpuppet/CMakeLists.txt
index 19bc66e..5683233 100644
index b4900cd..7a747e3 100644
--- a/src/tools/qmlpuppet/CMakeLists.txt
+++ b/src/tools/qmlpuppet/CMakeLists.txt
@@ -64,7 +64,7 @@ extend_qtc_executable(qmlpuppet
@@ -79,7 +79,7 @@ extend_qtc_executable(qmlpuppet
)
extend_qtc_executable(qmlpuppet
@@ -250,10 +250,10 @@ index 19bc66e..5683233 100644
)
--
2.50.1
2.51.0
From b42dda33049f5c075899f51a5ff87b4ff972efa8 Mon Sep 17 00:00:00 2001
From b890ef320fe289f0bd8c67c6c63e1ba25f19b86a 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
@@ -288,10 +288,10 @@ index b99907c..735b196 100644
if (rc != 0)
return {};
--
2.50.1
2.51.0
From 0f1a77e0cbc93859d4fb19a673b922041cc0a920 Mon Sep 17 00:00:00 2001
From dd663c002d4c62dc282634d2be8e0d871b29c03f 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
@@ -356,10 +356,10 @@ index 8f0eceb..5a2b645 100644
} // namespace Utils
--
2.50.1
2.51.0
From 723c9bcde56341ab52d8c25f5323ac3a13319717 Mon Sep 17 00:00:00 2001
From 0cfab8edf6cc61136b55452ef988f6a2731ea4e0 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
@@ -451,10 +451,10 @@ index 1f6d985..1e0c573 100644
return new LinuxDataProvider(pid);
#else
--
2.50.1
2.51.0
From 907aff2274ef7db2e9b8bac019b4603c18ddfca8 Mon Sep 17 00:00:00 2001
From 9c9b1ef9c249b1885e4dfc6bf66ef0b6b3a83054 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Thu, 19 Jun 2025 14:31:35 +0200
Subject: Fix binary reference in launcher script
@@ -471,5 +471,5 @@ index 86826f1..244dc7a 100755
-exec "$bindir/qtcreator" -user-library-path "$_ORIGINAL_LD_LIBRARY_PATH" ${1+"$@"}
+exec "$bindir/Qt Creator" -user-library-path "$_ORIGINAL_LD_LIBRARY_PATH" ${1+"$@"}
--
2.50.1
2.51.0

View File

@@ -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="f5671808476707391a9a2edb9963ea4a6b6b90c78cbe74ece1aca0c6b42e5184"
CHECKSUM_SHA256="c773b74114d1fbca66c81b8fb799892827e7e1542491ed459aaad279e0253973"
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
PATCHES="qt_creator-$portVersion.patchset"
ADDITIONAL_FILES="qt_creator.rdef.in"
@@ -120,6 +120,7 @@ BUILD()
-DCMAKE_AUTOGEN_PARALLEL=1 \
-DQTC_USE_SYSTEM_LIBARCHIVE=ON \
-DQT_NO_PRIVATE_MODULE_WARNING=ON \
-DBUILD_EXECUTABLE_CMDBRIDGE=OFF \
-Wno-dev
cmake --build build $jobArgs