diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-06-14 02:01:57 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-25 16:02:18 +0200 |
commit | 82dbbfe81e6f85b7265f0b76b9682edf0acfbaea (patch) | |
tree | 638eb5b7e32eb5fe9ee659c42dc51ad6a38968de /recipes-qt/qt5/qttools.inc | |
parent | aa8588a72e9c611bf98c9318397bc9a1a26a2655 (diff) | |
download | meta-qt5-82dbbfe81e6f85b7265f0b76b9682edf0acfbaea.tar.gz |
qttools: make qtwebkit a PACKAGECONFIG and disable by default
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools.inc')
-rw-r--r-- | recipes-qt/qt5/qttools.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc index d4d8017f..cd8a97f2 100644 --- a/recipes-qt/qt5/qttools.inc +++ b/recipes-qt/qt5/qttools.inc | |||
@@ -1,9 +1,10 @@ | |||
1 | require qt5.inc | 1 | require qt5.inc |
2 | 2 | ||
3 | DEPENDS += "qtbase qtdeclarative qtwebkit qtxmlpatterns" | 3 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
4 | 4 | ||
5 | SRC_URI += " \ | 5 | SRC_URI += " \ |
6 | file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ | 6 | file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \ |
7 | file://0003-add-noqtwebkit-configuration.patch \ | ||
7 | " | 8 | " |
8 | 9 | ||
9 | # older copyright year than what e.g. qtbase is using now | 10 | # older copyright year than what e.g. qtbase is using now |
@@ -13,3 +14,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ | |||
13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | 14 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" |
14 | 15 | ||
15 | FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" | 16 | FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" |
17 | |||
18 | PACKAGECONFIG ??= "" | ||
19 | PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | ||
20 | |||
21 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | ||