5 files changed, 62 insertions, 24 deletions
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 5cc8e8681bb..0c65e18ec10 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -952,7 +952,7 @@ void QRegularExpressionPrivate::getPatternInfo()
 namespace {
 struct PcreJitStackFree
 {
-    void operator()(pcre2_jit_stack_16 *stack)
+    void operator()(pcre2_jit_stack_16 *stack) const
     {
         if (stack)
             pcre2_jit_stack_free_16(stack);
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 6428653de26..66bb65685fa 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -216,6 +216,19 @@ static void ensureInitialized()
     can be:
     \snippet code/src_network_access_qnetworkaccessmanager.cpp 1
 
+    Since Qt 6.11 the defaults of the TCP Keepalive parameters used by
+    QNetworkAccessManager have been changed. With the current settings
+    the connection will be terminated after 2 minutes of inactivity.
+
+    These settings can be changed the individual requests, to make
+    them more lenient, or even more aggressive via the QNetworkRequest API.
+    \snippet http/httpwindow.cpp qnam-tcpkeepalive
+
+    In the above snippet we are picking a more aggressive strategy, to
+    terminate the connection after thirty seconds of inactivity. This can
+    be useful, for example, in early detection of network hangs caused
+    by network changes on Linux.
+
     \sa QNetworkRequest, QNetworkReply, QNetworkProxy
 */
 
diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp
index 0731fb616ed..7f8590ae894 100644
--- a/src/tools/macdeployqt/shared/shared.cpp
+++ b/src/tools/macdeployqt/shared/shared.cpp
@@ -1008,6 +1008,31 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
             rpathsUsed.append(framework.rpathUsed);
         }
 
+        // To properly find all dependencies of the current framework / library further down in
+        // getQtFrameworks, we need to get its rpaths, resolve them in the context of its original
+        // location before it is copied, and add them as candidate rpaths.
+        //
+        // This is necessary to handle cases like
+        // (1) QtNetwork.framework -> (2) libbrotlidec.dylib -> (3) libbrotlicommon.1.dylib
+        // to correctly resolve the path to (3) when it is referenced as
+        // '@rpath/libbrotlicommon.1.dylib' and (2) has an LC_RPATH of '@loader_path/../lib', and
+        // no other absolute rpaths. So the '@loader_path/../lib' will be resolved relative
+        // to (2)'s original location and its LC_RPATH.
+        //
+        // Otherwise we'd only have the Qt prefix and the current bundle app dir as rpath
+        // candidates, and once (2) is copied into the app bundle, there's no way
+        // '@rpath/libbrotlicommon.1.dylib' could resolve to the real path on disk from the two
+        // candidates above.
+        if (!framework.sourceFilePath.isEmpty()) {
+            const QList<QString> sourceRPaths = getBinaryRPaths(framework.sourceFilePath, true);
+            for (const QString &sourceRPath : sourceRPaths) {
+                const QDir sourceRPathDir(sourceRPath);
+                if (sourceRPathDir.exists() && !rpathsUsed.contains(sourceRPath)) {
+                    rpathsUsed.append(sourceRPath);
+                }
+            }
+        }
+
         // Copy the framework/dylib to the app bundle.
         const QString deployedBinaryPath = framework.isDylib ? copyDylib(framework, bundlePath)
                                                              : copyFramework(framework, bundlePath);
@@ -1032,7 +1057,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         for (const FrameworkInfo &dependency : dependencies) {
             if (dependency.rpathUsed.isEmpty()) {
                 changeInstallName(bundlePath, dependency, QStringList() << deployedBinaryPath, useLoaderPath);
-            } else {
+            } else if (!rpathsUsed.contains(dependency.rpathUsed)) {
                 rpathsUsed.append(dependency.rpathUsed);
             }
 
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index e23ed9f23ee..58a4115374e 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -259,7 +259,7 @@ public:
     void setup(const QWizardLayoutInfo &info, const QString &title,
                const QString &subTitle, const QPixmap &logo, const QPixmap &banner,
                Qt::TextFormat titleFormat, Qt::TextFormat subTitleFormat,
-               QWizard::BannerSizePolicy bannerSizePolicy);
+               QWizard::BannerStretchPolicy bannerStretchPolicy);
 
 protected:
     void paintEvent(QPaintEvent *event) override;
@@ -273,7 +273,7 @@ private:
     QLabel *logoLabel;
     QGridLayout *layout;
     QPixmap bannerPixmap;
-    QWizard::BannerSizePolicy wizardBannerSizePolicy = QWizard::BannerSizePolicy::NoStretch;
+    QWizard::BannerStretchPolicy wizardBannerStretchPolicy = QWizard::BannerStretchPolicy::NoStretch;
 };
 
 QWizardHeader::QWizardHeader(QWidget *parent)
@@ -329,7 +329,7 @@ bool QWizardHeader::vistaDisabled() const
 void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title,
                           const QString &subTitle, const QPixmap &logo, const QPixmap &banner,
                           Qt::TextFormat titleFormat, Qt::TextFormat subTitleFormat,
-                          QWizard::BannerSizePolicy bannerSizePolicy)
+                          QWizard::BannerStretchPolicy bannerStretchPolicy)
 {
     bool modern = ((info.wizStyle == QWizard::ModernStyle)
 #if QT_CONFIG(style_windowsvista)
@@ -337,7 +337,7 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title,
 #endif
     );
 
-    wizardBannerSizePolicy = bannerSizePolicy;
+    wizardBannerStretchPolicy = bannerStretchPolicy;
 
     layout->setRowMinimumHeight(0, modern ? ModernHeaderTopMargin : 0);
     layout->setRowMinimumHeight(1, modern ? info.topLevelMarginTop - ModernHeaderTopMargin - 1 : 0);
@@ -364,7 +364,7 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title,
         bannerPixmap = QPixmap();
     }
 
-    if (bannerPixmap.isNull() || wizardBannerSizePolicy != QWizard::BannerSizePolicy::NoStretch) {
+    if (bannerPixmap.isNull() || wizardBannerStretchPolicy != QWizard::BannerStretchPolicy::NoStretch) {
         /*
             There is no widthForHeight() function, so we simulate it with a loop.
         */
@@ -392,12 +392,12 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title,
 void QWizardHeader::paintEvent(QPaintEvent * /* event */)
 {
     QStylePainter painter(this);
-    switch (wizardBannerSizePolicy) {
-    case QWizard::BannerSizePolicy::Stretch:
+    switch (wizardBannerStretchPolicy) {
+    case QWizard::BannerStretchPolicy::Stretch:
         painter.setRenderHint(QPainter::SmoothPixmapTransform);
         painter.drawPixmap(0, 0, width(), height(), bannerPixmap);
         break;
-    case QWizard::BannerSizePolicy::NoStretch:
+    case QWizard::BannerStretchPolicy::NoStretch:
         painter.drawPixmap(0, 0, bannerPixmap);
         break;
     }
@@ -582,7 +582,7 @@ public:
     QList<QWizard::WizardButton> buttonsCustomLayout;
     Qt::TextFormat titleFmt = Qt::AutoText;
     Qt::TextFormat subTitleFmt = Qt::AutoText;
-    QWizard::BannerSizePolicy bannerSizePolicy = QWizard::BannerSizePolicy::NoStretch;
+    QWizard::BannerStretchPolicy bannerStretchPolicy = QWizard::BannerStretchPolicy::NoStretch;
     mutable QPixmap defaultPixmaps[QWizard::NPixmaps];
 
     union {
@@ -1238,7 +1238,7 @@ void QWizardPrivate::updateLayout()
         Q_ASSERT(page);
         headerWidget->setup(info, page->title(), page->subTitle(),
                             page->pixmap(QWizard::LogoPixmap), page->pixmap(QWizard::BannerPixmap),
-                            titleFmt, subTitleFmt, bannerSizePolicy);
+                            titleFmt, subTitleFmt, bannerStretchPolicy);
     }
 
     if (info.watermark || info.sideWidget) {
@@ -2097,7 +2097,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
 */
 
 /*!
-    \enum QWizard::BannerSizePolicy
+    \enum QWizard::BannerStretchPolicy
 
     This enum specifies the banner size policy when there is a banner.
 
@@ -2800,25 +2800,25 @@ Qt::TextFormat QWizard::subTitleFormat() const
 }
 
 /*!
-    \property QWizard::bannerSizePolicy
+    \property QWizard::bannerStretchPolicy
     \brief the banner size policy
 
     The default policy is \l{QWizard::}{NoStretch}
 */
-void QWizard::setBannerSizePolicy(QWizard::BannerSizePolicy bannerSizePolicy)
+void QWizard::setBannerStretchPolicy(QWizard::BannerStretchPolicy bannerStretchPolicy)
 {
     Q_D(QWizard);
-    if (d->bannerSizePolicy == bannerSizePolicy)
+    if (d->bannerStretchPolicy == bannerStretchPolicy)
         return;
 
-    d->bannerSizePolicy = bannerSizePolicy;
+    d->bannerStretchPolicy = bannerStretchPolicy;
     d->updateLayout();
 }
 
-QWizard::BannerSizePolicy QWizard::bannerSizePolicy() const
+QWizard::BannerStretchPolicy QWizard::bannerStretchPolicy() const
 {
     Q_D(const QWizard);
-    return d->bannerSizePolicy;
+    return d->bannerStretchPolicy;
 }
 
 /*!
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index 801fd7f4ef4..a421b3ecb40 100644
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@@ -25,7 +25,7 @@ class Q_WIDGETS_EXPORT QWizard : public QDialog
     Q_PROPERTY(Qt::TextFormat subTitleFormat READ subTitleFormat WRITE setSubTitleFormat)
     Q_PROPERTY(int startId READ startId WRITE setStartId)
     Q_PROPERTY(int currentId READ currentId WRITE setCurrentId NOTIFY currentIdChanged)
-    Q_PROPERTY(BannerSizePolicy bannerSizePolicy READ bannerSizePolicy WRITE setBannerSizePolicy REVISION(6, 11))
+    Q_PROPERTY(BannerStretchPolicy bannerStretchPolicy READ bannerStretchPolicy WRITE setBannerStretchPolicy REVISION(6, 11))
 
 public:
     enum WizardButton {
@@ -62,11 +62,11 @@ public:
     };
     Q_ENUM(WizardStyle)
 
-    enum class BannerSizePolicy {
+    enum class BannerStretchPolicy {
         NoStretch,
         Stretch,
     };
-    Q_ENUM(BannerSizePolicy)
+    Q_ENUM(BannerStretchPolicy)
 
     enum WizardOption {
         IndependentPages                = 0x00000001,
@@ -131,8 +131,8 @@ public:
     Qt::TextFormat titleFormat() const;
     void setSubTitleFormat(Qt::TextFormat format);
     Qt::TextFormat subTitleFormat() const;
-    void setBannerSizePolicy(BannerSizePolicy bannerSizePolicy);
-    QWizard::BannerSizePolicy bannerSizePolicy() const;
+    void setBannerStretchPolicy(BannerStretchPolicy bannerStretchPolicy);
+    QWizard::BannerStretchPolicy bannerStretchPolicy() const;
     void setPixmap(WizardPixmap which, const QPixmap &pixmap);
     QPixmap pixmap(WizardPixmap which) const;