qt: fix the patch name for qt-4.5.3 version
authorFrancisco Gonzalez Morell <gzmorell@gmail.com>
Tue, 23 Feb 2010 23:01:39 +0000 (00:01 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 23 Feb 2010 23:40:20 +0000 (00:40 +0100)
Signed-off-by: Francisco Gonzalez Morell <gzmorell@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
CHANGES
package/qt/qt-4.5.2-fix-qt-zlib-build.patch [deleted file]
package/qt/qt-4.5.3-fix-qt-zlib-build.patch [new file with mode: 0644]

diff --git a/CHANGES b/CHANGES
index d308e938c319b96f8e37cb5ea9818ffca581d3c7..ec71d4ece211a27462676b928608e3b39c5c2172 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+2010.02, Not yet released:
+
+       Fixes all over the tree.
+
+       Updated/fixed packages: qt
+
 2010.02-rc2, Released February 23th, 2010:
 
        Fixes all over the tree and new features.
diff --git a/package/qt/qt-4.5.2-fix-qt-zlib-build.patch b/package/qt/qt-4.5.2-fix-qt-zlib-build.patch
deleted file mode 100644 (file)
index b191cc7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-When QT is compiled in qt-zlib mode, compilation of
-src/gui/painting/qprintengine_pdf.cpp fails because zlib.h is not
-found. The following patch adds the internal QT zlib directory to the
-include path to fix this issue.
-
----
- src/gui/painting/painting.pri |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.2.orig/src/gui/painting/painting.pri
-+++ qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri
-@@ -367,3 +367,6 @@
-         SOURCES += painting/qwindowsurface_d3d.cpp
- }
-+contains(QT_CONFIG, zlib) {
-+   INCLUDEPATH += ../3rdparty/zlib
-+}
diff --git a/package/qt/qt-4.5.3-fix-qt-zlib-build.patch b/package/qt/qt-4.5.3-fix-qt-zlib-build.patch
new file mode 100644 (file)
index 0000000..47fc92f
--- /dev/null
@@ -0,0 +1,20 @@
+When QT is compiled in qt-zlib mode, compilation of
+src/gui/painting/qprintengine_pdf.cpp fails because zlib.h is not
+found. The following patch adds the internal QT zlib directory to the
+include path to fix this issue.
+
+---
+ src/gui/painting/painting.pri |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.3.orig/src/gui/painting/painting.pri
++++ qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri
+@@ -367,3 +367,6 @@
+         SOURCES += painting/qwindowsurface_d3d.cpp
+ }
++contains(QT_CONFIG, zlib) {
++   INCLUDEPATH += ../3rdparty/zlib
++}