mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
qt_creator, bump to version 19.0.0 (#13946)
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
From b2ede5698bab9adfeaf5f3d2ba66e7f333d6cc32 Mon Sep 17 00:00:00 2001
|
||||
From 41e862a0d28c9a3f516375d0384a624edc437604 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
|
||||
|
||||
|
||||
diff --git a/src/libs/3rdparty/libptyqt/unixptyprocess.cpp b/src/libs/3rdparty/libptyqt/unixptyprocess.cpp
|
||||
index d76349a..06fcc78 100644
|
||||
index a20e24e..63db32e 100644
|
||||
--- a/src/libs/3rdparty/libptyqt/unixptyprocess.cpp
|
||||
+++ b/src/libs/3rdparty/libptyqt/unixptyprocess.cpp
|
||||
@@ -118,7 +118,10 @@ bool UnixPtyProcess::startProcess(const QString &shellPath,
|
||||
@@ -117,7 +117,10 @@ bool UnixPtyProcess::startProcess(const QString &shellPath,
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ index d76349a..06fcc78 100644
|
||||
#if defined(IUTF8)
|
||||
ttmode.c_iflag |= IUTF8;
|
||||
#endif
|
||||
@@ -131,16 +134,22 @@ bool UnixPtyProcess::startProcess(const QString &shellPath,
|
||||
@@ -130,16 +133,22 @@ bool UnixPtyProcess::startProcess(const QString &shellPath,
|
||||
ttmode.c_cc[VEOL] = -1;
|
||||
ttmode.c_cc[VEOL2] = -1;
|
||||
ttmode.c_cc[VERASE] = 0x7f;
|
||||
@@ -43,7 +43,7 @@ index d76349a..06fcc78 100644
|
||||
ttmode.c_cc[VMIN] = 1;
|
||||
ttmode.c_cc[VTIME] = 0;
|
||||
|
||||
@@ -323,7 +332,7 @@ void ShellProcess::configChildProcess()
|
||||
@@ -322,7 +331,7 @@ void ShellProcess::configChildProcess()
|
||||
ioctl(m_handleSlave, TIOCSCTTY, 0);
|
||||
tcsetpgrp(m_handleSlave, sid);
|
||||
|
||||
@@ -53,7 +53,7 @@ index d76349a..06fcc78 100644
|
||||
struct utmpx utmpxInfo;
|
||||
memset(&utmpxInfo, 0, sizeof(utmpxInfo));
|
||||
diff --git a/src/libs/3rdparty/sqlite/config.h b/src/libs/3rdparty/sqlite/config.h
|
||||
index f0e73be..13d1902 100644
|
||||
index f229d85..6c7f863 100644
|
||||
--- a/src/libs/3rdparty/sqlite/config.h
|
||||
+++ b/src/libs/3rdparty/sqlite/config.h
|
||||
@@ -35,6 +35,11 @@
|
||||
@@ -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 37b534a..7eaf35d 100644
|
||||
index 49a4256..25ba12d 100644
|
||||
--- a/src/libs/3rdparty/sqlite/sqlite3.c
|
||||
+++ b/src/libs/3rdparty/sqlite/sqlite3.c
|
||||
@@ -42259,7 +42259,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){
|
||||
@@ -42511,7 +42511,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){
|
||||
*/
|
||||
if( rc ) rc = fsync(fd);
|
||||
|
||||
@@ -108,7 +108,7 @@ index d1b4347..c336ee4 100644
|
||||
#else
|
||||
fsync(handle());
|
||||
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
index afe7553..335bbef 100644
|
||||
index 6c9d38d..033d31a 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 afe7553..335bbef 100644
|
||||
case PM_ToolBarItemMargin:
|
||||
case PM_ToolBarItemSpacing:
|
||||
if (panelWidget(widget))
|
||||
@@ -923,6 +927,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -949,6 +953,7 @@ void ManhattanStyle::drawControl(
|
||||
}
|
||||
|
||||
switch (element) {
|
||||
@@ -140,7 +140,7 @@ index afe7553..335bbef 100644
|
||||
case CE_MenuItem:
|
||||
painter->save();
|
||||
if (const auto mbi = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
|
||||
@@ -941,6 +946,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -967,6 +972,7 @@ void ManhattanStyle::drawControl(
|
||||
}
|
||||
painter->restore();
|
||||
break;
|
||||
@@ -148,7 +148,7 @@ index afe7553..335bbef 100644
|
||||
|
||||
case CE_MenuBarItem:
|
||||
painter->save();
|
||||
@@ -1083,6 +1089,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -1109,6 +1115,7 @@ void ManhattanStyle::drawControl(
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -156,7 +156,7 @@ index afe7553..335bbef 100644
|
||||
case CE_MenuBarEmptyArea: {
|
||||
if (creatorTheme()->flag(Theme::FlatMenuBar))
|
||||
painter->fillRect(option->rect, StyleHelper::baseColor());
|
||||
@@ -1096,6 +1103,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -1122,6 +1129,7 @@ void ManhattanStyle::drawControl(
|
||||
painter->restore();
|
||||
}
|
||||
break;
|
||||
@@ -165,7 +165,7 @@ index afe7553..335bbef 100644
|
||||
case CE_ToolBar:
|
||||
{
|
||||
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
|
||||
index d351129..611be40 100644
|
||||
index 96b6688..21acd13 100644
|
||||
--- a/src/plugins/projectexplorer/abi.cpp
|
||||
+++ b/src/plugins/projectexplorer/abi.cpp
|
||||
@@ -1167,6 +1167,10 @@ Abi Abi::hostAbi()
|
||||
@@ -180,10 +180,10 @@ index d351129..611be40 100644
|
||||
os = LinuxOS;
|
||||
subos = GenericFlavor;
|
||||
diff --git a/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt b/src/plugins/qmldesigner/libs/designercore/CMakeLists.txt
|
||||
index 95ed14f..1826875 100644
|
||||
index 243b78e..b55a119 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
|
||||
@@ -67,7 +67,7 @@ extend_qtc_library(QmlDesignerCore
|
||||
PUBLIC_DEFINES QDS_BUILD_QMLPARSER
|
||||
)
|
||||
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 b4900cd..7a747e3 100644
|
||||
index b5435f7..59e36e4 100644
|
||||
--- a/src/tools/qmlpuppet/CMakeLists.txt
|
||||
+++ b/src/tools/qmlpuppet/CMakeLists.txt
|
||||
@@ -79,7 +79,7 @@ extend_qtc_executable(qmlpuppet
|
||||
@@ -82,7 +82,7 @@ extend_qtc_executable(qmlpuppet
|
||||
)
|
||||
|
||||
extend_qtc_executable(qmlpuppet
|
||||
@@ -253,14 +253,14 @@ index b4900cd..7a747e3 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From 1e7aa9856b786c21804b55fb1837bc3f66b8af54 Mon Sep 17 00:00:00 2001
|
||||
From 23231a738642c8eaff7a9b136f72a6731bad8c6b 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 b99907c..735b196 100644
|
||||
index ffe58e0..f0e4c46 100644
|
||||
--- a/src/libs/nanotrace/nanotracehr.cpp
|
||||
+++ b/src/libs/nanotrace/nanotracehr.cpp
|
||||
@@ -18,6 +18,10 @@
|
||||
@@ -274,7 +274,7 @@ index b99907c..735b196 100644
|
||||
namespace NanotraceHR {
|
||||
|
||||
namespace {
|
||||
@@ -104,7 +108,11 @@ std::string getThreadName()
|
||||
@@ -100,7 +104,11 @@ std::string getThreadName()
|
||||
{
|
||||
std::array<char, 200> buffer;
|
||||
buffer[0] = 0;
|
||||
@@ -291,7 +291,7 @@ index b99907c..735b196 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From b0207f8ac8ae39b0eb37597205d5e552d3ffa38d Mon Sep 17 00:00:00 2001
|
||||
From 6d51d1da5cf606377bbbd29b98def1719660ed7d 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
|
||||
@@ -359,7 +359,7 @@ index 8f0eceb..5a2b645 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From a0c61b64a35215d0a7f3cdb72fd4bfbf4ce74e7b Mon Sep 17 00:00:00 2001
|
||||
From ad164824aa4a9c41ebfc921be494b29970ed0415 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
|
||||
@@ -454,7 +454,7 @@ index 1f6d985..1e0c573 100644
|
||||
2.52.0
|
||||
|
||||
|
||||
From fb522d0edb37ae3053c318ecd5d4f5e0fc642811 Mon Sep 17 00:00:00 2001
|
||||
From 89da9af83eaeb6b222f5d0a58d3008100502284a 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
|
||||
@@ -8,7 +8,7 @@ COPYRIGHT="2026 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="1cff642233234b6ddd40389d05e4905808f98fd44342187fe9109290a0492c88"
|
||||
CHECKSUM_SHA256="f7f69bd007462a4606787c130e83583db4416df627bf777d33944f23caeacf6d"
|
||||
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
|
||||
PATCHES="qt_creator-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="qt_creator.rdef.in"
|
||||
@@ -20,8 +20,8 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
clangVer="18"
|
||||
libClangVer="18"
|
||||
else
|
||||
clangVer="20"
|
||||
libClangVer="20.1"
|
||||
clangVer="21"
|
||||
libClangVer="21.1"
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
Reference in New Issue
Block a user