qt5: upgrade to 5.2.0
authorMartin Jansa <Martin.Jansa@gmail.com>
Sat, 2 Nov 2013 18:06:14 +0000 (19:06 +0100)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:45:22 +0000 (08:45 -0800)
commitb42e8c03fa82dc41ca276578afd46203709cf8bc
tree8f1cbad86b1df86ea9c542ddb3b4f788ecbc7e5d
parent00a500f5d5b9d76b33450585943e57a36913bf79
qt5: upgrade to 5.2.0

* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch
  resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5
* drop 0020-Use-BGRA-extension-in-bindTexture.patch
  resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c
* drop 0008-wayland-scanner-disable-silent-rules.patch
  resolved upstream in:
  commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c
  Author: Jan Arne Petersen <jan.petersen@kdab.com>
  Date:   Fri Jul 19 14:35:19 2013 +0200
  Fix wayland-scanner to work with CONFIG+=silent

* squash to match more with structure of
  https://github.com/meta-qt5/qtbase/tree/stable

* qtmodules: bump SRCREVs for 5.2.0 tags
  now all modules using qt5-git should be newer than any 5.1.* version
* qtbase: fix paths in packageconfig *.pc files
  include- and lib-paths contained build-sysroot paths
* qtwebkit: Explicitly add ICU libraries to LIBS
  fails to build without this
* qtjsbackend: remove for git versions
  Found in [1]:
  Qt Qml is now using its own built-in Javascript engine and does not depend on
  V8 anymore. As such the QtJSBackend shared library has disappeared.
  [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/
* qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes
  qtjsbackend is now completely gone
  it allows to share more .patch files and configuration in .inc again

(From meta-qt5 rev: c908fe4ebd5a04813be0b83c173fae182bb22728)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
148 files changed:
meta-qt5/conf/distro/include/qt5-versions.inc
meta-qt5/recipes-qt/qt5/nativesdk-qtbase.inc
meta-qt5/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qt3d_git.bb
meta-qt5/recipes-qt/qt5/qt5-5.2.0.inc [moved from meta-qt5/recipes-qt/qt5/qt5-5.1.1.inc with 96% similarity]
meta-qt5/recipes-qt/qt5/qt5-git.inc
meta-qt5/recipes-qt/qt5/qt5.inc
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtbase-native.inc
meta-qt5/recipes-qt/qt5/qtbase-native_5.2.0.bb [moved from meta-qt5/recipes-qt/qt5/qtbase-native_5.1.1.bb with 63% similarity]
meta-qt5/recipes-qt/qt5/qtbase-native_git.bb
meta-qt5/recipes-qt/qt5/qtbase.inc
meta-qt5/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch with 95% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch with 82% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch with 73% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch with 78% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch with 86% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch with 93% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch with 74% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch with 51% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch with 71% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch with 66% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch with 92% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch with 89% similarity]
meta-qt5/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch [moved from meta-qt5/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch with 89% similarity]
meta-qt5/recipes-qt/qt5/qtbase_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtbase_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtbase_git.bb
meta-qt5/recipes-qt/qt5/qtconnectivity_git.bb
meta-qt5/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtdeclarative.inc
meta-qt5/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch [moved from meta-qt5/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch with 100% similarity]
meta-qt5/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch [moved from meta-qt5/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch with 100% similarity]
meta-qt5/recipes-qt/qt5/qtdeclarative_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtdeclarative_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtdeclarative_git.bb
meta-qt5/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtgraphicaleffects_git.bb
meta-qt5/recipes-qt/qt5/qtimageformats_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtimageformats_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtimageformats_git.bb
meta-qt5/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend-native.inc [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend-native_git.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend.inc [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtjsbackend_git.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtlocation_git.bb
meta-qt5/recipes-qt/qt5/qtmultimedia_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtmultimedia_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb
meta-qt5/recipes-qt/qt5/qtquick1_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtquick1_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtquick1_git.bb
meta-qt5/recipes-qt/qt5/qtquickcontrols_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtquickcontrols_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtquickcontrols_git.bb
meta-qt5/recipes-qt/qt5/qtscript_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtscript_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtscript_git.bb
meta-qt5/recipes-qt/qt5/qtsensors_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtsensors_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtsensors_git.bb
meta-qt5/recipes-qt/qt5/qtserialport.inc
meta-qt5/recipes-qt/qt5/qtserialport_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtserialport_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtserialport_git.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtsvg_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtsvg_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtsvg_git.bb
meta-qt5/recipes-qt/qt5/qtsystems_git.bb
meta-qt5/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch [deleted file]
meta-qt5/recipes-qt/qt5/qttools-native_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qttools-native_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qttools-native_git.bb
meta-qt5/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch [moved from meta-qt5/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch with 93% similarity]
meta-qt5/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb
meta-qt5/recipes-qt/qt5/qtwayland.inc
meta-qt5/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch [moved from meta-qt5/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch with 100% similarity]
meta-qt5/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch [deleted file]
meta-qt5/recipes-qt/qt5/qtwayland_git.bb
meta-qt5/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtwebkit-examples_git.bb
meta-qt5/recipes-qt/qt5/qtwebkit.inc
meta-qt5/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtwebkit_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtwebkit_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtwebkit_git.bb
meta-qt5/recipes-qt/qt5/qtx11extras_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtx11extras_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtx11extras_git.bb
meta-qt5/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb [deleted file]
meta-qt5/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb [new file with mode: 0644]
meta-qt5/recipes-qt/qt5/qtxmlpatterns_git.bb