Skip to content

Commit 29400a6

Browse files
author
Tarja Sundqvist
committed
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensource
Change-Id: Ic1bb4240ca70a8a361fa0267476707446579221d
2 parents 42e4ae0 + 9c60c8b commit 29400a6

File tree

340 files changed

+16044
-10343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+16044
-10343
lines changed

‎.qmake.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
66
QT_SOURCE_TREE = $$PWD
77
QT_BUILD_TREE = $$shadowed($$PWD)
88

9-
MODULE_VERSION = 5.15.9
9+
MODULE_VERSION = 5.15.10

‎LICENSE.QT-LICENSE-AGREEMENT

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
QT LICENSE AGREEMENT
2-
Agreement version 4.4
2+
Agreement version 4.4.1
33

44
This Qt License Agreement ("Agreement") is a legal agreement for the licensing
55
of Licensed Software (as defined below) between The Qt Company (as defined
@@ -233,7 +233,7 @@ Appendix 9 hereto.
233233
United States or a legal entity incorporated outside of the United
234234
States or having its registered office outside of the United States,
235235
The Qt Company Ltd., a Finnish company with its registered office at
236-
Bertel Jungin aukio D3A, 02600 Espoo, Finland.
236+
Miestentie 7, 02150 Espoo, Finland.
237237

238238
"Third-Party Software" shall have the meaning set forth in Section 4.
239239

@@ -1054,8 +1054,8 @@ The Agreement includes following Appendices 1-10, as applicable.
10541054
- Appendix 1: Licensed Software details
10551055
- Appendix 2: Pricing
10561056
- Appendix 3: Add-on Software details (optional)
1057-
- Appendix 4: Non-commercial and educational Licenses (optional)
1058-
- Appendix 5: Small business and startup Licenses (optional)
1057+
- Appendix 4: Small business and startup Licenses (optional)
1058+
- Appendix 5: Non-commercial and educational Licenses (optional)
10591059
- Appendix 6: License Reporting (optional)
10601060
- Appendix 7: Marketing Rights (optional)
10611061
- Appendix 8: Intentionally left blank (optional)

‎config_help.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Build options:
142142
sanitizers or generate instrumented code to collect execution
143143
counts and enable code coverage analysis, respectively. (Clang only)
144144

145-
-c++std <edition> .... Select C++ standard <edition> [c++2a/c++17/c++14/c++11]
145+
-c++std <edition> .... Select C++ standard <edition> [c++2b/c++2a/c++17/c++14/c++11]
146146
(Not supported with MSVC 2015)
147147

148148
-sse2 ................ Use SSE2 instructions [auto]

‎configure.json

+21-1
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,20 @@
380380
"qmake": "CONFIG += c++11 c++14 c++17 c++2a"
381381
}
382382
},
383+
"cxx2b": {
384+
"label": "C++2b support",
385+
"type": "compile",
386+
"test": {
387+
"head": [
388+
"#if __cplusplus > 202002L",
389+
"// Compiler claims to support experimental C++2b, trust it",
390+
"#else",
391+
"# error __cplusplus must be > 202002L (the value for C++20)",
392+
"#endif"
393+
],
394+
"qmake": "CONFIG += c++11 c++14 c++17 c++2a c++2b"
395+
}
396+
},
383397
"precompile_header": {
384398
"label": "precompiled header support",
385399
"type": "compile",
@@ -1002,6 +1016,12 @@
10021016
"condition": "features.c++17 && tests.cxx2a",
10031017
"output": [ "publicFeature", "publicQtConfig" ]
10041018
},
1019+
"c++2b": {
1020+
"label": "C++2b",
1021+
"autoDetect": false,
1022+
"condition": "features.c++2a && tests.cxx2b",
1023+
"output": [ "publicFeature", "publicQtConfig" ]
1024+
},
10051025
"c89": {
10061026
"label": "C89"
10071027
},
@@ -1554,7 +1574,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
15541574
{
15551575
"message": "Using C++ standard",
15561576
"type": "firstAvailableFeature",
1557-
"args": "c++2a c++17 c++14 c++11"
1577+
"args": "c++2b c++2a c++17 c++14 c++11"
15581578
},
15591579
{
15601580
"type": "feature",

‎configure.pri

+9
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,27 @@ defineTest(qtConfCommandline_cxxstd) {
2222
qtConfCommandlineSetInput("c++14", "no")
2323
qtConfCommandlineSetInput("c++1z", "no")
2424
qtConfCommandlineSetInput("c++2a", "no")
25+
qtConfCommandlineSetInput("c++2b", "no")
2526
} else: contains(val, "(c\+\+)?(14|1y)") {
2627
qtConfCommandlineSetInput("c++14", "yes")
2728
qtConfCommandlineSetInput("c++1z", "no")
2829
qtConfCommandlineSetInput("c++2a", "no")
30+
qtConfCommandlineSetInput("c++2b", "no")
2931
} else: contains(val, "(c\+\+)?(17|1z)") {
3032
qtConfCommandlineSetInput("c++14", "yes")
3133
qtConfCommandlineSetInput("c++1z", "yes")
3234
qtConfCommandlineSetInput("c++2a", "no")
35+
qtConfCommandlineSetInput("c++2b", "no")
3336
} else: contains(val, "(c\+\+)?(2a)") {
3437
qtConfCommandlineSetInput("c++14", "yes")
3538
qtConfCommandlineSetInput("c++1z", "yes")
3639
qtConfCommandlineSetInput("c++2a", "yes")
40+
qtConfCommandlineSetInput("c++2b", "no")
41+
} else: contains(val, "(c\+\+)?(2b)") {
42+
qtConfCommandlineSetInput("c++14", "yes")
43+
qtConfCommandlineSetInput("c++1z", "yes")
44+
qtConfCommandlineSetInput("c++2a", "yes")
45+
qtConfCommandlineSetInput("c++2b", "yes")
3746
} else {
3847
qtConfAddError("Invalid argument $$val to command line parameter $$arg")
3948
}

‎doc/global/template/style/offline.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Top navigation
145145
display: block;
146146
position: relative;
147147
text-align: right;
148-
top: -47px;
148+
top: -30px;
149149
float: right;
150150
height: 20px;
151151
z-index: 1;

‎examples/widgets/graphicsview/chip/view.cpp

+14-4
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ void GraphicsView::wheelEvent(QWheelEvent *e)
6969
{
7070
if (e->modifiers() & Qt::ControlModifier) {
7171
if (e->angleDelta().y() > 0)
72-
view->zoomIn(6);
72+
view->zoomInBy(6);
7373
else
74-
view->zoomOut(6);
74+
view->zoomOutBy(6);
7575
e->accept();
7676
} else {
7777
QGraphicsView::wheelEvent(e);
@@ -274,12 +274,22 @@ void View::print()
274274
#endif
275275
}
276276

277-
void View::zoomIn(int level)
277+
void View::zoomIn()
278+
{
279+
zoomSlider->setValue(zoomSlider->value() + 1);
280+
}
281+
282+
void View::zoomOut()
283+
{
284+
zoomSlider->setValue(zoomSlider->value() - 1);
285+
}
286+
287+
void View::zoomInBy(int level)
278288
{
279289
zoomSlider->setValue(zoomSlider->value() + level);
280290
}
281291

282-
void View::zoomOut(int level)
292+
void View::zoomOutBy(int level)
283293
{
284294
zoomSlider->setValue(zoomSlider->value() - level);
285295
}

‎examples/widgets/graphicsview/chip/view.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ class View : public QFrame
8686
QGraphicsView *view() const;
8787

8888
public slots:
89-
void zoomIn(int level = 1);
90-
void zoomOut(int level = 1);
89+
void zoomIn();
90+
void zoomOut();
91+
void zoomInBy(int level);
92+
void zoomOutBy(int level);
9193

9294
private slots:
9395
void resetView();

‎examples/widgets/widgets/windowflags/previewwindow.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ void PreviewWindow::setWindowFlags(Qt::WindowFlags flags)
124124
text += "\n| Qt::WindowShadeButtonHint";
125125
if (flags & Qt::WindowStaysOnTopHint)
126126
text += "\n| Qt::WindowStaysOnTopHint";
127+
if (flags & Qt::WindowStaysOnBottomHint)
128+
text += "\n| Qt::WindowStaysOnBottomHint";
127129
if (flags & Qt::CustomizeWindowHint)
128130
text += "\n| Qt::CustomizeWindowHint";
129131

‎mkspecs/common/clang.conf

+2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ QMAKE_CXXFLAGS_CXX11 = -std=c++11
3535
QMAKE_CXXFLAGS_CXX14 = -std=c++1y
3636
QMAKE_CXXFLAGS_CXX1Z = -std=c++1z
3737
QMAKE_CXXFLAGS_CXX2A = -std=c++2a
38+
QMAKE_CXXFLAGS_CXX2B = -std=c++2b
3839
QMAKE_CXXFLAGS_GNUCXX11 = -std=gnu++11
3940
QMAKE_CXXFLAGS_GNUCXX14 = -std=gnu++1y
4041
QMAKE_CXXFLAGS_GNUCXX1Z = -std=gnu++1z
4142
QMAKE_CXXFLAGS_GNUCXX2A = -std=gnu++2a
43+
QMAKE_CXXFLAGS_GNUCXX2B = -std=gnu++2b
4244

4345
QMAKE_LFLAGS_CXX11 =
4446
QMAKE_LFLAGS_CXX14 =

‎mkspecs/common/g++-base.conf

+2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ QMAKE_CXXFLAGS_CXX11 = -std=c++11
3333
QMAKE_CXXFLAGS_CXX14 = -std=c++1y
3434
QMAKE_CXXFLAGS_CXX1Z = -std=c++1z
3535
QMAKE_CXXFLAGS_CXX2A = -std=c++2a
36+
QMAKE_CXXFLAGS_CXX2B = -std=c++2b
3637
QMAKE_CXXFLAGS_GNUCXX11 = -std=gnu++11
3738
QMAKE_CXXFLAGS_GNUCXX14 = -std=gnu++1y
3839
QMAKE_CXXFLAGS_GNUCXX1Z = -std=gnu++1z
3940
QMAKE_CXXFLAGS_GNUCXX2A = -std=gnu++2a
41+
QMAKE_CXXFLAGS_GNUCXX2B = -std=gnu++2b
4042
QMAKE_LFLAGS_CXX11 =
4143
QMAKE_LFLAGS_CXX14 =
4244
QMAKE_LFLAGS_CXX1Z =

‎mkspecs/common/ghs-base.conf

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
2929
QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
3030
QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
3131
QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS
32+
QMAKE_CFLAGS_C99 = -std=c99
3233
QMAKE_CXXFLAGS_CXX11 += --c++11 --thread_local_storage
3334
QMAKE_CXXFLAGS_EXCEPTIONS_ON += --exceptions
3435

‎mkspecs/common/msvc-version.conf

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ greaterThan(QMAKE_MSC_VER, 1919) {
118118
# Visual Studio 2019 (16.0) / Visual C++ 19.20 and up
119119
MSVC_VER = 16.0
120120
QMAKE_CXXFLAGS_CXX2A = -std:c++latest
121+
QMAKE_CXXFLAGS_CXX2B = -std:c++latest
121122

122123
}
123124

‎mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ string(CONCAT _plugin_genex
8787
# Add this plugin if all of the following are true:
8888
# 1) the list of explicitly included plugin types is empty
8989
# 2) the QT_PLUGIN_EXTENDS property for the plugin is empty or equal to one of the modules
90-
# listed in the plugin's PLUGIN_EXTEND qmake variable
90+
# listed in the plugin\'s PLUGIN_EXTEND qmake variable
9191
# 3) the user hasn\'t explicitly excluded the plugin.
9292
# TODO: Note that the current implementation of (2) is not entirely correct QTBUG-93501
9393
\"$<AND:\"

0 commit comments

Comments
 (0)