-
-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #830 from QuasarApp/qt6.8
Qt6.8
- Loading branch information
Showing
12 changed files
with
262 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule zip
updated
20 files
| +3 −16 | .github/workflows/build.yml | |
| +3 −3 | CMakeLists.txt | |
| +3 −5 | Doxyfile.in | |
| +19 −0 | LICENSE.txt | |
| +251 −36 | README.md | |
| +0 −26 | UNLICENSE | |
| +1 −1 | cmake/sanitize-helpers.cmake | |
| +428 −372 | src/miniz.h | |
| +521 −142 | src/zip.c | |
| +156 −3 | src/zip.h | |
| +30 −0 | test/CMakeLists.txt | |
| +12 −2 | test/test_append.c | |
| +152 −7 | test/test_entry.c | |
| +56 −10 | test/test_extract.c | |
| +98 −0 | test/test_offset.c | |
| +90 −0 | test/test_open.c | |
| +30 −9 | test/test_permissions.c | |
| +53 −3 | test/test_read.c | |
| +98 −0 | test/test_static.c | |
| +33 −4 | test/test_write.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| /* | ||
| * Copyright (C) 2023-2024 QuasarApp. | ||
| * Distributed under the lgplv3 software license, see the accompanying | ||
| * Everyone is permitted to copy and distribute verbatim copies | ||
| * of this license document, but changing it is not allowed. | ||
| */ | ||
|
|
||
|
|
||
| #include "modulesqt6_8.h" | ||
|
|
||
| ModulesQt6_8::ModulesQt6_8() {} | ||
|
|
||
| QSet<QString> ModulesQt6_8::qmlLibs(const QString &distDir) const { | ||
| TestUtils utils; | ||
| auto Tree = ModulesQt6_6::qmlLibs(distDir); | ||
|
|
||
| #ifdef Q_OS_LINUX | ||
| Tree -= utils.createTree( | ||
| { | ||
| "./" + distDir + "/qml/QtQml/Base/libqmlplugin.so" , | ||
| "./" + distDir + "/qml/QtQml/Base/plugins.qmltypes" , | ||
| "./" + distDir + "/qml/QtQml/Base/qmldir", | ||
| "./" + distDir + "/qml/QtQml/libqmlmetaplugin.so", | ||
| "./" + distDir + "/qml/QtQuick/Controls/Imagine/impl/qtquickcontrols2imaginestyleimplplugin.qmltypes" , | ||
| } | ||
| ); | ||
|
|
||
| Tree += utils.createTree( | ||
| { | ||
| "./" + distDir + "//lib/libQt6Network.so", | ||
| "./" + distDir + "//lib/libQt6QmlMeta.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2Basic.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2BasicStyleImpl.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2FluentWinUI3StyleImpl.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2Fusion.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2FusionStyleImpl.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2Imagine.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2ImagineStyleImpl.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2Material.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2MaterialStyleImpl.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2Universal.so", | ||
| "./" + distDir + "//lib/libQt6QuickControls2UniversalStyleImpl.so", | ||
| "./" + distDir + "//lib/libQt6QuickEffects.so", | ||
| "./" + distDir + "//lib/libQt6QuickLayouts.so", | ||
| "./" + distDir + "//qml/QML/plugins.qmltypes", | ||
| "./" + distDir + "//qml/QML/qmldir", | ||
| "./" + distDir + "//qml/QtQml/libqmlplugin.so", | ||
| "./" + distDir + "//qml/QtQml/plugins.qmltypes", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ApplicationWindow.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/BusyIndicator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Button.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/CheckBox.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/CheckDelegate.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ComboBox.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Config.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/DelayButton.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Dialog.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/DialogButtonBox.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/FocusFrame.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Frame.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/GroupBox.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ItemDelegate.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Menu.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuBar.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuBarItem.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuItem.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/MenuSeparator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/PageIndicator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Popup.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ProgressBar.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RadioButton.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RadioDelegate.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RangeSlider.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/RoundButton.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Slider.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/SpinBox.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/StyleImage.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/SwipeDelegate.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/Switch.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/SwitchDelegate.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TabBar.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TabButton.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TextArea.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/TextField.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolBar.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolButton.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolSeparator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/ToolTip.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/ButtonBackground.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/CheckIndicator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/RadioIndicator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/SwitchIndicator.qml", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/libqtquickcontrols2fluentwinui3styleimplplugin.so", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/plugins.qmltypes", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/impl/qmldir", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/libqtquickcontrols2fluentwinui3styleplugin.so", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/plugins.qmltypes", | ||
| "./" + distDir + "//qml/QtQuick/Controls/FluentWinUI3/qmldir", | ||
| "./" + distDir + "//qml/QtQuick/Controls/Imagine/impl/QuickControls2ImagineStyleImpl.qmltypes", | ||
| "./" + distDir + "//qml/QtQuick/Effects/libeffectsplugin.so", | ||
| "./" + distDir + "//qml/QtQuick/Effects/plugins.qmltypes", | ||
| "./" + distDir + "//qml/QtQuick/Effects/qmldir", | ||
| "./" + distDir + "//qml/QtQuick/Layouts/libqquicklayoutsplugin.so", | ||
| "./" + distDir + "//qml/QtQuick/Layouts/plugins.qmltypes", | ||
| "./" + distDir + "//qml/QtQuick/Layouts/qmldir", | ||
| "./" + distDir + "//translations/qtdeclarative_ka.qm" | ||
| } | ||
| ); | ||
| #endif | ||
|
|
||
| return Tree; | ||
| } | ||
|
|
||
| QSet<QString> ModulesQt6_8::qmlVirtualKeyBoadrLibs(const QString &distDir) const{ | ||
| TestUtils utils; | ||
|
|
||
| auto Tree = ModulesQt6_6::qmlVirtualKeyBoadrLibs(distDir); | ||
| #ifdef Q_OS_LINUX | ||
| Tree -= utils.createTree( | ||
| { | ||
| "./" + distDir + "plugins/multimedia/libgstreamermediaplugin.so" | ||
| } | ||
| ); | ||
|
|
||
| Tree += utils.createTree( | ||
| { | ||
| "./" + distDir + "/translations/qtmultimedia_ka.qm", | ||
| "./" + distDir + "/lib/libQt6VirtualKeyboardSettings.so" | ||
| } | ||
| ); | ||
| #endif | ||
| return Tree; | ||
| } | ||
|
|
||
| QSet<QString> ModulesQt6_8::qtWebEngine(const QString &distDir) const{ | ||
| TestUtils utils; | ||
|
|
||
| auto Tree = ModulesQt6_6::qtWebEngine(distDir); | ||
|
|
||
| #ifdef Q_OS_LINUX | ||
|
|
||
|
|
||
| Tree += utils.createTree( | ||
| { | ||
| "./" + distDir + "/lib/libQt6Network.so", | ||
| "./" + distDir + "/lib/libQt6QmlMeta.so", | ||
| "./" + distDir + "/lib/libQt6QmlWorkerScript.so", | ||
| "./" + distDir + "/translations/qtdeclarative_ka.qm", | ||
| "./" + distDir + "/translations/qtserialport_ka.qm", | ||
| "./" + distDir + "/translations/qtwebengine_ka.qm" | ||
| } | ||
| ); | ||
| #endif | ||
| return Tree; | ||
| } | ||
|
|
||
| QSet<QString> ModulesQt6_8::qtWebEngineWidgets(const QString &distDir) const{ | ||
| TestUtils utils; | ||
|
|
||
| auto Tree = ModulesQt6_6::qtWebEngineWidgets(distDir); | ||
|
|
||
| #ifdef Q_OS_LINUX | ||
|
|
||
|
|
||
| Tree += utils.createTree( | ||
| { | ||
| "./" + distDir + "/lib/libQt6Network.so", | ||
| "./" + distDir + "/lib/libQt6QmlMeta.so", | ||
| "./" + distDir + "/lib/libQt6QmlWorkerScript.so", | ||
| "./" + distDir + "/translations/qtdeclarative_ka.qm", | ||
| "./" + distDir + "/translations/qtserialport_ka.qm", | ||
| "./" + distDir + "/translations/qtwebengine_ka.qm" | ||
| } | ||
| ); | ||
|
|
||
| #endif | ||
| return Tree; | ||
| } | ||
|
|
||
| QSet<QString> ModulesQt6_8::qtLibs(const QString &distDir) const { | ||
| auto Tree = ModulesQt6_6::qtLibs(distDir); | ||
| TestUtils utils; | ||
|
|
||
| #ifdef Q_OS_LINUX | ||
|
|
||
| Tree += utils.createTree( | ||
| { | ||
| "./" + distDir + "/translations/qtbase_ka.qm", | ||
| "./" + distDir + "/plugins/wayland-decoration-client/libadwaita.so", | ||
| } | ||
| ); | ||
| #endif | ||
|
|
||
| return Tree; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Copyright (C) 2023-2024 QuasarApp. | ||
| * Distributed under the lgplv3 software license, see the accompanying | ||
| * Everyone is permitted to copy and distribute verbatim copies | ||
| * of this license document, but changing it is not allowed. | ||
| */ | ||
|
|
||
|
|
||
| #ifndef MODULESQT6_8_H | ||
| #define MODULESQT6_8_H | ||
|
|
||
| #include "modulesqt6_6.h" | ||
|
|
||
|
|
||
| class ModulesQt6_8: public ModulesQt6_6 | ||
| { | ||
| public: | ||
| ModulesQt6_8(); | ||
| QSet<QString> qmlLibs(const QString &distDir = DISTRO_DIR) const override; | ||
| QSet<QString> qmlVirtualKeyBoadrLibs(const QString &distDir = DISTRO_DIR) const override; | ||
| QSet<QString> qtWebEngine(const QString &distDir = DISTRO_DIR) const override; | ||
| QSet<QString> qtWebEngineWidgets(const QString &distDir = DISTRO_DIR) const override; | ||
| QSet<QString> qtLibs(const QString &distDir = DISTRO_DIR) const override; | ||
| }; | ||
|
|
||
| #endif // MODULESQT6_8_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters