From 2e4613184fd907c3b5842719c436c84991cf850c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 6 Jan 2023 15:18:08 +0100 Subject: [PATCH] Doc: Fix qt_attribution.json files using Path for files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since qttools commit 39fdcb8e7a, qtattributionsscanner fails if 'Path' is not a directory. Use the 'Files' attribute instead. Fixes: QTBUG-110002 Change-Id: I65fecdcb852ce9abea55f168cd939804bae9ae80 Reviewed-by: Jörg Bornemann (cherry picked from commit 2c78c5d4569d89c204857ab007f9e260b219d624) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qt_attribution.json | 2 +- src/gui/opengl/qt_attribution.json | 4 ++-- src/gui/painting/qt_attribution.json | 2 +- src/gui/text/qt_attribution.json | 2 +- src/gui/vulkan/qt_attribution.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/kernel/qt_attribution.json b/src/corelib/kernel/qt_attribution.json index 6d8f4f2abc5..c3075c0a524 100644 --- a/src/corelib/kernel/qt_attribution.json +++ b/src/corelib/kernel/qt_attribution.json @@ -3,7 +3,7 @@ "Name": "QEventDispatcher on macOS", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core on macOS.", - "Path": "qeventdispatcher_cf_p.h", + "Files": "qeventdispatcher_cf_p.h", "Description": "Treat as final version; no upstream known", "Description": "Implementation of QAbstractEventDispatcher for macOS.", diff --git a/src/gui/opengl/qt_attribution.json b/src/gui/opengl/qt_attribution.json index d3ff10d8033..44310980e2a 100644 --- a/src/gui/opengl/qt_attribution.json +++ b/src/gui/opengl/qt_attribution.json @@ -5,7 +5,7 @@ "QDocModule": "qtgui", "Description": "OpenGL header generated from the Khronos OpenGL / OpenGL ES XML API Registry.", "QtUsage": "Used on Windows and Linux in the OpenGL related headers of Qt GUI.", - "Path": "qopenglext.h", + "Files": "qopenglext.h", "Homepage": "https://www.khronos.org/", "Version": "Revision 27684", @@ -20,7 +20,7 @@ "QDocModule": "qtgui", "Description": "OpenGL ES 2 header generated from the Khronos OpenGL / OpenGL ES XML API Registry.", "QtUsage": "Used on Windows and Linux in the OpenGL related headers of Qt GUI.", - "Path": "qopengles2ext.h", + "Files": "qopengles2ext.h", "Homepage": "https://www.khronos.org/", "Version": "Revision 27673", diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json index 488daf07bf9..d0f2468e6a0 100644 --- a/src/gui/painting/qt_attribution.json +++ b/src/gui/painting/qt_attribution.json @@ -4,7 +4,7 @@ "Name": "Anti-aliasing rasterizer from FreeType 2", "QDocModule": "qtgui", "QtUsage": "Used in Qt GUI.", - "Path": "qgrayraster.c", + "Files": "qgrayraster.c", "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", diff --git a/src/gui/text/qt_attribution.json b/src/gui/text/qt_attribution.json index c3a57267e2f..f4998da6ea8 100644 --- a/src/gui/text/qt_attribution.json +++ b/src/gui/text/qt_attribution.json @@ -5,7 +5,7 @@ "QDocModule": "qtgui", "Description": "Provides standardized names for glyphs.", "QtUsage": "Used by PDF generator to make it easier for reader applications to resolve the original contents of rendered text.", - "Path": "qfontsubset_agl.cpp", + "Files": "qfontsubset_agl.cpp", "Homepage": "https://github.com/adobe-type-tools/agl-aglfn", "Version": "1.7", diff --git a/src/gui/vulkan/qt_attribution.json b/src/gui/vulkan/qt_attribution.json index f2ebf9b9185..b49e59954d2 100644 --- a/src/gui/vulkan/qt_attribution.json +++ b/src/gui/vulkan/qt_attribution.json @@ -5,7 +5,7 @@ "QDocModule": "qtgui", "Description": "Vulkan XML API Registry.", "QtUsage": "Used to dynamically generate the sources for the QVulkan(Device)Functions classes.", - "Path": "vk.xml", + "Files": "vk.xml", "Homepage": "https://www.khronos.org/", "Version": "1.3.223",