diff options
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtcharts_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 95e3854c..edae5724 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -7,8 +7,10 @@ PACKAGECONFIG_OPENSSL ?= "openssl" | |||
7 | 7 | ||
8 | PACKAGECONFIG[examples] = "" | 8 | PACKAGECONFIG[examples] = "" |
9 | PACKAGECONFIG[tests] = "" | 9 | PACKAGECONFIG[tests] = "" |
10 | PACKAGECONFIG[qtquickcompiler] = ",,qtdeclarative-native" | ||
10 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" | 11 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', '', d)}" |
11 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}" | 12 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', '', d)}" |
13 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtquickcompiler', 'CONFIG+=qtquickcompiler', '', d)}" | ||
12 | 14 | ||
13 | # we don't want conflicts with qt4 | 15 | # we don't want conflicts with qt4 |
14 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" | 16 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 5b0e6629..a6ec17f8 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -13,3 +13,5 @@ SRCREV = "4f66d1ffeecd95b4bf6666b71536c42dea7450ed" | |||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
15 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 15 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
16 | |||
17 | PACKAGECONFIG ?= "qtquickcompiler" | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 3c6101e4..4154b2a6 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ | |||
13 | #SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write" | 13 | #SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write" |
14 | #PACKAGECONFIG = "t9write lang-all" | 14 | #PACKAGECONFIG = "t9write lang-all" |
15 | 15 | ||
16 | PACKAGECONFIG ?= "lang-all lipi-toolkit" | 16 | PACKAGECONFIG ?= "lang-all lipi-toolkit qtquickcompiler" |
17 | PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell" | 17 | PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell" |
18 | PACKAGECONFIG[t9write] = "CONFIG+=t9write" | 18 | PACKAGECONFIG[t9write] = "CONFIG+=t9write" |
19 | PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" | 19 | PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit" |