Skip to content

Commit c9c3d5c

Browse files
tim-dlangtim-dlang
committed
Generate bindings for Qt 6.3.2
1 parent 4085167 commit c9c3d5c

File tree

3 files changed

+31
-68
lines changed

3 files changed

+31
-68
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.2.3-0-202201260729qtbase-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z",
512-
"6.2.3-0-202201260729qtdeclarative-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z",
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",
513513
];
514-
webengineArchive = "6.2.3-0-202201260729qtwebengine-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z";
514+
webengineArchive = "6.3.2-0-202209071847qtwebengine-Linux-RHEL_8_4-GCC-Linux-RHEL_8_4-X86_64.7z";
515515
docArchives = [
516-
"qt.qt6.623.doc/6.2.3-0-202201260755qtcore-documentation.7z",
517-
"qt.qt6.623.doc/6.2.3-0-202201260755qtgui-documentation.7z",
518-
"qt.qt6.623.doc/6.2.3-0-202201260755qtwidgets-documentation.7z",
519-
"qt.qt6.623.doc/6.2.3-0-202201260755qtnetwork-documentation.7z",
520-
"qt.qt6.623.doc/6.2.3-0-202201260755qtqml-documentation.7z",
521-
"qt.qt6.623.doc/6.2.3-0-202201260755qtquick-documentation.7z",
522-
"qt.qt6.623.doc/6.2.3-0-202201260755qtquickcontrols-documentation.7z",
523-
"qt.qt6.623.doc.qtwebengine/6.2.3-0-202201260755qtwebengine-documentation.7z",
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",
524524
];
525-
archiveExtracted = "6.2.3";
525+
archiveExtracted = "6.3.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_623/qt.qt6.623.gcc_64/" ~ a, projectDir ~ "/" ~ a, verbose);
552+
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632/qt.qt6.632.gcc_64/" ~ a, projectDir ~ "/" ~ a, verbose);
553553

554-
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_623/qt.qt6.623.addons.qtwebengine.gcc_64/" ~ webengineArchive, projectDir ~ "/" ~ webengineArchive, verbose);
554+
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632/qt.qt6.632.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_623_src_doc_examples/" ~ a, projectDir ~ "/" ~ baseName(a), verbose);
557+
downloadFile("https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_632_src_doc_examples/" ~ a, projectDir ~ "/" ~ baseName(a), verbose);
558558
}
559559

560560
override void prepare()

‎projects/qt6/allincludes.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#include <mutex>
33

44
// QtCore
5+
//#include <QtCore/q20algorithm.h>
6+
//#include <QtCore/q20functional.h>
7+
//#include <QtCore/q20iterator.h>
58
//#include <QtCore/qabstractanimation.h>
69
//#include <QtCore/qabstracteventdispatcher.h>
710
#include <QtCore/qabstractitemmodel.h>
@@ -10,6 +13,7 @@
1013
#include <QtCore/qalgorithms.h>
1114
//#include <QtCore/qanimationgroup.h>
1215
#include <QtCore/qanystringview.h>
16+
//#include <QtCore/qapplicationstatic.h>
1317
#include <QtCore/qarraydata.h>
1418
//#include <QtCore/qarraydataops.h>
1519
//#include <QtCore/qarraydatapointer.h>
@@ -174,6 +178,7 @@
174178
//#include <QtCore/qsystemdetection.h>
175179
//#include <QtCore/qsystemsemaphore.h>
176180
#include <QtCore/qtaggedpointer.h>
181+
//#include <QtCore/qtcoreexports.h>
177182
//#include <QtCore/qtcoreversion.h>
178183
//#include <QtCore/qtcore-config.h>
179184
//#include <QtCore/qtemporarydir.h>
@@ -304,6 +309,7 @@
304309
#include <QtGui/qtextobject.h>
305310
#include <QtGui/qtextoption.h>
306311
#include <QtGui/qtexttable.h>
312+
//#include <QtGui/qtguiexports.h>
307313
#include <QtGui/qtguiglobal.h>
308314
//#include <QtGui/qtguiversion.h>
309315
//#include <QtGui/qtgui-config.h>
@@ -438,6 +444,7 @@
438444
#include <QtWidgets/qtreeview.h>
439445
#include <QtWidgets/qtreewidget.h>
440446
#include <QtWidgets/qtreewidgetitemiterator.h>
447+
//#include <QtWidgets/qtwidgetsexports.h>
441448
#include <QtWidgets/qtwidgetsglobal.h>
442449
//#include <QtWidgets/qtwidgetsversion.h>
443450
//#include <QtWidgets/qtwidgets-config.h>
@@ -489,6 +496,7 @@
489496
#include <QtNetwork/qsslsocket.h>
490497
//#include <QtNetwork/qtcpserver.h>
491498
#include <QtNetwork/qtcpsocket.h>
499+
//#include <QtNetwork/qtnetworkexports.h>
492500
#include <QtNetwork/qtnetworkglobal.h>
493501
//#include <QtNetwork/qtnetworkversion.h>
494502
//#include <QtNetwork/qtnetwork-config.h>
@@ -562,6 +570,7 @@
562570
#include <QtQml/qqmlregistration.h>
563571
//#include <QtQml/qqmlscriptstring.h>
564572
//#include <QtQml/qtqmlcompilerglobal.h>
573+
//#include <QtQml/qtqmlexports.h>
565574
//#include <QtQml/qtqmlglobal.h>
566575
//#include <QtQml/qtqmlversion.h>
567576
//#include <QtQml/qtqml-config.h>
@@ -598,12 +607,14 @@
598607
//#include <QtQuick/qsgtextureprovider.h>
599608
//#include <QtQuick/qsgtexture_platform.h>
600609
//#include <QtQuick/qsgvertexcolormaterial.h>
610+
//#include <QtQuick/qtquickexports.h>
601611
//#include <QtQuick/qtquickglobal.h>
602612
//#include <QtQuick/qtquickversion.h>
603613
//#include <QtQuick/qtquick-config.h>
604614

605615
// QtQuickControls2
606616
#include <QtQuickControls2/qquickstyle.h>
617+
//#include <QtQuickControls2/qtquickcontrols2exports.h>
607618
//#include <QtQuickControls2/qtquickcontrols2global.h>
608619
//#include <QtQuickControls2/qtquickcontrols2version.h>
609620
//#include <QtQuickControls2/qtquickcontrols2-config.h>

‎projects/qt6/output-config.json

Lines changed: 5 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666

6767
{"match": "QImage", "kind": "struct"},
6868
{"match": "QPixmap", "kind": "struct"},
69+
{"match": "QBitmap", "kind": "struct"},
6970
{"match": "QTextStream", "kind": "struct"},
7071
{"match": "QPicture", "kind": "struct"},
7172
{"match": "QtPrivate::ResultStoreBase", "kind": "struct"},
@@ -253,6 +254,7 @@
253254
"qobject_interface_iid",
254255
"qOverload",
255256
"QOverload",
257+
"qmlRegisterNamespaceAndRevisions",
256258
"qPointerFromVariant",
257259
"QQmlEngine::networkAccessManager",
258260
"QQmlEngine::networkAccessManagerFactory",
@@ -263,6 +265,7 @@
263265
"QQuickItem::transform",
264266
"QRecursiveMutex",
265267
"qregisterint",
268+
"qRegisterNormalizedMetaType.*",
266269
"qregisteruint",
267270
"QScopedArrayPointer::if_same_type",
268271
"QScopedPointerArrayDeleter",
@@ -290,6 +293,8 @@
290293
"QThread::currentThreadId",
291294
"qt_incomplete_metaTypeArray",
292295
"qt_metaTypeArray",
296+
"QtFuture::.*whenAll",
297+
"QtFuture::.*whenAny",
293298
"QtMetaTypePrivate::QPairVariantInterfaceConvertFunctor",
294299
"QtMetaTypePrivate::QPairVariantInterfaceImpl",
295300
"Qt::NSizeHints",
@@ -579,59 +584,6 @@
579584
" * will be met: https://www.gnu.org/licenses/lgpl-3.0.html.",
580585
" */",
581586
]
582-
},
583-
{
584-
"module": "qt.quickcontrols2.*",
585-
"expectedLines": [
586-
"/****************************************************************************",
587-
"**",
588-
{"regex": "(\\*\\* Copyright \\(C\\)[^\n]*\n)+"},
589-
{"regex": "\\*\\* Contact: [^\n]*\n"},
590-
"**",
591-
{"regex": "\\*\\* This file is part of[^\n]*\n"},
592-
"**",
593-
"** $QT_BEGIN_LICENSE:LGPL3$",
594-
"** Commercial License Usage",
595-
"** Licensees holding valid commercial Qt licenses may use this file in",
596-
"** accordance with the commercial license agreement provided with the",
597-
"** Software or, alternatively, in accordance with the terms contained in",
598-
"** a written agreement between you and The Qt Company. For licensing terms",
599-
"** and conditions see http://www.qt.io/terms-conditions. For further",
600-
"** information use the contact form at http://www.qt.io/contact-us.",
601-
"**",
602-
"** GNU Lesser General Public License Usage",
603-
"** Alternatively, this file may be used under the terms of the GNU Lesser",
604-
"** General Public License version 3 as published by the Free Software",
605-
"** Foundation and appearing in the file LICENSE.LGPLv3 included in the",
606-
"** packaging of this file. Please review the following information to",
607-
"** ensure the GNU Lesser General Public License version 3 requirements",
608-
"** will be met: https://www.gnu.org/licenses/lgpl.html.",
609-
"**",
610-
"** GNU General Public License Usage",
611-
"** Alternatively, this file may be used under the terms of the GNU",
612-
"** General Public License version 2.0 or later as published by the Free",
613-
"** Software Foundation and appearing in the file LICENSE.GPL included in",
614-
"** the packaging of this file. Please review the following information to",
615-
"** ensure the GNU General Public License version 2.0 requirements will be",
616-
"** met: http://www.gnu.org/licenses/gpl-2.0.html.",
617-
"**",
618-
"** $QT_END_LICENSE$",
619-
"**",
620-
"****************************************************************************/",
621-
],
622-
"lines": [
623-
"/*",
624-
" * DQt - D bindings for the Qt Toolkit",
625-
" *",
626-
" * GNU Lesser General Public License Usage",
627-
" * This file may be used under the terms of the GNU Lesser",
628-
" * General Public License version 3 as published by the Free Software",
629-
" * Foundation and appearing in the file LICENSE.LGPL3 included in the",
630-
" * packaging of this file. Please review the following information to",
631-
" * ensure the GNU Lesser General Public License version 3 requirements",
632-
" * will be met: https://www.gnu.org/licenses/lgpl-3.0.html.",
633-
" */",
634-
]
635587
}
636588
]
637589
}

0 commit comments

Comments
 (0)