qt5-5.15.10

2023-06-18 10:48:35 +03:00
parent 8ef6472808
commit d30ba6596b
5 changed files with 79 additions and 20 deletions
@@ -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) {