diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 12:47:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 15:25:53 +0200 |
commit | 1496c6ba34bf95bce67504c72edace1bc2c0a64e (patch) | |
tree | b2f16ae4f756fcfd5b645d29c2a815af94cd89d9 /recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch | |
parent | f8b065ea1174dd1fa7d93359f6826bfc9d23174c (diff) | |
download | meta-qt5-1496c6ba34bf95bce67504c72edace1bc2c0a64e.tar.gz |
qtbase: refresh patches
* all patches applied in recipes should be also applied in
https://github.com/meta-qt5/qtbase branches to make it
easier to upgrade to new version without loosing any
patches
* apply:
0013-Disable-mkv8snapshot.patch
0014-enables-tslib-device-to-be-read-from-env-variable.patch
0015-qtbase-allow-build-of-examples.patch
also for git version, only
0016-configure-add-tslib-support.patch
is now 5.0.2 specific (similar patch already applied in stable branch)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch new file mode 100644 index 00000000..45a49a62 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 3d83f570e081e23a6cf6d0ccf57ad8db34c5ca3e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Sat, 25 May 2013 17:34:32 +0200 | ||
4 | Subject: [PATCH 15/15] qtbase: allow build of examples | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | this revert the following commit : | ||
10 | |||
11 | commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 | ||
12 | Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> | ||
13 | Date: Fri Dec 21 19:36:12 2012 +0100 | ||
14 | |||
15 | do not actually build examples in production builds | ||
16 | |||
17 | -developer-build enables an actual build of examples, based on the | ||
18 | assumption that developers want to test it (it can be still disabled | ||
19 | with -nomake examples). regular users otoh want only the examples | ||
20 | sources installed. | ||
21 | |||
22 | Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 | ||
23 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> | ||
24 | |||
25 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
26 | --- | ||
27 | mkspecs/features/qt_example_installs.prf | 8 -------- | ||
28 | 1 file changed, 8 deletions(-) | ||
29 | |||
30 | diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf | ||
31 | index 479a16a..ca1b0c7 100644 | ||
32 | --- a/mkspecs/features/qt_example_installs.prf | ||
33 | +++ b/mkspecs/features/qt_example_installs.prf | ||
34 | @@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) | ||
35 | allfiles -= doc | ||
36 | !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") | ||
37 | } | ||
38 | - | ||
39 | - # Do not actually build the examples in production builds with -prefix | ||
40 | - !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { | ||
41 | - TEMPLATE = aux | ||
42 | - CONFIG -= have_target qt staticlib dll | ||
43 | - SOURCES = | ||
44 | - INSTALLS -= target | ||
45 | - } | ||
46 | } | ||
47 | -- | ||
48 | 1.8.2.1 | ||
49 | |||