mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
qt6_base: bump version
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 539f3d92c540ec451b970c484055f99122dbfa7f Mon Sep 17 00:00:00 2001
|
||||
From 278725a0c21bc16009f43e2aec4b06e0d5f97233 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Mon, 11 Feb 2019 15:53:49 +1000
|
||||
Subject: Make sure libs are searched in the develop/ dir by CMake
|
||||
@@ -23,7 +23,7 @@ index 24ed125..52f637e 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 3e2630d33503d1411af771d6fc4bfb9a7034946b Mon Sep 17 00:00:00 2001
|
||||
From 930f8f14045ac24db29d6aa197b2ac3f2ecc003d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:56:12 +1000
|
||||
Subject: Fix QStandartPaths for Haiku
|
||||
@@ -86,29 +86,29 @@ index 044d69f..1f255a9 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 908d945943b0563451f4aa1027df3a7afd427148 Mon Sep 17 00:00:00 2001
|
||||
From 9235e780c5c83673fab8da1f4dbde226acbf1afc Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:56:39 +1000
|
||||
Subject: QSslSocketPrivate::unixRootCertDirectories(): add ssl path for Haiku.
|
||||
|
||||
|
||||
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
|
||||
index 003bbf0..8c48db1 100644
|
||||
index 453d7a8..3602e21 100644
|
||||
--- a/src/network/ssl/qsslsocket.cpp
|
||||
+++ b/src/network/ssl/qsslsocket.cpp
|
||||
@@ -2980,6 +2980,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
|
||||
<< "/usr/local/ssl/certs/" // Solaris
|
||||
<< "/etc/openssl/certs/" // BlackBerry
|
||||
<< "/opt/openssl/certs/" // HP-UX
|
||||
+ << "/system/data/ssl/" // Haiku
|
||||
<< "/etc/ssl/"; // OpenBSD
|
||||
}
|
||||
|
||||
@@ -2987,6 +2987,7 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
|
||||
ba("/usr/local/ssl/certs/"), // Solaris
|
||||
ba("/etc/openssl/certs/"), // BlackBerry
|
||||
ba("/opt/openssl/certs/"), // HP-UX
|
||||
+ ba("/system/data/ssl/"), // Haiku
|
||||
ba("/etc/ssl/"), // OpenBSD
|
||||
};
|
||||
return QList<QByteArray>::fromReadOnlyData(dirs);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 7e582bb843a2a46efa11c7a9365114fa944eaa85 Mon Sep 17 00:00:00 2001
|
||||
From 47cb80806420546401d044f3dc6d125725d7086a Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:56:59 +1000
|
||||
Subject: Fix build for Haiku platform
|
||||
@@ -131,7 +131,7 @@ index 0040b6c..9a729bb 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 0a68bc64a38a6104917b2f510cd054cada753e7a Mon Sep 17 00:00:00 2001
|
||||
From 1a32dc100195b34a57067b48d2d9659da9fa94c6 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 11 Feb 2019 15:57:54 +1000
|
||||
Subject: Fix endian detection
|
||||
@@ -158,17 +158,17 @@ index 9bb306e..9f0ea58 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 8494b1bd7cfd532ddb859e68e6b68bd691ce3cb4 Mon Sep 17 00:00:00 2001
|
||||
From 044774b9948b1fbbb6695bcca39cf2cbb16930ee Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 27 May 2020 19:54:30 +1000
|
||||
Subject: Disable LibResolv for Haiku
|
||||
|
||||
|
||||
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
|
||||
index 9b0a2ee..480671b 100644
|
||||
index eb1048a..0345439 100644
|
||||
--- a/src/network/kernel/qhostinfo_unix.cpp
|
||||
+++ b/src/network/kernel/qhostinfo_unix.cpp
|
||||
@@ -87,7 +87,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
|
||||
@@ -89,7 +89,7 @@ typedef void (*res_nclose_proto)(res_state_ptr);
|
||||
static res_nclose_proto local_res_nclose = nullptr;
|
||||
static res_state_ptr local_res = nullptr;
|
||||
|
||||
@@ -181,14 +181,14 @@ index 9b0a2ee..480671b 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 9bc157e738691749706fe03b6bfe219b596d9eb7 Mon Sep 17 00:00:00 2001
|
||||
From ba1842cdfd4c43526bec2d3bb36c4c8a58b81bdb Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 8 Sep 2019 00:17:19 +1000
|
||||
Subject: Don't use ifaddrs for Haiku
|
||||
|
||||
|
||||
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
|
||||
index b1e351a..705033c 100644
|
||||
index 94f3a53..1f4140a 100644
|
||||
--- a/src/network/kernel/qnetworkinterface_unix.cpp
|
||||
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
|
||||
@@ -53,7 +53,7 @@
|
||||
@@ -204,14 +204,14 @@ index b1e351a..705033c 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 8e3ff77b9c2be9219e1c8cee83420c08ecfc39e3 Mon Sep 17 00:00:00 2001
|
||||
From a293654ab3ef7868a110f677267e08d2c7d48e85 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 27 May 2020 19:54:58 +1000
|
||||
Subject: Disable sharedmemory feature for bootstrap
|
||||
|
||||
|
||||
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
|
||||
index 511313e..f997489 100644
|
||||
index fb39c11..f9f8761 100644
|
||||
--- a/src/tools/bootstrap/CMakeLists.txt
|
||||
+++ b/src/tools/bootstrap/CMakeLists.txt
|
||||
@@ -109,6 +109,7 @@ qt_internal_extend_target(Bootstrap
|
||||
@@ -226,7 +226,7 @@ index 511313e..f997489 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 244d13ddddf14efcb0e33e6e3b157b769ba1d215 Mon Sep 17 00:00:00 2001
|
||||
From f038f1671a33fa3fd40898e2f12d11e02b908b2f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 29 Dec 2019 18:13:19 +1000
|
||||
Subject: Fix build for x86_gcc2
|
||||
@@ -249,17 +249,17 @@ index c29ebc2..c6309a2 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 044d412caee2a8ee8713a796b9ae1617439b6a91 Mon Sep 17 00:00:00 2001
|
||||
From eb6173566cef9b05e4005597e3ef05587d6b47e7 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 4 Jun 2020 23:11:17 +1000
|
||||
Subject: Implement QFilesystemWatcher for Haiku
|
||||
|
||||
|
||||
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
|
||||
index 0bcc3b7..6132bba 100644
|
||||
index e722be1..55a39af 100644
|
||||
--- a/src/corelib/CMakeLists.txt
|
||||
+++ b/src/corelib/CMakeLists.txt
|
||||
@@ -426,6 +426,14 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQU
|
||||
@@ -443,6 +443,14 @@ qt_internal_extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQU
|
||||
"/BASE:0x67000000"
|
||||
)
|
||||
|
||||
@@ -274,11 +274,11 @@ index 0bcc3b7..6132bba 100644
|
||||
# QtCore can't be compiled with -Wl,-no-undefined because it uses the
|
||||
# "environ" variable and FreeBSD does not include a weak symbol for it
|
||||
# in libc.
|
||||
@@ -895,6 +903,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
|
||||
@@ -882,6 +890,11 @@ qt_internal_extend_target(Core CONDITION MACOS AND QT_FEATURE_filesystemwatcher
|
||||
io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
|
||||
)
|
||||
|
||||
+qt_internal_extend_target(Core CONDITION HAIKU AND QT_FEATURE_filesystemwatcher
|
||||
+qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND HAIKU
|
||||
+ SOURCES
|
||||
+ io/qfilesystemwatcher_haiku.cpp io/qfilesystemwatcher_haiku_p.h
|
||||
+)
|
||||
@@ -286,7 +286,7 @@ index 0bcc3b7..6132bba 100644
|
||||
qt_internal_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT MACOS
|
||||
SOURCES
|
||||
io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
|
||||
@@ -1072,7 +1085,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
|
||||
@@ -1068,7 +1081,7 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_clock_gettime AND UNIX
|
||||
WrapRt::WrapRt
|
||||
)
|
||||
|
||||
@@ -671,17 +671,17 @@ index 0000000..8a8d75a
|
||||
2.30.2
|
||||
|
||||
|
||||
From 2924289d25898a4010670f75e8e9ca7884af1eba Mon Sep 17 00:00:00 2001
|
||||
From af2d8bbde532f02f813ef099eb9af62e5a88009c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 16 Jun 2020 18:06:57 +1000
|
||||
Subject: Don't use AF_INET6 for new sockets
|
||||
|
||||
|
||||
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
|
||||
index e6704a3..930bc80 100644
|
||||
index 61fa8ed..aa5449a 100644
|
||||
--- a/src/network/socket/qnativesocketengine_unix.cpp
|
||||
+++ b/src/network/socket/qnativesocketengine_unix.cpp
|
||||
@@ -232,8 +232,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
|
||||
@@ -233,8 +233,12 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
|
||||
}
|
||||
int protocol = 0;
|
||||
#endif // QT_NO_SCTP
|
||||
@@ -698,14 +698,14 @@ index e6704a3..930bc80 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 2061a362b203542035b88d70b5d5c504b8831f66 Mon Sep 17 00:00:00 2001
|
||||
From 07fad9ba1f4b9842a5efb7970ccced46cde8742c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Mon, 5 Oct 2020 19:40:40 +1000
|
||||
Subject: Disable Haswell CPU feature for plugins
|
||||
|
||||
|
||||
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
|
||||
index 05b2c92..6e89a5e 100644
|
||||
index c119bee..39978af 100644
|
||||
--- a/src/corelib/plugin/qlibrary_unix.cpp
|
||||
+++ b/src/corelib/plugin/qlibrary_unix.cpp
|
||||
@@ -192,7 +192,7 @@ bool QLibraryPrivate::load_sys()
|
||||
@@ -721,7 +721,7 @@ index 05b2c92..6e89a5e 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 889f5e27c62afb9b6215401aaf97ed8bb9fa8e3b Mon Sep 17 00:00:00 2001
|
||||
From ae506208bbae9e31dd34c547c72c476dfbff904d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 12 Nov 2020 17:50:04 +0100
|
||||
Subject: Haiku build setup
|
||||
@@ -741,10 +741,10 @@ index 6e3414b..8d16ac4 100644
|
||||
message(WARNING "No known RPATH_REL_BASE for target platform.")
|
||||
set(rpath_rel_base "NO_KNOWN_RPATH_REL_BASE")
|
||||
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
|
||||
index 7de8dfc..0880961 100644
|
||||
index 17b81e9..78fe275 100644
|
||||
--- a/cmake/QtSetup.cmake
|
||||
+++ b/cmake/QtSetup.cmake
|
||||
@@ -55,7 +55,7 @@ elseif(APPLE)
|
||||
@@ -104,7 +104,7 @@ elseif(APPLE)
|
||||
endif()
|
||||
|
||||
## Position independent code:
|
||||
@@ -757,17 +757,17 @@ index 7de8dfc..0880961 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 18cc6325b911225fb8b0408f1eb095a7c95717a6 Mon Sep 17 00:00:00 2001
|
||||
From e4f662a92d5ee34f47afc471294d7a718da0722d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 12 Nov 2020 22:33:56 +0100
|
||||
Subject: Haiku: link against libnetwork
|
||||
|
||||
|
||||
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
|
||||
index 1ab3c20..534a7e7 100644
|
||||
index 730d67e..f14c3ca 100644
|
||||
--- a/src/network/CMakeLists.txt
|
||||
+++ b/src/network/CMakeLists.txt
|
||||
@@ -200,6 +200,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
|
||||
@@ -205,6 +205,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dnslookup AND WIN32
|
||||
kernel/qdnslookup_win.cpp
|
||||
)
|
||||
|
||||
@@ -783,7 +783,7 @@ index 1ab3c20..534a7e7 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 0ce7a1db826d6e17e2a406f20b0d8609f01ded8a Mon Sep 17 00:00:00 2001
|
||||
From f299acf69a911d8cfbf3b3458bc8e573dee59d4c Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 31 Oct 2021 22:57:22 +1000
|
||||
Subject: QSharedMemory implementation
|
||||
@@ -1047,124 +1047,89 @@ index e06e7e8..e0bd23f 100644
|
||||
2.30.2
|
||||
|
||||
|
||||
From 8ba3a2f911ad035b0847068bdde1ee87c93cf274 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
||||
Date: Tue, 2 Nov 2021 09:02:45 +0100
|
||||
Subject: [PATCH] Revert "Code style fix"
|
||||
From 7facce45184d5812db5af5d36d795d6df5810bb8 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 28 Apr 2022 21:03:05 +1000
|
||||
Subject: Fix elf parser for Haiku
|
||||
|
||||
This reverts commit e1d7df5ce9eb1d370e1b6dcd31ced4029082d63d.
|
||||
|
||||
The offending patch removed handling of page-up and page-down
|
||||
shortcuts in QScrollView (including subclasses like QTextBrowser).
|
||||
|
||||
Pick-to: 6.2
|
||||
Fixes: QTBUG-97908
|
||||
Fixes: QTBUG-90352
|
||||
Change-Id: If760e983a082edb53e12e1311e2c7f2676d80bb2
|
||||
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
||||
---
|
||||
src/widgets/widgets/qabstractscrollarea.cpp | 82 ++++++++++++++++-------------
|
||||
1 file changed, 45 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
|
||||
index 4ad8a3b4110..627dbaa1d6e 100644
|
||||
--- a/src/widgets/widgets/qabstractscrollarea.cpp
|
||||
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
|
||||
@@ -1232,49 +1232,57 @@ void QAbstractScrollArea::contextMenuEvent(QContextMenuEvent *e)
|
||||
void QAbstractScrollArea::keyPressEvent(QKeyEvent * e)
|
||||
{
|
||||
Q_D(QAbstractScrollArea);
|
||||
-
|
||||
+ if (false){
|
||||
+#ifndef QT_NO_SHORTCUT
|
||||
+ } else if (e == QKeySequence::MoveToPreviousPage) {
|
||||
+ d->vbar->triggerAction(QScrollBar::SliderPageStepSub);
|
||||
+ } else if (e == QKeySequence::MoveToNextPage) {
|
||||
+ d->vbar->triggerAction(QScrollBar::SliderPageStepAdd);
|
||||
diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp
|
||||
index c6ccda9..4179696 100644
|
||||
--- a/src/corelib/plugin/qelfparser_p.cpp
|
||||
+++ b/src/corelib/plugin/qelfparser_p.cpp
|
||||
@@ -56,6 +56,12 @@
|
||||
# error "Need ELF header to parse plugins."
|
||||
#endif
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define PF_R PF_READ
|
||||
+#define PF_W PF_WRITE
|
||||
+#define PF_X PF_EXECUTE
|
||||
+#endif
|
||||
+ } else {
|
||||
#ifdef QT_KEYPAD_NAVIGATION
|
||||
- if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
|
||||
- e->ignore();
|
||||
- return;
|
||||
- }
|
||||
+ if (QApplicationPrivate::keypadNavigationEnabled() && !hasEditFocus()) {
|
||||
+ e->ignore();
|
||||
+ return;
|
||||
+ }
|
||||
#endif
|
||||
- switch (e->key()) {
|
||||
- case Qt::Key_Up:
|
||||
- d->vbar->triggerAction(QScrollBar::SliderSingleStepSub);
|
||||
- break;
|
||||
- case Qt::Key_Down:
|
||||
- d->vbar->triggerAction(QScrollBar::SliderSingleStepAdd);
|
||||
- break;
|
||||
- case Qt::Key_Left:
|
||||
+ switch (e->key()) {
|
||||
+ case Qt::Key_Up:
|
||||
+ d->vbar->triggerAction(QScrollBar::SliderSingleStepSub);
|
||||
+ break;
|
||||
+ case Qt::Key_Down:
|
||||
+ d->vbar->triggerAction(QScrollBar::SliderSingleStepAdd);
|
||||
+ break;
|
||||
+ case Qt::Key_Left:
|
||||
#ifdef QT_KEYPAD_NAVIGATION
|
||||
- if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
|
||||
- && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) {
|
||||
- //if we aren't using the hbar or we are already at the leftmost point ignore
|
||||
- e->ignore();
|
||||
- return;
|
||||
- }
|
||||
+ if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
|
||||
+ && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->minimum())) {
|
||||
+ //if we aren't using the hbar or we are already at the leftmost point ignore
|
||||
+ e->ignore();
|
||||
+ return;
|
||||
+ }
|
||||
#endif
|
||||
- d->hbar->triggerAction(
|
||||
- layoutDirection() == Qt::LeftToRight
|
||||
- ? QScrollBar::SliderSingleStepSub : QScrollBar::SliderSingleStepAdd);
|
||||
- break;
|
||||
- case Qt::Key_Right:
|
||||
+ d->hbar->triggerAction(
|
||||
+ layoutDirection() == Qt::LeftToRight
|
||||
+ ? QScrollBar::SliderSingleStepSub : QScrollBar::SliderSingleStepAdd);
|
||||
+ break;
|
||||
+ case Qt::Key_Right:
|
||||
#ifdef QT_KEYPAD_NAVIGATION
|
||||
- if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
|
||||
- && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) {
|
||||
- //if we aren't using the hbar or we are already at the rightmost point ignore
|
||||
- e->ignore();
|
||||
- return;
|
||||
- }
|
||||
+ if (QApplicationPrivate::keypadNavigationEnabled() && hasEditFocus()
|
||||
+ && (!d->hbar->isVisible() || d->hbar->value() == d->hbar->maximum())) {
|
||||
+ //if we aren't using the hbar or we are already at the rightmost point ignore
|
||||
+ e->ignore();
|
||||
+ return;
|
||||
+ }
|
||||
#endif
|
||||
- d->hbar->triggerAction(
|
||||
- layoutDirection() == Qt::LeftToRight
|
||||
- ? QScrollBar::SliderSingleStepAdd : QScrollBar::SliderSingleStepSub);
|
||||
- break;
|
||||
- default:
|
||||
- e->ignore();
|
||||
- return;
|
||||
+ d->hbar->triggerAction(
|
||||
+ layoutDirection() == Qt::LeftToRight
|
||||
+ ? QScrollBar::SliderSingleStepAdd : QScrollBar::SliderSingleStepSub);
|
||||
+ break;
|
||||
+ default:
|
||||
+ e->ignore();
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
// ### Qt7: propagate the constant and eliminate dead code
|
||||
@@ -230,18 +236,26 @@ struct ElfHeaderCheck : public ElfHeaderCommonCheck
|
||||
// byte 7
|
||||
static bool checkOsAbi(const uchar *ident)
|
||||
{
|
||||
+#ifndef __HAIKU__
|
||||
uchar osabi = ident[EI_OSABI];
|
||||
// we don't check
|
||||
Q_UNUSED(osabi);
|
||||
+#else
|
||||
+ Q_UNUSED(ident);
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
e->accept();
|
||||
|
||||
// byte 8
|
||||
static bool checkAbiVersion(const uchar *ident)
|
||||
{
|
||||
+#ifndef __HAIKU__
|
||||
uchar abiversion = ident[EI_ABIVERSION];
|
||||
// we don't check (and I don't know anyone who uses this)
|
||||
Q_UNUSED(abiversion);
|
||||
+#else
|
||||
+ Q_UNUSED(ident);
|
||||
+#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -359,6 +373,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
|
||||
break;
|
||||
}
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ d << " (Haiku v1)";
|
||||
+#else
|
||||
switch (e_ident[EI_OSABI]) {
|
||||
case ELFOSABI_SYSV: d << " (SYSV"; break;
|
||||
case ELFOSABI_HPUX: d << " (HP-UX"; break;
|
||||
@@ -375,7 +392,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
|
||||
if (e_ident[EI_ABIVERSION])
|
||||
d << " v" << e_ident[EI_ABIVERSION];
|
||||
d << ')';
|
||||
-
|
||||
+#endif
|
||||
if (e_ident[EI_VERSION] != 1) {
|
||||
d << ", file version " << e_ident[EI_VERSION];
|
||||
return d;
|
||||
@@ -460,11 +477,12 @@ Q_DECL_UNUSED static QDebug &operator<<(QDebug &d, ElfSectionDebug s)
|
||||
d << 'A';
|
||||
if (s.shdr->sh_flags & SHF_EXECINSTR)
|
||||
d << 'X';
|
||||
+#ifndef __HAIKU__
|
||||
if (s.shdr->sh_flags & SHF_STRINGS)
|
||||
d << 'S';
|
||||
if (s.shdr->sh_flags & SHF_TLS)
|
||||
d << 'T';
|
||||
-
|
||||
+#endif
|
||||
d.space() << "offset" << s.shdr->sh_offset << "size" << s.shdr->sh_size;
|
||||
return d;
|
||||
}
|
||||
--
|
||||
2.16.3
|
||||
2.30.2
|
||||
|
||||
@@ -4,17 +4,17 @@ used for developing software with a graphical user interface, and also used \
|
||||
for developing non-GUI programs such as command-line tools and consoles for \
|
||||
servers."
|
||||
HOMEPAGE="https://qt.io/"
|
||||
COPYRIGHT="2015-2021 The Qt Company Ltd."
|
||||
COPYRIGHT="2015-2022 The Qt Company Ltd."
|
||||
LICENSE="GNU LGPL v3
|
||||
GNU GPL v3
|
||||
GNU FDL v1"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a"
|
||||
CHECKSUM_SHA256="b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99"
|
||||
SOURCE_DIR="qtbase-everywhere-src-$portVersion"
|
||||
srcGitRev2="2a460261e192d8cb6f76b4e3be8d02a966c336e9"
|
||||
srcGitRev2="40a21cb8c2c3d19acb1ff2980a243d4c8c6d9cf2"
|
||||
SOURCE_URI_2="https://github.com/threedeyes/qt6-haikuplugins/archive/$srcGitRev2.tar.gz"
|
||||
CHECKSUM_SHA256_2="dc50123f3c6c83208df6a30f6765c0dc0fc7b7cb741a8e1fb51d99db7ecec9bd"
|
||||
CHECKSUM_SHA256_2="1049ebdae620d0962bc3584aac7ce4c84f026bb0b930eaad61cfffa9e9f781d5"
|
||||
SOURCE_DIR_2="qt6-haikuplugins-$srcGitRev2"
|
||||
PATCHES="qt6_base-$portVersion.patchset"
|
||||
|
||||
@@ -40,6 +40,7 @@ PROVIDES="
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
haiku_svg_icon_theme
|
||||
lib:libbrotlidec$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libdouble_conversion$secondaryArchSuffix
|
||||
lib:libegl$secondaryArchSuffix
|
||||
@@ -88,6 +89,7 @@ REQUIRES_devel="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libbrotlidec$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libdouble_conversion$secondaryArchSuffix >= 3
|
||||
devel:libegl$secondaryArchSuffix
|
||||
Reference in New Issue
Block a user