qtbase-5.0.2: fix v8 and allow build of examples
- fix v8 segfault (at least on armv7) - examples are only provided as sources but in our case, binaries are more interesting for user to test the features on the target. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
440e7829dc
commit
712d678c3a
|
@ -0,0 +1,49 @@
|
|||
From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
|
||||
Date: Sat, 25 May 2013 17:34:32 +0200
|
||||
Subject: [PATCH] qtbase: allow build of examples
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
this revert the following commit :
|
||||
|
||||
commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
|
||||
Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
||||
Date: Fri Dec 21 19:36:12 2012 +0100
|
||||
|
||||
do not actually build examples in production builds
|
||||
|
||||
-developer-build enables an actual build of examples, based on the
|
||||
assumption that developers want to test it (it can be still disabled
|
||||
with -nomake examples). regular users otoh want only the examples
|
||||
sources installed.
|
||||
|
||||
Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
|
||||
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
||||
|
||||
Signed-off-by: Eric Bénard <eric@eukrea.com>
|
||||
---
|
||||
mkspecs/features/qt_example_installs.prf | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
|
||||
index 479a16a..ca1b0c7 100644
|
||||
--- a/mkspecs/features/qt_example_installs.prf
|
||||
+++ b/mkspecs/features/qt_example_installs.prf
|
||||
@@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
|
||||
allfiles -= doc
|
||||
!isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
|
||||
}
|
||||
-
|
||||
- # Do not actually build the examples in production builds with -prefix
|
||||
- !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) {
|
||||
- TEMPLATE = aux
|
||||
- CONFIG -= have_target qt staticlib dll
|
||||
- SOURCES =
|
||||
- INSTALLS -= target
|
||||
- }
|
||||
}
|
||||
--
|
||||
1.8.1.4
|
||||
|
|
@ -3,5 +3,9 @@ require ${PN}.inc
|
|||
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
SRC_URI += "file://0004-Disable-mkv8snapshot.patch \
|
||||
file://0001-qtbase-allow-build-of-examples.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0"
|
||||
SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8"
|
||||
|
|
Loading…
Reference in New Issue