- rel 7; fix QTextDocument::toHtml regression

diff --git a/qt4-git.patch b/qt4-git.patch
new file mode 100644 (file)
index 0000000..b32d686
--- /dev/null
+++ b/qt4-git.patch
@@ -0,0 +1,31 @@
+commit 3a13f3f16e45288f7717dcfe3e968e5cccc05d90
+Author: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
+Date:   Wed Sep 12 12:13:35 2012 +0200
+
+    Fix regression in QTextDocument::toHtml() with font pixel size
+    
+    Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
+    missing a attributesEmitted=true which caused the output from
+    toHtml() to sometimes be invalid when using pixel sizes to
+    specify the font size.
+    
+    This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409
+    from Qt 5.
+    
+    Task-number: QTBUG-25778
+    Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
+    Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
+
+diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
+index a1cae54..5d8ff97 100644
+--- a/src/gui/text/qtextdocument.cpp
++++ b/src/gui/text/qtextdocument.cpp
+@@ -2187,6 +2187,7 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
+         html += QLatin1String(" font-size:");
+         html += QString::number(format.intProperty(QTextFormat::FontPixelSize));
+         html += QLatin1String("px;");
++        attributesEmitted = true;
+     }
+ 
+     if (format.hasProperty(QTextFormat::FontWeight)
+

diff --git a/qt4.spec b/qt4.spec
index 032c0224e8058944775c65acc3abf30d968675d9..2b4c32f21c9ef38cdb410ad0ef2b2828100794e7 100644 (file)
--- a/qt4.spec
+++ b/qt4.spec
@@ -53,7 +53,7 @@ Summary(pl.UTF-8):    Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):  Estrutura para rodar aplicações GUI Qt
 Name:          qt4
 Version:       4.8.3
-Release:       6
+Release:       7
 License:       LGPL v2.1 or GPL v3.0
 Group:         X11/Libraries
 Source0:       http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -82,6 +82,7 @@ Patch11:      moc-boost148.patch
 Patch12:       fix-crash-in-assistant.patch
 Patch13:       improve-cups-support.patch
 Patch14:       undo-fix-jit-crash-on-x86_64.patch
+Patch15:       qt4-git.patch
 URL:           http://qt.nokia.com/
 %{?with_ibase:BuildRequires:   Firebird-devel}
 BuildRequires: Mesa-libOpenVG-devel
@@ -1457,6 +1458,7 @@ Programas exemplo para o Qt versão.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1 -R
+%patch15 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
        mkspecs/common/linux.conf