diff options
| -rw-r--r-- | licenses/Digia-Qt-LGPL-Exception-1.1 | 22 | ||||
| -rw-r--r-- | licenses/The-Qt-Company-Qt-LGPL-Exception-1.1 | 22 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-5.4.1.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtenginio.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtgraphicaleffects.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtquick1.inc | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtscript.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtsensors.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtsvg.inc | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttranslations.inc | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland-native.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebchannel.inc | 5 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebkit-examples.inc | 5 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebsockets.inc | 7 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtxmlpatterns.inc | 1 |
20 files changed, 83 insertions, 14 deletions
diff --git a/licenses/Digia-Qt-LGPL-Exception-1.1 b/licenses/Digia-Qt-LGPL-Exception-1.1 new file mode 100644 index 00000000..7e2e30ff --- /dev/null +++ b/licenses/Digia-Qt-LGPL-Exception-1.1 | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | Digia Qt LGPL Exception version 1.1 | ||
| 2 | |||
| 3 | As an additional permission to the GNU Lesser General Public License version | ||
| 4 | 2.1, the object code form of a "work that uses the Library" may incorporate | ||
| 5 | material from a header file that is part of the Library. You may distribute | ||
| 6 | such object code under terms of your choice, provided that: | ||
| 7 | (i) the header files of the Library have not been modified; and | ||
| 8 | (ii) the incorporated material is limited to numerical parameters, data | ||
| 9 | structure layouts, accessors, macros, inline functions and | ||
| 10 | templates; and | ||
| 11 | (iii) you comply with the terms of Section 6 of the GNU Lesser General | ||
| 12 | Public License version 2.1. | ||
| 13 | |||
| 14 | Moreover, you may apply this exception to a modified version of the Library, | ||
| 15 | provided that such modification does not involve copying material from the | ||
| 16 | Library into the modified Library's header files unless such material is | ||
| 17 | limited to (i) numerical parameters; (ii) data structure layouts; | ||
| 18 | (iii) accessors; and (iv) small macros, templates and inline functions of | ||
| 19 | five lines or less in length. | ||
| 20 | |||
| 21 | Furthermore, you are not required to apply this additional permission to a | ||
| 22 | modified version of the Library. | ||
diff --git a/licenses/The-Qt-Company-Qt-LGPL-Exception-1.1 b/licenses/The-Qt-Company-Qt-LGPL-Exception-1.1 new file mode 100644 index 00000000..5cdacb9a --- /dev/null +++ b/licenses/The-Qt-Company-Qt-LGPL-Exception-1.1 | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | The Qt Company Qt LGPL Exception version 1.1 | ||
| 2 | |||
| 3 | As an additional permission to the GNU Lesser General Public License version | ||
| 4 | 2.1, the object code form of a "work that uses the Library" may incorporate | ||
| 5 | material from a header file that is part of the Library. You may distribute | ||
| 6 | such object code under terms of your choice, provided that: | ||
| 7 | (i) the header files of the Library have not been modified; and | ||
| 8 | (ii) the incorporated material is limited to numerical parameters, data | ||
| 9 | structure layouts, accessors, macros, inline functions and | ||
| 10 | templates; and | ||
| 11 | (iii) you comply with the terms of Section 6 of the GNU Lesser General | ||
| 12 | Public License version 2.1. | ||
| 13 | |||
| 14 | Moreover, you may apply this exception to a modified version of the Library, | ||
| 15 | provided that such modification does not involve copying material from the | ||
| 16 | Library into the modified Library's header files unless such material is | ||
| 17 | limited to (i) numerical parameters; (ii) data structure layouts; | ||
| 18 | (iii) accessors; and (iv) small macros, templates and inline functions of | ||
| 19 | five lines or less in length. | ||
| 20 | |||
| 21 | Furthermore, you are not required to apply this additional permission to a | ||
| 22 | modified version of the Library. | ||
diff --git a/recipes-qt/qt5/qt5-5.4.1.inc b/recipes-qt/qt5/qt5-5.4.1.inc index c06b792e..495551f6 100644 --- a/recipes-qt/qt5/qt5-5.4.1.inc +++ b/recipes-qt/qt5/qt5-5.4.1.inc | |||
| @@ -12,7 +12,7 @@ SRC_URI += " \ | |||
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" | 13 | S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" |
| 14 | 14 | ||
| 15 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" | 15 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
| 16 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ | 16 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ |
| 17 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ | 17 | file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ |
| 18 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 18 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index c8789980..e90256ea 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
| @@ -16,7 +16,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" | |||
| 16 | 16 | ||
| 17 | DEFAULT_PREFERENCE = "-1" | 17 | DEFAULT_PREFERENCE = "-1" |
| 18 | 18 | ||
| 19 | LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" | 19 | LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
| 20 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 20 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
| 21 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 21 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
| 22 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 22 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 93edb531..a5687ea4 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
| @@ -22,6 +22,10 @@ SRC_URI += "\ | |||
| 22 | 22 | ||
| 23 | DEPENDS += "qtbase-native" | 23 | DEPENDS += "qtbase-native" |
| 24 | 24 | ||
| 25 | # Used for examples and tests | ||
| 26 | # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp | ||
| 27 | LICENSE += "& BSD" | ||
| 28 | |||
| 25 | # for syncqt | 29 | # for syncqt |
| 26 | RDEPENDS_${PN}-tools += "perl" | 30 | RDEPENDS_${PN}-tools += "perl" |
| 27 | 31 | ||
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc index 4a186fdc..10487ca6 100644 --- a/recipes-qt/qt5/qtdeclarative.inc +++ b/recipes-qt/qt5/qtdeclarative.inc | |||
| @@ -4,6 +4,8 @@ SRC_URI += " \ | |||
| 4 | file://0001-qmltestexample-fix-link.patch \ | 4 | file://0001-qmltestexample-fix-link.patch \ |
| 5 | " | 5 | " |
| 6 | 6 | ||
| 7 | # There are no LGPLv3-only licensed files in this component. | ||
| 8 | |||
| 7 | DEPENDS += "qtbase" | 9 | DEPENDS += "qtbase" |
| 8 | 10 | ||
| 9 | PACKAGECONFIG ??= "qtxmlpatterns" | 11 | PACKAGECONFIG ??= "qtxmlpatterns" |
diff --git a/recipes-qt/qt5/qtenginio.inc b/recipes-qt/qt5/qtenginio.inc index d66b2531..687b414d 100644 --- a/recipes-qt/qt5/qtenginio.inc +++ b/recipes-qt/qt5/qtenginio.inc | |||
| @@ -5,4 +5,4 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" | |||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 5 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
| 6 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 6 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
| 7 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" | 7 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" |
| 8 | LICENSE = "LGPL-2.1 | GPL-3.0" | 8 | LICENSE = "BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc index 89bda5ed..9b862cf2 100644 --- a/recipes-qt/qt5/qtgraphicaleffects.inc +++ b/recipes-qt/qt5/qtgraphicaleffects.inc | |||
| @@ -4,5 +4,6 @@ DEPENDS += "qtdeclarative" | |||
| 4 | 4 | ||
| 5 | RDEPENDS_${PN}-dev = "" | 5 | RDEPENDS_${PN}-dev = "" |
| 6 | 6 | ||
| 7 | LICENSE += "| GPL-2.0" | 7 | # There are no LGPLv3-only licensed files in this component. |
| 8 | # There are no GPLv2 licensed files in this component. | ||
| 8 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" | 9 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" |
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc index 68ae33d3..bb53b9c9 100644 --- a/recipes-qt/qt5/qtmultimedia.inc +++ b/recipes-qt/qt5/qtmultimedia.inc | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | # There are no LGPLv3-only licensed files in this component. | ||
| 4 | |||
| 3 | DEPENDS += "qtdeclarative" | 5 | DEPENDS += "qtdeclarative" |
| 4 | 6 | ||
| 5 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 7 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ |
diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc index e507636a..c3ae7cf1 100644 --- a/recipes-qt/qt5/qtquick1.inc +++ b/recipes-qt/qt5/qtquick1.inc | |||
| @@ -3,5 +3,7 @@ require qt5.inc | |||
| 3 | DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" | 3 | DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit" |
| 4 | # qttools | 4 | # qttools |
| 5 | 5 | ||
| 6 | LICENSE += "| GPL-2.0" | 6 | # There are no LGPLv3-only licensed files in this component. |
| 7 | # There are no GPLv2 licensed files in this component. | ||
| 8 | # Note that some files are LGPL-2.1 only without Digia-Qt-LGPL-Exception-1.1. | ||
| 7 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" | 9 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" |
diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc index bbb05a65..e7b5d745 100644 --- a/recipes-qt/qt5/qtscript.inc +++ b/recipes-qt/qt5/qtscript.inc | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | # There are no LGPLv3-only licensed files in this component. | ||
| 4 | # Note that some files are LGPL-2.1 only without Digia-Qt-LGPL-Exception-1.1. | ||
| 3 | DEPENDS += "qtbase" | 5 | DEPENDS += "qtbase" |
diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc index 3bd9289a..88c5e782 100644 --- a/recipes-qt/qt5/qtsensors.inc +++ b/recipes-qt/qt5/qtsensors.inc | |||
| @@ -2,5 +2,6 @@ require qt5.inc | |||
| 2 | 2 | ||
| 3 | DEPENDS += "qtbase qtdeclarative" | 3 | DEPENDS += "qtbase qtdeclarative" |
| 4 | 4 | ||
| 5 | LICENSE += "| GPL-2.0" | 5 | # There are no LGPLv3-only licensed files in this component. |
| 6 | # There are no GPLv2 licensed files in this component. | ||
| 6 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" | 7 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" |
diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc index bbb05a65..ce2eee40 100644 --- a/recipes-qt/qt5/qtsvg.inc +++ b/recipes-qt/qt5/qtsvg.inc | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | # There are no LGPLv3-only licensed files in this component. | ||
| 3 | DEPENDS += "qtbase" | 4 | DEPENDS += "qtbase" |
diff --git a/recipes-qt/qt5/qttranslations.inc b/recipes-qt/qt5/qttranslations.inc index c5226947..45f7609a 100644 --- a/recipes-qt/qt5/qttranslations.inc +++ b/recipes-qt/qt5/qttranslations.inc | |||
| @@ -5,7 +5,7 @@ DEPENDS += "qtbase qttools-native" | |||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | 5 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ |
| 6 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | 6 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
| 7 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" | 7 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6" |
| 8 | LICENSE = "LGPL-2.1 | GPL-3.0" | 8 | LICENSE = "(LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" |
| 9 | 9 | ||
| 10 | PACKAGES =. " \ | 10 | PACKAGES =. " \ |
| 11 | ${PN}-assistant \ | 11 | ${PN}-assistant \ |
diff --git a/recipes-qt/qt5/qtwayland-native.inc b/recipes-qt/qt5/qtwayland-native.inc index 20aa72e5..b6af19e8 100644 --- a/recipes-qt/qt5/qtwayland-native.inc +++ b/recipes-qt/qt5/qtwayland-native.inc | |||
| @@ -16,7 +16,8 @@ do_install() { | |||
| 16 | oe_runmake install INSTALL_ROOT=${D} | 16 | oe_runmake install INSTALL_ROOT=${D} |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" | 19 | # There are no LGPLv3-only licensed files in this component. |
| 20 | LICENSE = "BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | ||
| 20 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 21 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
| 21 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | 22 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ |
| 22 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 23 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ |
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index baadcf59..d126b04c 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc | |||
| @@ -23,7 +23,8 @@ FILES_${PN}-plugins-dbg += " \ | |||
| 23 | ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ | 23 | ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ |
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" | 26 | # There are no LGPLv3-only licensed files in this component. |
| 27 | LICENSE = "BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | ||
| 27 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | 28 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ |
| 28 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | 29 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ |
| 29 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | 30 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ |
diff --git a/recipes-qt/qt5/qtwebchannel.inc b/recipes-qt/qt5/qtwebchannel.inc index 46c3c8a7..3cd22cf6 100644 --- a/recipes-qt/qt5/qtwebchannel.inc +++ b/recipes-qt/qt5/qtwebchannel.inc | |||
| @@ -2,5 +2,6 @@ require qt5.inc | |||
| 2 | 2 | ||
| 3 | DEPENDS += "qtdeclarative qtwebsockets" | 3 | DEPENDS += "qtdeclarative qtwebsockets" |
| 4 | 4 | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7" | 5 | # There are no LGPLv3-only licensed files in this component. |
| 6 | LICENSE = "LGPL-2.1" | 6 | # There are no GPLv2 licensed files in this component. |
| 7 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" | ||
diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc index 5faf6f46..317fabb5 100644 --- a/recipes-qt/qt5/qtwebkit-examples.inc +++ b/recipes-qt/qt5/qtwebkit-examples.inc | |||
| @@ -1,7 +1,10 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | LICENSE = "BSD & LGPLv2+ | GPL-2.0" | 3 | # There are no LGPLv3-only licensed files in this component. |
| 4 | # There are no GPLv2 licensed files in this component. | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ | 5 | LIC_FILES_CHKSUM = "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
| 6 | file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | ||
| 7 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ | ||
| 5 | file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=112;md5=6f92d041824c63426993c8ce3ae0eb77 \ | 8 | file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=112;md5=6f92d041824c63426993c8ce3ae0eb77 \ |
| 6 | file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=223;md5=13ffb472fefe4bdf6464954a22251f35" | 9 | file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=223;md5=13ffb472fefe4bdf6464954a22251f35" |
| 7 | 10 | ||
diff --git a/recipes-qt/qt5/qtwebsockets.inc b/recipes-qt/qt5/qtwebsockets.inc index 6eb8da22..1043a06f 100644 --- a/recipes-qt/qt5/qtwebsockets.inc +++ b/recipes-qt/qt5/qtwebsockets.inc | |||
| @@ -2,6 +2,9 @@ require qt5.inc | |||
| 2 | 2 | ||
| 3 | DEPENDS += "qtbase qtdeclarative" | 3 | DEPENDS += "qtbase qtdeclarative" |
| 4 | 4 | ||
| 5 | LICENSE = "GFDL & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ |
| 6 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" | 7 | file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ |
| 7 | LICENSE = "LGPL-2.1 | GPL-2.0" | 8 | file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ |
| 9 | file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ | ||
| 10 | " | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc index bbb05a65..ce2eee40 100644 --- a/recipes-qt/qt5/qtxmlpatterns.inc +++ b/recipes-qt/qt5/qtxmlpatterns.inc | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | # There are no LGPLv3-only licensed files in this component. | ||
| 3 | DEPENDS += "qtbase" | 4 | DEPENDS += "qtbase" |
