diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-11-02 19:06:14 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-12 15:01:37 +0100 |
commit | c908fe4ebd5a04813be0b83c173fae182bb22728 (patch) | |
tree | ac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch | |
parent | 775d77e482f1ea203c78003cccd2547075fd720f (diff) | |
download | meta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz |
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
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index 5c8f8189..00000000 --- a/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From d4f6f5afa36d87d991051f0079f129d2682455d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 | ||
4 | Subject: [PATCH 09/22] qt_module: Fix paths in .prl files | ||
5 | |||
6 | * qmake does not prefix them with QT_SYSROOT when using them | ||
7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE | ||
8 | variable, which is unsafe for cross-compilation | ||
9 | * writting QT_SYSROOT in .prl files is dangerous for sstate when | ||
10 | builds are in different directories, so we need | ||
11 | SSTATE_SCAN_FILES += "*.pri *.prl" | ||
12 | to make them relocateble | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | --- | ||
18 | mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- | ||
19 | 1 file changed, 17 insertions(+), 11 deletions(-) | ||
20 | |||
21 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | ||
22 | index e85c2a8..7fcfcfe 100644 | ||
23 | --- a/mkspecs/features/qt_module.prf | ||
24 | +++ b/mkspecs/features/qt_module.prf | ||
25 | @@ -144,17 +144,23 @@ unix|win32-g++* { | ||
26 | pkgconfig_include_replace.replace = "\$$\\{includedir}" | ||
27 | pkgconfig_lib_replace.match = $$rplbase/lib | ||
28 | pkgconfig_lib_replace.replace = "\$$\\{libdir}" | ||
29 | - include_replace.match = $$rplbase/include | ||
30 | - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] | ||
31 | - lib_replace.match = $$rplbase/lib | ||
32 | - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] | ||
33 | - lafile_replace.match = $$rplbase | ||
34 | - lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" | ||
35 | - | ||
36 | - !isEmpty(SYSROOT): \ | ||
37 | - rplbase = $$[SYSROOT] \ | ||
38 | - lafile_replace.match = $$rplbase \ | ||
39 | - lafile_replace.replace = "=" \ | ||
40 | + !exists($$[QT_SYSROOT]) { | ||
41 | + include_replace.match = $$rplbase/include | ||
42 | + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] | ||
43 | + lib_replace.match = $$rplbase/lib | ||
44 | + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] | ||
45 | + lafile_replace.match = $$rplbase | ||
46 | + lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" | ||
47 | + } else { | ||
48 | + # include_replace and lib_replace are duplicate, but we don't want to | ||
49 | + # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional | ||
50 | + include_replace.match = $$rplbase | ||
51 | + include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] | ||
52 | + lib_replace.match = $$rplbase | ||
53 | + lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] | ||
54 | + lafile_replace.match = $$rplbase | ||
55 | + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" | ||
56 | + } | ||
57 | |||
58 | QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace | ||
59 | QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace | ||
60 | -- | ||
61 | 1.8.3.1 | ||
62 | |||