From 6374736f37378501793a5191b48545c1fecc0c48 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 19 Mar 2014 15:30:56 +0100 Subject: recipes-git: Upgrade from latest origin/release to latest origin/stable * there wont be 5.2.2 release, so start preparation for 5.3.0 * probably latest 5.3.0-beta1 snapshot was released yesterday, so this should be reasonably close * probably wont be merged before creating new release branch for Yocto 1.6 * qtbase: Fix build with X.h included from egl.h * nativesdk-qt*: Add git recipes 5.2.1 isn't compatible with qtbase-native from git * qtbase: upgrade to latest stable revision * 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch was upstreamed in: 0c3301f configure: make pulseaudio and alsa configurable options * 0005-qt_module-Fix-pkgconfig-replacement.patch is hopefully resolved in: eaefbe3 snuff -L/-I with system paths when installing meta files a33afed de-duplicate setup of libdir replacement in prl files aa20e7f reshuffle code for clarity ee86ce8 don't attempt to replace include paths in meta files but this needs to be double checked * recipes-git: Upgrade to latest origin/stable * qt5-git.inc: update LICENSE.LGPL checksum * only year was updated: - The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). * qtbase: add 2 patches to fix build issues * LIC_FILES_CHKSUM: update other git recipes * qtlocation: bump SRCREV and add to qt5-versions * qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools * qtquick1: fix LIC_FILES_CHKSUM * qttools: update LIC_FILES_CHKSUM and patches * new qtdiag needs to be disabled as well because it depends on gui which isn't enabled in qtbase-native, disable qtpaths as well Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit-examples_git.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtwebkit-examples_git.bb') diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 1f5df718..98fdc2f0 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -1,6 +1,4 @@ require qt5-git.inc require ${PN}.inc -QT_MODULE_BRANCH = "release" -# v5.2.1 + 1 commits -SRCREV = "cb8ed9694b850a429a93490beaa6462d9f3b8ea6" +SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5" -- cgit v1.2.3