1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
From 4b7b1b765bbc337b29052a185131f9aa8b633a06 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 1 Dec 2025 11:31:42 +0100
Subject: [PATCH 22/24] Export some constexpr variables
From MINGW-packages commit e5c4652cad95df5f6435b6c564c52a7ae7d8e5f7.
Change-Id: I3c051f6f3a6de38fc2e46faaa3358e091bce7b8d
---
src/corelib/kernel/qdeadlinetimer.cpp | 2 ++
src/corelib/time/qtimezone.cpp | 3 +++
src/gui/rhi/qrhi.cpp | 3 +++
src/network/kernel/qhostaddress.cpp | 5 +++++
4 files changed, 13 insertions(+)
diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp
index 8fc4883fe8d..b2a554c50b5 100644
--- a/src/corelib/kernel/qdeadlinetimer.cpp
+++ b/src/corelib/kernel/qdeadlinetimer.cpp
@@ -7,6 +7,8 @@
QT_BEGIN_NAMESPACE
+constexpr QDeadlineTimer::ForeverConstant QDeadlineTimer::Forever;
+
QT_IMPL_METATYPE_EXTERN(QDeadlineTimer)
using namespace std::chrono;
diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp
index 78c69437a1b..e49f42f2463 100644
--- a/src/corelib/time/qtimezone.cpp
+++ b/src/corelib/time/qtimezone.cpp
@@ -17,6 +17,9 @@
QT_BEGIN_NAMESPACE
+constexpr int QTimeZone::MinUtcOffsetSecs;
+constexpr int QTimeZone::MaxUtcOffsetSecs;
+
static_assert(!std::is_constructible_v<QTimeZone, Qt::TimeSpec>);
using namespace Qt::StringLiterals;
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index 872b55f9e3b..d03a892f39a 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -25,6 +25,9 @@
QT_BEGIN_NAMESPACE
+constexpr int QRhi::MAX_MIP_LEVELS;
+constexpr int QRhiShaderResourceBinding::LAYOUT_DESC_ENTRIES_PER_BINDING;
+
// Play nice with QSG_INFO since that is still the most commonly used
// way to get graphics info printed from Qt Quick apps, and the Quick
// scenegraph is our primary user.
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 82632110d32..25ae9fb9396 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -29,6 +29,11 @@
QT_BEGIN_NAMESPACE
+constexpr QAbstractSocket::NetworkLayerProtocol QHostAddress::IPv4Protocol;
+constexpr QAbstractSocket::NetworkLayerProtocol QHostAddress::IPv6Protocol;
+constexpr QAbstractSocket::NetworkLayerProtocol QHostAddress::AnyIPProtocol;
+constexpr QAbstractSocket::NetworkLayerProtocol QHostAddress::UnknownNetworkLayerProtocol;
+
#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
const QAbstractSocket::NetworkLayerProtocol QHostAddress::IPv4Protocol;
const QAbstractSocket::NetworkLayerProtocol QHostAddress::IPv6Protocol;
--
2.54.0
|