From ad7f7320df6865bd083e5c744247867fc09da947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 18 Jan 2020 17:45:13 +0100 Subject: [PATCH] qtbase-native: adjust patch for qdbusxml2cpp to Qt 5.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...pare-commandline-string-manipulation.patch | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch b/extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch index 48b01cc1..2cc19666 100644 --- a/extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch +++ b/extends-meta-qt5/qtbase/0002-qdbusxml2cpp-prepare-commandline-string-manipulation.patch @@ -8,29 +8,32 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] +Date: Sat, 18 Jan 2020 16:35:24 +0100 +Adjusted to Qt 5.14 + Signed-off-by: Andreas Müller --- - src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp -index 76401da..3a712d2 100644 +index ce4232f3e8..d9003f4508 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp -@@ -289,9 +289,12 @@ static QString moc(const QString &name) +@@ -161,9 +161,12 @@ static QString moc(const QString &name) static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost) { -+ QString strCmdLine = commandLine; -+ strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH")); -+ strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot")); - ts << "/*" << endl - << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl -- << " * Command line was: " << commandLine << endl ++ QString strCmdLine = commandLine; ++ strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH")); ++ strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot")); + ts << "/*" << Qt::endl + << " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << Qt::endl +- << " * Command line was: " << commandLine << Qt::endl + << " * Command line was: " << strCmdLine << endl - << " *" << endl - << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << endl - << " *" << endl + << " *" << Qt::endl + << " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << Qt::endl + << " *" << Qt::endl -- -2.1.0 +2.21.0