Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5-5.15.10

Browse Source
This commit is contained in:
Rmys
2023-06-18 10:48:35 +03:00
parent 8ef6472808
commit d30ba6596b
5 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-declarative/files/qt_kde.patch
+32 -1
View File
@@ -108,7 +108,7 @@ index 29ed62cd39..aba930dfe1 100644
}
}
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
index 523c0df779..551e0ede95 100644
index 4fcff70de6..5b7e767ae2 100644
--- a/src/qmlmodels/qqmldelegatemodel.cpp
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
@@ -389,6 +389,12 @@ void QQmlDelegateModelPrivate::connectToAbstractItemModel()
@@ -1570,3 +1570,34 @@ index 0000000000..38dfde41c3
+ }
+ }
+}
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index beeec88f07..2cb7653d65 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -446,8 +446,8 @@ int main(int argc, char *argv[])
QCommandLineParser parser;
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsPositionalArguments);
- const QCommandLineOption helpOption = parser.addHelpOption();
- const QCommandLineOption versionOption = parser.addVersionOption();
+ parser.addHelpOption();
+ parser.addVersionOption();
#ifdef QT_GUI_LIB
QCommandLineOption apptypeOption(QStringList() << QStringLiteral("a") << QStringLiteral("apptype"),
QCoreApplication::translate("main", "Select which application class to use. Default is gui."),
@@ -522,14 +522,7 @@ int main(int argc, char *argv[])
parser.addPositionalArgument("args",
QCoreApplication::translate("main", "Arguments after '--' are ignored, but passed through to the application.arguments variable in QML."), "[-- args...]");
- if (!parser.parse(QCoreApplication::arguments())) {
- qWarning() << parser.errorText();
- exit(1);
- }
- if (parser.isSet(versionOption))
- parser.showVersion();
- if (parser.isSet(helpOption))
- parser.showHelp();
+ parser.process(*app);
if (parser.isSet(listConfOption))
listConfFiles();
if (applicationType == QmlApplicationTypeUnknown) {
desktop/toolkit/qt5/qt5-declarative/pspec.xml
+16 -9
View File
@@ -11,15 +11,15 @@
<Summary>Classes for QML and JavaScript languages</Summary>
<Description>Classes for QML and JavaScript languages</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="c1230f5c709f80d5bf7e61456a7d605983201cde" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz</Archive>
<Archive sha1sum="8f392c72e19542a1103f648194e7ee851cdade8d" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.10/submodules/qtdeclarative-everywhere-opensource-src-5.15.10.tar.xz</Archive>
<BuildDependencies>
<Dependency>python3</Dependency>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency>libxkbcommon-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<!-- <Dependency versionFrom="5.15.9">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.9">qt5-assistant-devel</Dependency> -->
<Dependency versionFrom="5.15.9">qt5-sql-sqlite</Dependency>
<!-- <Dependency versionFrom="5.15.10">qt5-xmlpatterns-devel</Dependency> -->
<!-- <Dependency versionFrom="5.15.10">qt5-assistant-devel</Dependency> -->
<Dependency versionFrom="5.15.10">qt5-sql-sqlite</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">qt_kde.patch</Patch>
@@ -31,9 +31,9 @@
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<!-- <Dependency>libglvnd</Dependency> -->
<Dependency versionFrom="5.15.9">qt5-base</Dependency>
<Dependency versionFrom="5.15.10">qt5-base</Dependency>
<Dependency>libglvnd</Dependency>
<!-- <Dependency versionFrom="5.15.9">qt5-xmlpatterns</Dependency> -->
<!-- <Dependency versionFrom="5.15.10">qt5-xmlpatterns</Dependency> -->
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -53,7 +53,7 @@
<Path fileType="header">/usr/include/qt5</Path>
</Files>
<RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.10">qt5-base-devel</Dependency>
<Dependency release="current">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -61,7 +61,7 @@
<!--Package>
<Name>qt5-declarative-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.15.9">qt5-base</Dependency>
<Dependency versionFrom="5.15.10">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc/qt5</Path>
@@ -69,6 +69,13 @@
</Package-->
<History>
<Update release="39">
<Date>2023-06-17</Date>
<Version>5.15.10</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="38">
<Date>2023-05-10</Date>
<Version>5.15.9</Version>