Skip to content

Commit 61e7a17

Browse files
tim-dlangtim-dlang
committed
Update to Qt 6.4.2
1 parent 597b11a commit 61e7a17

File tree

6 files changed

+83
-65
lines changed

6 files changed

+83
-65
lines changed

‎build.d

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -508,21 +508,21 @@ int main(string[] args)
508508
super("qt6");
509509
dependencies = ["common"];
510510
baseArchives = [
511-
"6.3.2-0-202209071847qtbase-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z",
512-
"6.3.2-0-202209071847qtdeclarative-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z",
511+
"6.4.2-0-202212131055qtbase-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z",
512+
"6.4.2-0-202212131055qtdeclarative-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z",
513513
];
514-
webengineArchive = "6.3.2-0-202209071847qtwebengine-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z";
514+
webengineArchive = "6.4.2-0-202212131055qtwebengine-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z";
515515
docArchives = [
516-
"qt.qt6.632.doc/6.3.2-0-202209071926qtcore-documentation.7z",
517-
"qt.qt6.632.doc/6.3.2-0-202209071926qtgui-documentation.7z",
518-
"qt.qt6.632.doc/6.3.2-0-202209071926qtwidgets-documentation.7z",
519-
"qt.qt6.632.doc/6.3.2-0-202209071926qtnetwork-documentation.7z",
520-
"qt.qt6.632.doc/6.3.2-0-202209071926qtqml-documentation.7z",
521-
"qt.qt6.632.doc/6.3.2-0-202209071926qtquick-documentation.7z",
522-
"qt.qt6.632.doc/6.3.2-0-202209071926qtquickcontrols-documentation.7z",
523-
"qt.qt6.632.doc.qtwebengine/6.3.2-0-202209071926qtwebengine-documentation.7z",
516+
"qt.qt6.642.doc/6.4.2-0-202212131055qtcore-documentation.7z",
517+
"qt.qt6.642.doc/6.4.2-0-202212131055qtgui-documentation.7z",
518+
"qt.qt6.642.doc/6.4.2-0-202212131055qtwidgets-documentation.7z",
519+
"qt.qt6.642.doc/6.4.2-0-202212131055qtnetwork-documentation.7z",
520+
"qt.qt6.642.doc/6.4.2-0-202212131055qtqml-documentation.7z",
521+
"qt.qt6.642.doc/6.4.2-0-202212131055qtquick-documentation.7z",
522+
"qt.qt6.642.doc/6.4.2-0-202212131055qtquickcontrols-documentation.7z",
523+
"qt.qt6.642.doc.qtwebengine/6.4.2-0-202212131055qtwebengine-documentation.7z",
524524
];
525-
archiveExtracted = "6.3.2";
525+
archiveExtracted = "6.4.2";
526526
sourceFiles = ["qt6/allincludes.cpp"];
527527
converterArgs = [
528528
"--output-config", "qt6/output-config.json",
@@ -549,12 +549,12 @@ int main(string[] args)
549549
override void download()
550550
{
551551
foreach (a; baseArchives)
552-
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632/qt.qt6.632.gcc_64/" ~ a, projectDir ~ "/" ~ a, verbose);
552+
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_642/qt.qt6.642.gcc_64/" ~ a, projectDir ~ "/" ~ a, verbose);
553553

554-
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632/qt.qt6.632.addons.qtwebengine.gcc_64/" ~ webengineArchive, projectDir ~ "/" ~ webengineArchive, verbose);
554+
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_642/qt.qt6.642.addons.qtwebengine.gcc_64/" ~ webengineArchive, projectDir ~ "/" ~ webengineArchive, verbose);
555555

556556
foreach (a; docArchives)
557-
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632_src_doc_examples/" ~ a, projectDir ~ "/" ~ baseName(a), verbose);
557+
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_642_src_doc_examples/" ~ a, projectDir ~ "/" ~ baseName(a), verbose);
558558
}
559559

560560
override void prepare()

‎projects/qt6/allincludes.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
//#include <QtCore/q20algorithm.h>
66
//#include <QtCore/q20functional.h>
77
//#include <QtCore/q20iterator.h>
8+
//#include <QtCore/q23functional.h>
89
//#include <QtCore/qabstractanimation.h>
910
//#include <QtCore/qabstracteventdispatcher.h>
1011
#include <QtCore/qabstractitemmodel.h>
@@ -75,6 +76,7 @@
7576
//#include <QtCore/qfilesystemwatcher.h>
7677
#include <QtCore/qflags.h>
7778
#include <QtCore/qfloat16.h>
79+
//#include <QtCore/qforeach.h>
7880
//#include <QtCore/qfunctions_vxworks.h>
7981
//#include <QtCore/qfuture.h>
8082
//#include <QtCore/qfutureinterface.h>
@@ -93,6 +95,7 @@
9395
#include <QtCore/qiterator.h>
9496
//#include <QtCore/qjnienvironment.h>
9597
//#include <QtCore/qjniobject.h>
98+
#include <QtCore/qjnitypes.h>
9699
//#include <QtCore/qjsonarray.h>
97100
//#include <QtCore/qjsondocument.h>
98101
//#include <QtCore/qjsonobject.h>
@@ -168,6 +171,8 @@
168171
#include <QtCore/qstringalgorithms.h>
169172
#include <QtCore/qstringbuilder.h>
170173
#include <QtCore/qstringconverter.h>
174+
//#include <QtCore/qstringconverter_base.h>
175+
//#include <QtCore/qstringfwd.h>
171176
#include <QtCore/qstringlist.h>
172177
#include <QtCore/qstringlistmodel.h>
173178
#include <QtCore/qstringliteral.h>
@@ -178,6 +183,7 @@
178183
//#include <QtCore/qsystemdetection.h>
179184
//#include <QtCore/qsystemsemaphore.h>
180185
#include <QtCore/qtaggedpointer.h>
186+
//#include <QtCore/qtconfigmacros.h>
181187
//#include <QtCore/qtcoreexports.h>
182188
//#include <QtCore/qtcoreversion.h>
183189
//#include <QtCore/qtcore-config.h>
@@ -218,6 +224,7 @@
218224
//#include <QtGui/qaccessiblebridge.h>
219225
//#include <QtGui/qaccessibleobject.h>
220226
//#include <QtGui/qaccessibleplugin.h>
227+
//#include <QtGui/qaccessible_base.h>
221228
#include <QtGui/qaction.h>
222229
#include <QtGui/qactiongroup.h>
223230
//#include <QtGui/qbackingstore.h>
@@ -493,6 +500,7 @@
493500
#include <QtNetwork/qsslerror.h>
494501
#include <QtNetwork/qsslkey.h>
495502
#include <QtNetwork/qsslpresharedkeyauthenticator.h>
503+
//#include <QtNetwork/qsslserver.h>
496504
#include <QtNetwork/qsslsocket.h>
497505
//#include <QtNetwork/qtcpserver.h>
498506
#include <QtNetwork/qtcpsocket.h>
@@ -512,6 +520,7 @@
512520
#include <QtWebEngineCore/qwebenginecontextmenurequest.h>
513521
#include <QtWebEngineCore/qwebenginecookiestore.h>
514522
#include <QtWebEngineCore/qwebenginedownloadrequest.h>
523+
#include <QtWebEngineCore/qwebenginefilesystemaccessrequest.h>
515524
#include <QtWebEngineCore/qwebenginefindtextresult.h>
516525
#include <QtWebEngineCore/qwebenginefullscreenrequest.h>
517526
#include <QtWebEngineCore/qwebenginehistory.h>
@@ -550,7 +559,7 @@
550559
#include <QtQml/qqmlapplicationengine.h>
551560
#include <QtQml/qqmlcomponent.h>
552561
#include <QtQml/qqmlcontext.h>
553-
#include <QtQml/qqmldebug.h>
562+
//#include <QtQml/qqmldebug.h>
554563
#include <QtQml/qqmlengine.h>
555564
#include <QtQml/qqmlerror.h>
556565
//#include <QtQml/qqmlexpression.h>

‎projects/qt6/output-config.json

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
{"match": {"name": ["MSG", "tagMSG"]}, "moduleName": "qt.core.coreapplication"},
5555
{"match": {"name": "QTranslator"}, "moduleName": "qt.core.translator"},
5656
{"match": {"name": ["Q_ASSERT", "Q_ASSERT_X", "Q_STATIC_ASSERT", "Q_STATIC_ASSERT_X"]}, "moduleName": "qt.core.global"},
57+
{"match": {"name": "QLatin1StringView"}, "moduleName": "qt.core.string"},
58+
{"match": {"name": ".*QUtf8StringView"}, "moduleName": "qt.core.utf8stringview"},
5759

5860
{"match": {"name": "ulong"}, "moduleName": "core.stdc.config"},
5961
],
@@ -532,44 +534,8 @@
532534
{
533535
"module": "qt.*",
534536
"expectedLines": [
535-
"/****************************************************************************",
536-
"**",
537-
{"regex": "(\\*\\* Copyright \\(C\\)[^\n]*\n)+"},
538-
{"regex": "\\*\\* Contact: [^\n]*\n"},
539-
"**",
540-
{"regex": "\\*\\* This file is part of[^\n]*\n"},
541-
"**",
542-
"** $QT_BEGIN_LICENSE:LGPL$",
543-
"** Commercial License Usage",
544-
"** Licensees holding valid commercial Qt licenses may use this file in",
545-
"** accordance with the commercial license agreement provided with the",
546-
"** Software or, alternatively, in accordance with the terms contained in",
547-
"** a written agreement between you and The Qt Company. For licensing terms",
548-
"** and conditions see https://www.qt.io/terms-conditions. For further",
549-
"** information use the contact form at https://www.qt.io/contact-us.",
550-
"**",
551-
"** GNU Lesser General Public License Usage",
552-
"** Alternatively, this file may be used under the terms of the GNU Lesser",
553-
"** General Public License version 3 as published by the Free Software",
554-
"** Foundation and appearing in the file LICENSE.LGPL3 included in the",
555-
"** packaging of this file. Please review the following information to",
556-
"** ensure the GNU Lesser General Public License version 3 requirements",
557-
"** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.",
558-
"**",
559-
"** GNU General Public License Usage",
560-
"** Alternatively, this file may be used under the terms of the GNU",
561-
"** General Public License version 2.0 or (at your option) the GNU General",
562-
"** Public license version 3 or any later version approved by the KDE Free",
563-
"** Qt Foundation. The licenses are as published by the Free Software",
564-
"** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3",
565-
"** included in the packaging of this file. Please review the following",
566-
"** information to ensure the GNU General Public License requirements will",
567-
"** be met: https://www.gnu.org/licenses/gpl-2.0.html and",
568-
"** https://www.gnu.org/licenses/gpl-3.0.html.",
569-
"**",
570-
"** $QT_END_LICENSE$",
571-
"**",
572-
"****************************************************************************/",
537+
{"regex": "(// Copyright \\(C\\)[^\n]*\n)+"},
538+
"// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only",
573539
],
574540
"lines": [
575541
"/*",

‎projects/qt6/prefixinclude.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,3 +233,5 @@ template<int> struct QIntegerForSize
233233
#undef QT_QMLDEVTOOLS_LIB
234234
#undef QT_QML_BOOTSTRAPPED
235235
#undef QQMLLISTPROPERTY
236+
237+
#undef Q_L1S_VIEW_IS_PRIMARY

‎src/cppconv/configreader.d

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ struct ConfigRegex
2828
Regex!char regex;
2929
bool empty = true;
3030
bool isSimple;
31+
bool allowPrefix;
3132

32-
this(string pattern, const(char)[] flags = [])
33+
this(string pattern, const(char)[] flags = [], bool allowPrefix = false)
3334
{
3435
empty = false;
3536
this.pattern = pattern;
37+
this.allowPrefix = allowPrefix;
3638

3739
isSimple = true;
3840
foreach (dchar c; pattern)
@@ -44,33 +46,62 @@ struct ConfigRegex
4446
isSimple = false;
4547

4648
if (!isSimple)
47-
this.regex = std.regex.regex("^(?:" ~ pattern ~ ")$", flags);
49+
this.regex = std.regex.regex("^(?:" ~ pattern ~ ")" ~ (allowPrefix ? "" : "$"), flags);
4850
}
4951

5052
auto namedCaptures()
5153
{
5254
return regex.namedCaptures;
5355
}
5456

55-
bool match(string s, ref Captures!string captures) const
57+
bool match(string s, ref Captures!string captures, ref string post) const
5658
{
5759
if (isSimple)
5860
{
61+
if (allowPrefix)
62+
{
63+
if (s.startsWith(pattern))
64+
{
65+
post = s[pattern.length .. $];
66+
return true;
67+
}
68+
else
69+
return false;
70+
}
5971
return s == pattern;
6072
}
6173
else if (!regex.empty)
6274
{
6375
captures = matchFirst(s, regex);
64-
return !captures.empty;
76+
if (!captures.empty)
77+
{
78+
post = captures.post;
79+
return true;
80+
}
81+
else
82+
return false;
6583
}
6684
else
6785
return false;
6886
}
6987

88+
bool match(string s, ref Captures!string captures) const
89+
{
90+
string post;
91+
return match(s, captures, post);
92+
}
93+
94+
bool match(string s, ref string post) const
95+
{
96+
Captures!string captures;
97+
return match(s, captures, post);
98+
}
99+
70100
bool match(string s) const
71101
{
72102
Captures!string captures;
73-
return match(s, captures);
103+
string post;
104+
return match(s, captures, post);
74105
}
75106
}
76107

@@ -81,7 +112,7 @@ struct ConfigRegexMultiline
81112

82113
this(string pattern)
83114
{
84-
regex = ConfigRegex(pattern, "s");
115+
regex = ConfigRegex(pattern, "s", true);
85116
}
86117
}
87118

‎src/cppconv/dwriter.d

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6563,7 +6563,7 @@ void declarationToDCode(ref CodeWriter code, DWriterData data, Declaration d, im
65636563
}
65646564
else if (declarationExtra2.defaultInit.entries.length)
65656565
{
6566-
enforce(declarationExtra2.defaultInit.entries.length == 1);
6566+
enforce(declarationExtra2.defaultInit.entries.length == 1, text(locationStr(d.tree.location)));
65676567
auto e = declarationExtra2.defaultInit.entries[0];
65686568
enforce(semantic.logicSystem.and(condition2, e.condition.negated)
65696569
.isFalse, text(d.name, " ", locationStr(d.location),
@@ -9610,16 +9610,26 @@ void writeDCode(File outfile, FileCache fileCache, DWriterData data,
96109610
{
96119611
if (fileHeaderReplacement.module_.match(data.currentFilename.moduleName))
96129612
{
9613-
if (!fileHeaderReplacement.expectedLines.match(tokens[0].token.content.replace("\r",
9614-
"")))
9613+
string combinedComments;
9614+
foreach (i, t; tokens)
9615+
{
9616+
if (!t.token.isToken || !t.isWhitespace)
9617+
break;
9618+
combinedComments ~= t.token.content;
9619+
commentPrefix = i + 1;
9620+
}
9621+
9622+
string post;
9623+
if (!fileHeaderReplacement.expectedLines.match(combinedComments.replace("\r", ""), post))
96159624
{
96169625
writeln("File ", data.currentFilename.moduleName,
9617-
" starts with unexpected comment:\n", tokens[0].token.content);
9626+
" starts with unexpected comment:\n", combinedComments);
9627+
commentPrefix = 0;
96189628
break;
96199629
}
96209630
foreach (i, line; fileHeaderReplacement.lines)
96219631
code.write(line, i + 1 < fileHeaderReplacement.lines.length ? "\n" : "");
9622-
commentPrefix = 1;
9632+
code.write(post);
96239633
break;
96249634
}
96259635
}

0 commit comments

Comments
 (0)