qt5script: Check for QtGui before building the examples
PATCH 1/1 qt5script: Check for QtGui before building the examples
Adding an upstream patch to fix an autobuild failure.
qsdbg and marshal examples need QtGui module. If QtGui is not installed they fail to compile.
Upstream commit:
https://github.com/qtproject/qtscript/commit/e4453c92ee41943a3a1d67a725804a44e747f64e
Fixes:
http://autobuild.buildroot.net/results/0e6/0e63bc604f3ec422996eb0f5fd92f4437954ca04/
Signed-off-by Vicente Olivert Riera <[email protected]>
--- ...ck-for-QtGui-before-building-the-examples.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch
package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch new file +46 -0
@@ -0,0 +1,46 @@ +qt5script: Check for QtGui before building the examples +Signed-off-by: Vicente Olivert Riera <[email protected]> + +From e4453c92ee41943a3a1d67a725804a44e747f64e Mon Sep 17 00:00:00 2001 +From: Vicente Olivert Riera <[email protected]> +Date: Wed, 16 Apr 2014 12:19:17 +0100 +Subject: [PATCH] qtscript: Check for QtGui before building the examples + +qsdbg and marshal examples need QtGui module. If QtGui is not installed +they fail to compile. + +Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41 +Reviewed-by: Vicente Olivert Riera <[email protected]> +Reviewed-by: Allan Sandfeld Jensen <[email protected]> +--- + examples/script/script.pro | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/examples/script/script.pro b/examples/script/script.pro +index 3e1eae6..cc97233 100644 +--- a/examples/script/script.pro ++++ b/examples/script/script.pro +@@ -1,7 +1,7 @@ + TEMPLATE = subdirs +-SUBDIRS = \ +- customclass \ +- qsdbg ++SUBDIRS = customclass ++ ++qtHaveModule(gui): SUBDIRS += qsdbg + + qtHaveModule(widgets) { + SUBDIRS += \ +@@ -22,8 +22,7 @@ qtHaveModule(widgets) { + } + + !wince { +- SUBDIRS += \ +- marshal ++ qtHaveModule(gui): SUBDIRS += marshal + } + + maemo5: CONFIG += qt_example +-- +1.9.1 +
Signature · 1 line
1.7.1
Thomas Petazzoni
AppliedPATCH 1/1 qt5script: Check for QtGui before building the examples
Dear Vicente Olivert Riera,
Quoted 8 lines · Vicente Olivert Riera
Adding an upstream patch to fix an autobuild failure.
qsdbg and marshal examples need QtGui module. If QtGui is not installed they fail to compile.
Upstream commit:
https://github.com/qtproject/qtscript/commit/e4453c92ee41943a3a1d67a725804a44e747f64e
Quoted 8 lines
Fixes:
http://autobuild.buildroot.net/results/0e6/0e63bc604f3ec422996eb0f5fd92f4437954ca04/Signed-off-by Vicente Olivert Riera <[email protected]>--- ...ck-for-QtGui-before-building-the-examples.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) create mode 100644 package/qt5/qt5script/qt5script-0001-Check-for-QtGui-before-building-the-examples.patch
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com