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

4 files changed, 0 insertions, 5 deletions

diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 5d605a68..5ba960ec 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -12,7 +12,6 @@ EXTRA_OECMAKE_prepend = " \
     -DOE_QMAKE_PATH_BINS=${OE_QMAKE_PATH_BINS} \
     -DOE_QMAKE_PATH_LIBEXECS=${OE_QMAKE_PATH_LIBEXECS} \
     -DOE_QMAKE_PATH_PLUGINS=${OE_QMAKE_PATH_PLUGINS} \
-    -DOE_QMAKE_PATH_IMPORTS=${OE_QMAKE_PATH_IMPORTS} \
     -DOE_QMAKE_PATH_QML=${OE_QMAKE_PATH_QML} \
     -DOE_QMAKE_PATH_TRANSLATIONS=${OE_QMAKE_PATH_TRANSLATIONS} \
     -DOE_QMAKE_PATH_DOCS=${OE_QMAKE_PATH_DOCS} \
diff --git a/classes/populate_sdk_qt5_base.bbclass b/classes/populate_sdk_qt5_base.bbclass
index b6ce5967..c26fee44 100644
--- a/classes/populate_sdk_qt5_base.bbclass
+++ b/classes/populate_sdk_qt5_base.bbclass
@@ -14,7 +14,6 @@ create_sdk_files_prepend () {
     echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf
     echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf
     echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf
-    echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf
     echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf
     echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf
     echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 8f1d143a..b3a4826a 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -60,7 +60,6 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-Imports = ${OE_QMAKE_PATH_IMPORTS}
 Qml2Imports = ${OE_QMAKE_PATH_QML}
 Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
 Documentation = ${OE_QMAKE_PATH_DOCS}
@@ -93,7 +92,6 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-Imports = ${OE_QMAKE_PATH_IMPORTS}
 Qml2Imports = ${OE_QMAKE_PATH_QML}
 Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
 Documentation = ${OE_QMAKE_PATH_DOCS}
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass
index e1101a9c..f3c7b112 100644
--- a/classes/qmake5_paths.bbclass
+++ b/classes/qmake5_paths.bbclass
@@ -20,7 +20,6 @@ OE_QMAKE_PATH_DATA = "${datadir}"
 OE_QMAKE_PATH_BINS = "${bindir}"
 OE_QMAKE_PATH_LIBEXECS = "${libdir}${QT_DIR_NAME}/libexec"
 OE_QMAKE_PATH_PLUGINS = "${libdir}${QT_DIR_NAME}/plugins"
-OE_QMAKE_PATH_IMPORTS = "${libdir}${QT_DIR_NAME}/imports"
 OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml"
 OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations"
 OE_QMAKE_PATH_DOCS = "${docdir}"