summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-12-14 12:42:28 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-12-14 12:42:28 +0200
commit038536793e4cfd5b16af8e47f62eb7aeade429bc (patch)
tree84e1be3ec1bb1781ce2d3798e026e488439c7c0a
parent9a57170b9e6da09406b59c1d699b84092c6dcac5 (diff)
parent9038abdc1f0afe8c52fdf800f09729aaf959931b (diff)
downloadmeta-boot2qt-038536793e4cfd5b16af8e47f62eb7aeade429bc.tar.gz
Merge commit 'origin/sumo' into QtAS-5.12.0
* commit 'origin/sumo': nativesdk-qtbase: fix packaging QA issue Change-Id: Iebd5516b5eb62a06a2eba304e545f57b401d4e84
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 2ae2206..36b4409 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -38,6 +38,10 @@ PACKAGECONFIG_remove_mingw32 += "openssl"
38 38
39PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" 39PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
40 40
41FILES_${PN}-dev += " \
42 ${datadir}/cmake \
43"
44
41fakeroot do_generate_qt_environment_file_mingw32() { 45fakeroot do_generate_qt_environment_file_mingw32() {
42} 46}
43 47