summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/network/CMakeLists.txt1
-rw-r--r--src/network/socket/qabstractsocket.cpp1
-rw-r--r--src/network/socket/qabstractsocket_p.h3
-rw-r--r--src/network/socket/qabstractsocketengine.cpp2
-rw-r--r--src/network/socket/qabstractsocketengine_p.h14
-rw-r--r--src/network/socket/qabstractsocketenginereceiver_p.h44
-rw-r--r--src/network/socket/qudpsocket.cpp1
-rw-r--r--src/plugins/platforms/cocoa/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/cocoa/qcocoa_plugin_pch.h16
-rw-r--r--src/printsupport/dialogs/qpagesetupwidget.ui50
-rw-r--r--src/printsupport/dialogs/qprintdialog_unix.cpp1
-rw-r--r--src/printsupport/dialogs/qprintsettingsoutput.ui9
-rw-r--r--src/printsupport/widgets/qcupsjobwidget.ui59
-rw-r--r--src/widgets/itemviews/qlistview.cpp2
-rw-r--r--src/widgets/kernel/qboxlayout.cpp4
15 files changed, 145 insertions, 64 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index e98ac7112bc..cb304fc865c 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -42,6 +42,7 @@ qt_internal_add_module(Network
kernel/qtnetworkglobal.h kernel/qtnetworkglobal_p.h
socket/qabstractsocket.cpp socket/qabstractsocket.h socket/qabstractsocket_p.h
socket/qabstractsocketengine.cpp socket/qabstractsocketengine_p.h
+ socket/qabstractsocketenginereceiver_p.h
socket/qnativesocketengine.cpp socket/qnativesocketengine_p.h socket/qnativesocketengine_p_p.h
socket/qtcpserver.cpp socket/qtcpserver.h socket/qtcpserver_p.h
socket/qtcpsocket.cpp socket/qtcpsocket.h socket/qtcpsocket_p.h
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 56847534b2f..3c9cae1fe8b 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -432,6 +432,7 @@
#include "qabstractsocket.h"
#include "qabstractsocket_p.h"
+#include "qabstractsocketengine_p.h"
#include "qnetworkinterface.h"
#include "private/qhostinfo_p.h"
diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h
index 3100802d4ab..5f33eddbc7b 100644
--- a/src/network/socket/qabstractsocket_p.h
+++ b/src/network/socket/qabstractsocket_p.h
@@ -22,11 +22,12 @@
#include "QtCore/qlist.h"
#include "QtCore/qtimer.h"
#include "private/qiodevice_p.h"
-#include "private/qabstractsocketengine_p.h"
+#include "private/qabstractsocketenginereceiver_p.h"
#include "qnetworkproxy.h"
QT_BEGIN_NAMESPACE
+class QAbstractSocketEngine;
class QHostInfo;
class QNetworkInterface;
diff --git a/src/network/socket/qabstractsocketengine.cpp b/src/network/socket/qabstractsocketengine.cpp
index 94c4e553123..3e7e8199507 100644
--- a/src/network/socket/qabstractsocketengine.cpp
+++ b/src/network/socket/qabstractsocketengine.cpp
@@ -11,6 +11,8 @@
QT_BEGIN_NAMESPACE
+QAbstractSocketEngineReceiver::~QAbstractSocketEngineReceiver() = default;
+
class QSocketEngineHandlerList : public QList<QSocketEngineHandler*>
{
public:
diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h
index 48ebfed71a2..9340df009a7 100644
--- a/src/network/socket/qabstractsocketengine_p.h
+++ b/src/network/socket/qabstractsocketengine_p.h
@@ -21,6 +21,7 @@
#include "QtNetwork/qhostaddress.h"
#include "QtNetwork/qabstractsocket.h"
#include <QtCore/qdeadlinetimer.h>
+#include "private/qabstractsocketenginereceiver_p.h"
#include "private/qnetworkdatagram_p.h"
#include "private/qobject_p.h"
@@ -33,19 +34,6 @@ class QNetworkInterface;
#endif
class QNetworkProxy;
-class QAbstractSocketEngineReceiver {
-public:
- virtual ~QAbstractSocketEngineReceiver(){}
- virtual void readNotification()= 0;
- virtual void writeNotification()= 0;
- virtual void closeNotification()= 0;
- virtual void exceptionNotification()= 0;
- virtual void connectionNotification()= 0;
-#ifndef QT_NO_NETWORKPROXY
- virtual void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)= 0;
-#endif
-};
-
static constexpr std::chrono::seconds DefaultTimeout{30};
class Q_AUTOTEST_EXPORT QAbstractSocketEngine : public QObject
diff --git a/src/network/socket/qabstractsocketenginereceiver_p.h b/src/network/socket/qabstractsocketenginereceiver_p.h
new file mode 100644
index 00000000000..35e88e2df4c
--- /dev/null
+++ b/src/network/socket/qabstractsocketenginereceiver_p.h
@@ -0,0 +1,44 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// Copyright (C) 2016 Intel Corporation.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// Qt-Security score:significant reason:default
+
+#ifndef QABSTRACTSOCKETENGINERECEIVER_P_H
+#define QABSTRACTSOCKETENGINERECEIVER_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
+
+
+QT_BEGIN_NAMESPACE
+
+class QAuthenticator;
+class QNetworkProxy;
+
+class Q_NETWORK_EXPORT QAbstractSocketEngineReceiver {
+public:
+ virtual ~QAbstractSocketEngineReceiver() = 0; // impl. in qabstractsocketengine.cpp
+ virtual void readNotification()= 0;
+ virtual void writeNotification()= 0;
+ virtual void closeNotification()= 0;
+ virtual void exceptionNotification()= 0;
+ virtual void connectionNotification()= 0;
+#ifndef QT_NO_NETWORKPROXY
+ virtual void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)= 0;
+#endif
+};
+
+QT_END_NAMESPACE
+
+#endif // QABSTRACTSOCKETENGINERECEIVER_P_H
diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp
index f847a73e750..0f87d9e89b4 100644
--- a/src/network/socket/qudpsocket.cpp
+++ b/src/network/socket/qudpsocket.cpp
@@ -67,6 +67,7 @@
#include "qnetworkdatagram.h"
#include "qnetworkinterface.h"
#include "qabstractsocket_p.h"
+#include "qabstractsocketengine_p.h"
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 07cffb24726..72d55c0791a 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -57,6 +57,8 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
qcocoamessagedialog.h qcocoamessagedialog.mm
DEFINES
QT_NO_FOREACH
+ PRECOMPILED_HEADER
+ $<$<COMPILE_LANGUAGE:OBJCXX>:qcocoa_plugin_pch.h>
LIBRARIES
${FWFoundation}
${FWAppKit}
diff --git a/src/plugins/platforms/cocoa/qcocoa_plugin_pch.h b/src/plugins/platforms/cocoa/qcocoa_plugin_pch.h
new file mode 100644
index 00000000000..05d4bae299f
--- /dev/null
+++ b/src/plugins/platforms/cocoa/qcocoa_plugin_pch.h
@@ -0,0 +1,16 @@
+// Copyright (C) 2025 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include <QtCore/QtCore>
+#include <QtGui/QtGui>
+
+#include <Carbon/Carbon.h>
+#include <CoreGraphics/CoreGraphics.h>
+#include <CoreVideo/CoreVideo.h>
+#include <IOKit/graphics/IOGraphicsLib.h>
+#include <IOSurface/IOSurface.h>
+#include <QuartzCore/QuartzCore.h>
+
+#import <AppKit/AppKit.h>
+#import <MetalKit/MetalKit.h>
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
diff --git a/src/printsupport/dialogs/qpagesetupwidget.ui b/src/printsupport/dialogs/qpagesetupwidget.ui
index 3f24553c76d..82fa9191f40 100644
--- a/src/printsupport/dialogs/qpagesetupwidget.ui
+++ b/src/printsupport/dialogs/qpagesetupwidget.ui
@@ -16,6 +16,26 @@
<property name="margin" >
<number>0</number>
</property>
+ <item row="0" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QComboBox" name="unitCombo"/>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
@@ -105,26 +125,6 @@
</layout>
</widget>
</item>
- <item row="0" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QComboBox" name="unitCombo"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
<item row="2" column="1" rowspan="2">
<widget class="QWidget" name="preview" native="true"/>
</item>
@@ -364,7 +364,10 @@
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Page order:</string>
+ <string>Page &amp;order:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pagesPerSheetLayoutCombo</cstring>
</property>
</widget>
</item>
@@ -374,7 +377,10 @@
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Pages per sheet:</string>
+ <string>Pages &amp;per sheet:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pagesPerSheetCombo</cstring>
</property>
</widget>
</item>
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index bdaa5fa03f5..23ace30c736 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -473,6 +473,7 @@ bool QPrintPropertiesDialog::createAdvancedOptionsWidget()
choicesCbWithLabelLayout->addWidget(warningLabel);
QLabel *optionLabel = new QLabel(toUnicode(option->text));
+ optionLabel->setBuddy(choicesCb);
groupLayout->addRow(optionLabel, choicesCbWithLabel);
anyWidgetCreated = true;
choicesCb->setProperty(ppdOptionProperty, QVariant::fromValue(option));
diff --git a/src/printsupport/dialogs/qprintsettingsoutput.ui b/src/printsupport/dialogs/qprintsettingsoutput.ui
index 360634aaa7f..787b65600f4 100644
--- a/src/printsupport/dialogs/qprintsettingsoutput.ui
+++ b/src/printsupport/dialogs/qprintsettingsoutput.ui
@@ -190,12 +190,15 @@
</property>
<item>
<widget class="QLabel" name="pageSetLabel">
- <property name="text">
- <string>Page Set:</string>
- </property>
<property name="visible">
<bool>false</bool>
</property>
+ <property name="text">
+ <string>Page &amp;Set:</string>
+ </property>
+ <property name="buddy">
+ <cstring>pageSetCombo</cstring>
+ </property>
</widget>
</item>
<item>
diff --git a/src/printsupport/widgets/qcupsjobwidget.ui b/src/printsupport/widgets/qcupsjobwidget.ui
index 7450c0629fa..6cbaf1d8ae7 100644
--- a/src/printsupport/widgets/qcupsjobwidget.ui
+++ b/src/printsupport/widgets/qcupsjobwidget.ui
@@ -18,11 +18,14 @@
<property name="title" >
<string>Job Control</string>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="jobHoldLabel" >
- <property name="text" >
- <string>Scheduled printing:</string>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="jobHoldLabel">
+ <property name="text">
+ <string>Scheduled &amp;printing:</string>
+ </property>
+ <property name="buddy">
+ <cstring>jobHoldComboBox</cstring>
</property>
</widget>
</item>
@@ -32,20 +35,26 @@
<item row="0" column="3" >
<widget class="QTimeEdit" name="jobHoldTimeEdit" />
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="jobBillingLabel" >
- <property name="text" >
- <string>Billing information:</string>
+ <item row="1" column="0">
+ <widget class="QLabel" name="jobBillingLabel">
+ <property name="text">
+ <string>&amp;Billing information:</string>
+ </property>
+ <property name="buddy">
+ <cstring>jobBillingLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1" colspan="3" >
<widget class="QLineEdit" name="jobBillingLineEdit" />
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="jobPriorityLabel" >
- <property name="text" >
- <string>Job priority:</string>
+ <item row="2" column="0">
+ <widget class="QLabel" name="jobPriorityLabel">
+ <property name="text">
+ <string>Job &amp;priority:</string>
+ </property>
+ <property name="buddy">
+ <cstring>jobPrioritySpinBox</cstring>
</property>
</widget>
</item>
@@ -81,8 +90,15 @@
<string>Banner Pages</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="1">
- <widget class="QComboBox" name="endBannerPageCombo"/>
+ <item row="0" column="0">
+ <widget class="QLabel" name="startBannerLabel">
+ <property name="text">
+ <string comment="Banner page at start">&amp;Start:</string>
+ </property>
+ <property name="buddy">
+ <cstring>startBannerPageCombo</cstring>
+ </property>
+ </widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="startBannerPageCombo"/>
@@ -90,17 +106,16 @@
<item row="1" column="0">
<widget class="QLabel" name="endBannerLabel">
<property name="text">
- <string comment="Banner page at end">End:</string>
+ <string comment="Banner page at end">&amp;End:</string>
</property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="startBannerLabel">
- <property name="text">
- <string comment="Banner page at start">Start:</string>
+ <property name="buddy">
+ <cstring>endBannerPageCombo</cstring>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="endBannerPageCombo"/>
+ </item>
</layout>
</widget>
</item>
diff --git a/src/widgets/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
index 83fb22f22e5..ff1bec803d7 100644
--- a/src/widgets/itemviews/qlistview.cpp
+++ b/src/widgets/itemviews/qlistview.cpp
@@ -1024,7 +1024,7 @@ void QListView::paintEvent(QPaintEvent *e)
else
option.rect.setHeight(qMin(maxSize, option.rect.height()));
- const bool itemIsEnabled = enabled && !index.flags().testFlag(Qt::ItemIsEnabled);
+ const bool itemIsEnabled = enabled && index.flags().testFlag(Qt::ItemIsEnabled);
option.state = state;
option.state.setFlag(QStyle::State_Selected, selections && selections->isSelected(index));
option.state.setFlag(QStyle::State_Enabled, itemIsEnabled);
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
index 312297fd603..18367aad1b6 100644
--- a/src/widgets/kernel/qboxlayout.cpp
+++ b/src/widgets/kernel/qboxlayout.cpp
@@ -934,7 +934,7 @@ void QBoxLayout::insertLayout(int index, QLayout *layout, int stretch)
If the stretch factor is 0 and nothing else in the QBoxLayout has
a stretch factor greater than zero, the space is distributed
- according to the QWidget:sizePolicy() of each widget that's
+ according to the QWidget::sizePolicy() of each widget that's
involved.
The alignment is specified by \a alignment. The default alignment
@@ -1008,7 +1008,7 @@ void QBoxLayout::addSpacerItem(QSpacerItem *spacerItem)
If the stretch factor is 0 and nothing else in the QBoxLayout has
a stretch factor greater than zero, the space is distributed
- according to the QWidget:sizePolicy() of each widget that's
+ according to the QWidget::sizePolicy() of each widget that's
involved.
The alignment is specified by \a alignment. The default