Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11

* qtyocto/upstream/master:
  qt5: add option to build Qt5 statically
  qtbase: fix install locations used in static builds
  qttranslations: do not use qt meta catalog translation package
  qttools: Disable clang support
  qtbase: add PACKAGECONFIG for Link Time Optimization
  qt5: remove all references to qtquick1 import path
  qt5/qtscript: Fix qtscript cross compile error
  README: Add Yocto Project Compatible badge and fix formatting

Change-Id: Ic8cb74f6e87634b26f79c9effffb80deb6a51b6b

1 files changed, 2 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 5524460c..df81b2d2 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -14,10 +14,11 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network"
+PACKAGECONFIG ??= "qtxmlpatterns qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}"
 PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
 PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
 PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network"
+PACKAGECONFIG[static] = ",,qtdeclarative-native"
 
 do_configure_prepend() {
     # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG