summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/nativesdk-qtbase_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-08-16 09:15:31 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-08-16 10:35:31 +0300
commitb9313110bd4ec9a30a037f2edd78b02bf57ed6eb (patch)
treeeaf467a73585a6a4971d87324897bc21d771c5ab /recipes-qt/qt5/nativesdk-qtbase_git.bb
parent0fb09cabc2499f52113630dacbea7524402e7793 (diff)
parentf6bae656fa1b8e7ec28ecac5bf0ac70d63abd1b5 (diff)
downloadmeta-qt5-b9313110bd4ec9a30a037f2edd78b02bf57ed6eb.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
* origin/5.13: (22 commits) qt5-creator: fix bad merge qtbase: use offscreen platform plugin for tools coin: update poky and openembedded revisions qtwebengine: allow build for musl libc qt5: update submodules qt5: update to Qt 5.12.5 Add CI build instructions qt5-creator: fix build with musl ogl-runtime: fix build on musl libc qtdeclarative: Use qmlcachegen provided by OE instead of system one. qtbase-native: Always use qt provided doubleconversion library. qttools: Enable clang support when using clang qt5-creator: update to v4.9.2 maliit-framework-qt5: Fix build when ptest is enabled qtwebengine: Fix build on aarch64 qtwebengine: refresh the patches to apply qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc qt5: Upgrade to Qt 5.13.0 Allow enabling gui for native and nativesdk qt5everywheredemo: update HOMEPAGE ... Change-Id: I59c8da38833c99e3f8f24f09d04a48c9df79bbf5
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index dc69f4ec..321b3067 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -75,7 +75,7 @@ FILES_${PN} += " \
75DEBIAN_NOAUTONAME_${PN} = "1" 75DEBIAN_NOAUTONAME_${PN} = "1"
76 76
77PACKAGECONFIG ?= "" 77PACKAGECONFIG ?= ""
78PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui," 78PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui,"
79PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," 79PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
80 80
81QT_CONFIG_FLAGS += " \ 81QT_CONFIG_FLAGS += " \