diff options
| author | Bernhard Walle <walle@corscience.de> | 2011-05-09 17:23:27 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-10 08:00:45 +0200 |
| commit | 8889b0a49241add542a26b09f5e188a00f46a8a6 (patch) | |
| tree | d085d3a0cb26318e1dcbb005e07f56f1d6ac83eb | |
| parent | 559844730ca18f6acd9411b248a3122867f43ff1 (diff) | |
| download | ptxdist-8889b0a49241add542a26b09f5e188a00f46a8a6.tar.gz ptxdist-8889b0a49241add542a26b09f5e188a00f46a8a6.tar.xz | |
qt: Fix build with gcc 4.6
This is the original patch from upstream
https://qt.gitorious.org/qt/qt/commit/f1bbb1648a9770f37ca39b8d68d6bd269dd06250
Signed-off-by: Bernhard Walle <walle@corscience.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch | 28 | ||||
| -rw-r--r-- | patches/qt-everywhere-opensource-src-4.6.3/series | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch b/patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch new file mode 100644 index 000000000..2ff882708 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.6.3/0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch @@ -0,0 +1,28 @@ +From: Bernhard Walle <walle@corscience.de> +Date: Mon, 9 May 2011 16:53:35 +0200 +Subject: [PATCH] Qualify ptrdiff_t's namespace in stltest configure test + +Originally from: +https://qt.gitorious.org/qt/qt/commit/f1bbb1648a9770f37ca39b8d68d6bd269dd06250 + +Signed-off-by: Bernhard Walle <walle@corscience.de> +--- + config.tests/unix/stl/stltest.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/unix/stl/stltest.cpp +index bfda2e3..191ec76 100644 +--- a/config.tests/unix/stl/stltest.cpp ++++ b/config.tests/unix/stl/stltest.cpp +@@ -69,7 +69,7 @@ class DummyIterator + public: + T *i; + typedef std::random_access_iterator_tag iterator_category; +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; + typedef T value_type; + typedef T *pointer; + typedef T &reference; +-- +1.7.5.1 + diff --git a/patches/qt-everywhere-opensource-src-4.6.3/series b/patches/qt-everywhere-opensource-src-4.6.3/series index fd6385c10..fdd460f2c 100644 --- a/patches/qt-everywhere-opensource-src-4.6.3/series +++ b/patches/qt-everywhere-opensource-src-4.6.3/series @@ -8,4 +8,5 @@ 0007-Hack-disable-Wl-gc-sections-on-ppc.patch 0008-qmake-make-sure-local-include-dirs-come-first.patch 0009-phonon-fix-colors-for-video-on-qgraphicsview.patch -# 4850bc496f565516b8725a1e3a1b3a37 - git-ptx-patches magic +0010-Qualify-ptrdiff_t-s-namespace-in-stltest-configure-t.patch +# 99a3b72c0e064df9b4f0975bdab09508 - git-ptx-patches magic |