qt5: update to 5.15.0 (LTS release)

[feed/video.git] / frameworks / qt5tools / patches / 000-enable-kmap2qmap.patch

diff --git a/frameworks/qt5tools/patches/000-enable-kmap2qmap.patch b/frameworks/qt5tools/patches/000-enable-kmap2qmap.patch
index 2fdc383856afc652068c6217fd603efa6b6c3df3..51819853430501f6e701b0621b1bfb51df92f4ee 100644 (file)
--- a/frameworks/qt5tools/patches/000-enable-kmap2qmap.patch
+++ b/frameworks/qt5tools/patches/000-enable-kmap2qmap.patch
@@ -1,12 +1,14 @@
---- qttools-opensource-src-5.8.0.orig/src/src.pro      2017-01-02 07:50:13.000000000 +0100
-+++ qttools-opensource-src-5.8.0/src/src.pro   2017-02-21 02:58:04.974231681 +0100
-@@ -14,7 +14,8 @@
+diff --git a/src/src.pro b/src/src.pro
+index 5c256ea..3c4012a 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -17,7 +17,8 @@ qtHaveModule(widgets) {
+ }
  
  SUBDIRS += linguist \
-     qdoc \
 -    qtattributionsscanner
 +    qtattributionsscanner \
 +    kmap2qmap
  
- !android|android_app: SUBDIRS += qtplugininfo
- 
+ qtConfig(library) {
+     !android|android_app: SUBDIRS += qtplugininfo