diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-21 23:47:18 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-26 20:13:41 +0100 |
commit | 05a216f073f0b7d2691aee5fa2a29cd2f38fce70 (patch) | |
tree | 3351f0dc4cdf487aa652fcaf2107623baa7fb015 | |
parent | c2c4089a61e62822ae4afff1996aa3591f4cdc9e (diff) | |
download | meta-opie-05a216f073f0b7d2691aee5fa2a29cd2f38fce70.tar.gz |
qte: fix compiler error with gcc 4.7+
Adds another fix for local method call without this->.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r-- | recipes-qt/qte/qte-2.3.10/gcc4.patch | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/recipes-qt/qte/qte-2.3.10/gcc4.patch b/recipes-qt/qte/qte-2.3.10/gcc4.patch index 550effd..1c49ab1 100644 --- a/recipes-qt/qte/qte-2.3.10/gcc4.patch +++ b/recipes-qt/qte/qte-2.3.10/gcc4.patch @@ -1,11 +1,26 @@ +From abaea74cc1ab0309bc7d68d7894c2d3a7609522e Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Wed, 21 Aug 2013 21:13:39 +0100 +Subject: [PATCH 1/2] tools: fix compilation failure with modern gcc -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# +Need to use this-> with local methods. ---- qt-2.3.10/src/tools/qvaluestack.h~gcc4 2005-01-23 15:00:47.000000000 +0100 -+++ qt-2.3.10/src/tools/qvaluestack.h 2006-03-19 02:32:56.000000000 +0100 -@@ -54,7 +54,7 @@ +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + src/tools/qvaluestack.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/qvaluestack.h b/src/tools/qvaluestack.h +index 44f250f..926a269 100644 +--- a/src/tools/qvaluestack.h ++++ b/src/tools/qvaluestack.h +@@ -49,12 +49,12 @@ class Q_EXPORT QValueStack : public QValueList<T> + public: + QValueStack() {} + ~QValueStack() {} +- void push( const T& d ) { append(d); } ++ void push( const T& d ) { this->append(d); } + T pop() { T elem( this->last() ); if ( !this->isEmpty() ) @@ -14,3 +29,6 @@ return elem; } T& top() { return this->last(); } +-- +1.8.1.2 + |