diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-08 13:21:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:24 +0000 |
| commit | 76c17122024e49fdc84e237b9d5dde6525778d6b (patch) | |
| tree | 0369711d3e9fce2eae44a7fb8be583b911fc9e19 /meta/recipes-qt/qt4/qt-4.8.0.inc | |
| parent | cf87669e7c1d228fa26212b7747a5a8018f04b96 (diff) | |
| download | poky-76c17122024e49fdc84e237b9d5dde6525778d6b.tar.gz | |
qt4: fix compile error in Qt 4.8.0 with gcc 4.6
Ensure the Qt configure script can can detect the compiler correctly as
g++. This fixes the following compile error with gcc 4.6:
./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
(From OE-Core rev: f29bb5b2a99ecef46e5570bf3336e9680c0b6705)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.0.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc index 2addbb211f..532f1ff40c 100644 --- a/meta/recipes-qt/qt4/qt-4.8.0.inc +++ b/meta/recipes-qt/qt4/qt-4.8.0.inc | |||
| @@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. | |||
| 14 | file://fix-translations.patch \ | 14 | file://fix-translations.patch \ |
| 15 | file://add_nostrip_for_debug_packages.diff \ | 15 | file://add_nostrip_for_debug_packages.diff \ |
| 16 | file://qmake_cxx_eval.patch \ | 16 | file://qmake_cxx_eval.patch \ |
| 17 | file://configure_oe_compiler.patch \ | ||
| 17 | file://g++.conf \ | 18 | file://g++.conf \ |
| 18 | file://linux.conf \ | 19 | file://linux.conf \ |
| 19 | " | 20 | " |