mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
QtCreator: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -1,4 +1,4 @@
|
||||
From 0fff3d79b902adc84d86ce7a6cada6e79a7c15e5 Mon Sep 17 00:00:00 2001
|
||||
From b579cd55683ed48ab7d7c7b51c1b45af8effbaad 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
|
||||
@@ -81,9 +81,6 @@ index 1884b08..e492cf7 100644
|
||||
/* fdatasync() on HFS+ doesn't yet flush the file size if it changed correctly
|
||||
** so currently we default to the macro that redefines fdatasync to fsync
|
||||
*/
|
||||
diff --git a/src/libs/sqlite/createtablesqlstatementbuilder.cpp b/src/libs/sqlite/createtablesqlstatementbuilder.cpp
|
||||
new file mode 100644
|
||||
index 0000000..e69de29
|
||||
diff --git a/src/libs/utils/qtcassert.cpp b/src/libs/utils/qtcassert.cpp
|
||||
index 78baa41..bb91104 100644
|
||||
--- a/src/libs/utils/qtcassert.cpp
|
||||
@@ -110,21 +107,8 @@ index a9d0cca..1737508 100644
|
||||
fdatasync(handle());
|
||||
#else
|
||||
fsync(handle());
|
||||
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
|
||||
index f3e5c8f..ef4b5c9 100644
|
||||
--- a/src/plugins/clangformat/clangformatutils.cpp
|
||||
+++ b/src/plugins/clangformat/clangformatutils.cpp
|
||||
@@ -121,7 +121,7 @@ clang::format::FormatStyle calculateQtcStyle()
|
||||
#if LLVM_VERSION_MAJOR >= 12
|
||||
style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200, true}};
|
||||
#else
|
||||
- style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200, 200}};
|
||||
+ style.IncludeStyle.IncludeCategories = {{"^<Q.*", 200}};
|
||||
#endif
|
||||
style.IncludeStyle.IncludeIsMainRegex = "(Test)?$";
|
||||
style.IndentCaseLabels = false;
|
||||
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
index 8a2e0b4..bbdf720 100644
|
||||
index 4aa3c64..44a9c1d 100644
|
||||
--- a/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
|
||||
@@ -234,16 +234,20 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option,
|
||||
@@ -148,7 +132,7 @@ index 8a2e0b4..bbdf720 100644
|
||||
case PM_ToolBarItemMargin:
|
||||
case PM_ToolBarItemSpacing:
|
||||
if (panelWidget(widget))
|
||||
@@ -860,6 +864,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -854,6 +858,7 @@ void ManhattanStyle::drawControl(
|
||||
}
|
||||
|
||||
switch (element) {
|
||||
@@ -156,7 +140,7 @@ index 8a2e0b4..bbdf720 100644
|
||||
case CE_MenuItem:
|
||||
painter->save();
|
||||
if (const auto mbi = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
|
||||
@@ -879,6 +884,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -873,6 +878,7 @@ void ManhattanStyle::drawControl(
|
||||
}
|
||||
painter->restore();
|
||||
break;
|
||||
@@ -164,7 +148,7 @@ index 8a2e0b4..bbdf720 100644
|
||||
|
||||
case CE_MenuBarItem:
|
||||
painter->save();
|
||||
@@ -1022,6 +1028,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -1016,6 +1022,7 @@ void ManhattanStyle::drawControl(
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -172,7 +156,7 @@ index 8a2e0b4..bbdf720 100644
|
||||
case CE_MenuBarEmptyArea: {
|
||||
if (creatorTheme()->flag(Theme::FlatMenuBar))
|
||||
painter->fillRect(option->rect, StyleHelper::baseColor());
|
||||
@@ -1035,6 +1042,7 @@ void ManhattanStyle::drawControl(
|
||||
@@ -1029,6 +1036,7 @@ void ManhattanStyle::drawControl(
|
||||
painter->restore();
|
||||
}
|
||||
break;
|
||||
@@ -181,7 +165,7 @@ index 8a2e0b4..bbdf720 100644
|
||||
case CE_ToolBar:
|
||||
{
|
||||
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
|
||||
index d1bd01b..ab90153 100644
|
||||
index cf5a8ac..2d4021c 100644
|
||||
--- a/src/plugins/projectexplorer/abi.cpp
|
||||
+++ b/src/plugins/projectexplorer/abi.cpp
|
||||
@@ -1138,6 +1138,10 @@ Abi Abi::hostAbi()
|
||||
@@ -196,10 +180,10 @@ index d1bd01b..ab90153 100644
|
||||
os = LinuxOS;
|
||||
subos = GenericFlavor;
|
||||
diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
|
||||
index 3c41fff..28fb307 100644
|
||||
index 2e29b8d..d85ed9f 100644
|
||||
--- a/src/plugins/qmldesigner/CMakeLists.txt
|
||||
+++ b/src/plugins/qmldesigner/CMakeLists.txt
|
||||
@@ -89,7 +89,7 @@ extend_qtc_library(QmlDesignerCore
|
||||
@@ -114,7 +114,7 @@ extend_qtc_library(QmlDesignerCore
|
||||
PUBLIC_DEFINES QDS_BUILD_QMLPARSER
|
||||
)
|
||||
extend_qtc_library(QmlDesignerCore
|
||||
@@ -266,5 +250,43 @@ index 9244a94..781b5cc 100644
|
||||
)
|
||||
|
||||
--
|
||||
2.42.1
|
||||
2.43.2
|
||||
|
||||
|
||||
From b768b1bcfb8592449a3c52dc64d4bb3d7fe6dcdd 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 ada5bf6..4739cb0 100644
|
||||
--- a/src/libs/nanotrace/nanotracehr.cpp
|
||||
+++ b/src/libs/nanotrace/nanotracehr.cpp
|
||||
@@ -18,6 +18,10 @@
|
||||
# include <pthread.h>
|
||||
#endif
|
||||
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+# include <OS.h>
|
||||
+#endif
|
||||
+
|
||||
namespace NanotraceHR {
|
||||
|
||||
namespace {
|
||||
@@ -91,7 +95,11 @@ std::string getThreadName()
|
||||
{
|
||||
std::array<char, 200> buffer;
|
||||
buffer[0] = 0;
|
||||
-#ifdef Q_OS_UNIX
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+ status_t res = rename_thread(find_thread(NULL), buffer.data());
|
||||
+ if (res != B_OK)
|
||||
+ return {};
|
||||
+#elif defined(Q_OS_UNIX)
|
||||
auto rc = pthread_getname_np(pthread_self(), buffer.data(), buffer.size());
|
||||
if (rc != 0)
|
||||
return {};
|
||||
--
|
||||
2.43.2
|
||||
|
||||
@@ -4,11 +4,11 @@ development environment (IDE) for application developers to create \
|
||||
applications for multiple desktop, embedded, and mobile device platforms, \
|
||||
such as Android and iOS."
|
||||
HOMEPAGE="https://www.qt.io/ide/"
|
||||
COPYRIGHT="2023 The Qt Company Ltd"
|
||||
COPYRIGHT="2024 The Qt Company Ltd"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="ace811ac3aee9bfbd1a55eb6cb49479a4823ead6f39f203571e9d77648450381"
|
||||
CHECKSUM_SHA256="ec14f05f270714455a2f0d40b8aab02ed9241d4fa4f03ea539bfec5819e9e036"
|
||||
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
|
||||
PATCHES="qt_creator-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="qt_creator.rdef.in"
|
||||
@@ -94,9 +94,6 @@ INSTALL()
|
||||
{
|
||||
cmake --install build --prefix $appsDir/QtCreator
|
||||
|
||||
# Qt port doesn't support createPlatformOpenGLContext yet
|
||||
rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlDesigner.so
|
||||
rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlProfiler.so
|
||||
# Create symlink to libclang
|
||||
ln -s /system/$relativeDevelopLibDir/libclang.so.17 $appsDir/QtCreator/lib/qtcreator/
|
||||
ln -s /system/$relativeDevelopLibDir/libclang.so.17 $appsDir/QtCreator/libexec/qtcreator/
|
||||
Reference in New Issue
Block a user