diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-22 12:49:19 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-23 13:09:39 +0000 |
commit | f3570c1280d1fb9050da3e7955842d368175eae0 (patch) | |
tree | 52c07a8f83a0e8f26af227d08c3c057552c099cf | |
parent | 06842e4666a67872f1a72e7e815b35be7c4ef022 (diff) | |
download | meta-boot2qt-f3570c1280d1fb9050da3e7955842d368175eae0.tar.gz |
qt5: update to latest revision of meta-qt5
meta-qt5 was updated and several patches were merged, remove unneeded
changes from bbappends.
Change-Id: Ia98eb0160d04eb469f8bc87394caa3da65c2f41a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 5 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bbappend | 14 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bbappend | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bbappend | 5 | ||||
-rw-r--r-- | scripts/manifest.xml | 2 |
5 files changed, 1 insertions, 33 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index fd8a462..2a767e9 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | |||
@@ -19,9 +19,4 @@ | |||
19 | ## | 19 | ## |
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | # Needed by qtxmlpatterns | ||
23 | EXTRA_QTLIB_append = " Network Sql" | ||
24 | # Needed by qttools | ||
25 | EXTRA_QTLIB_append = " Xml" | ||
26 | |||
27 | SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b" | 22 | SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b" |
diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 59b6b33..079ddd5 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend | |||
@@ -26,17 +26,3 @@ SRC_URI_append_class-target = " \ | |||
26 | " | 26 | " |
27 | 27 | ||
28 | SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7" | 28 | SRCREV = "190795b1f884620ba8b31d3998ac97107d4f4eb7" |
29 | |||
30 | DEPENDS += "qt3d-native" | ||
31 | |||
32 | SRC_URI += " \ | ||
33 | file://0001-Allow-a-tools-only-build.patch \ | ||
34 | " | ||
35 | PACKAGECONFIG ??= "" | ||
36 | PACKAGECONFIG_class-native ??= "tools-only" | ||
37 | PACKAGECONFIG_class-nativesdk ??= "tools-only" | ||
38 | PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | ||
39 | |||
40 | EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" | ||
41 | |||
42 | BBCLASSEXTEND += "native nativesdk" | ||
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 65a9b1d..e312eaa 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend | |||
@@ -47,12 +47,4 @@ do_configure_prepend() { | |||
47 | SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b" | 47 | SRCREV = "719623a11d57da6a56d069a5ca8161531a37776b" |
48 | 48 | ||
49 | # Temporarily here, until merged upstream | 49 | # Temporarily here, until merged upstream |
50 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" | ||
51 | PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" | 50 | PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" |
52 | |||
53 | do_install_append() { | ||
54 | # Temporarily here, until merged upstream | ||
55 | sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \ | ||
56 | -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ | ||
57 | ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri | ||
58 | } | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index e8b1d19..5045c67 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend | |||
@@ -20,8 +20,3 @@ | |||
20 | ############################################################################## | 20 | ############################################################################## |
21 | 21 | ||
22 | SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" | 22 | SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" |
23 | |||
24 | PACKAGES += "${PN}-qtwebengine" | ||
25 | FILES_${PN}-qtwebengine = " \ | ||
26 | ${OE_QMAKE_PATH_TRANSLATIONS}/qtwebengine_*.qm \ | ||
27 | " | ||
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index b95a8dc..703aedc 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml | |||
@@ -25,7 +25,7 @@ | |||
25 | path="sources/meta-openembedded"/> | 25 | path="sources/meta-openembedded"/> |
26 | <project name="meta-qt5" | 26 | <project name="meta-qt5" |
27 | remote="qtyocto" | 27 | remote="qtyocto" |
28 | revision="72ac998cef3306e6e4d2f3760af1c21cedfc330f" | 28 | revision="ddbe177dae46353f08f7326a11d3b3fd5a1f8435" |
29 | path="sources/meta-qt5"/> | 29 | path="sources/meta-qt5"/> |
30 | 30 | ||
31 | <project name="meta-mingw" | 31 | <project name="meta-mingw" |