[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy
From:       Laurent Montel <montel () kde ! org>
Date:       2008-08-21 10:33:30
Message-ID: 1219314810.524079.24827.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850361 by mlaurent:

Add patch for regression in qt4.4.x (Q3TextEdit doesn't display image)
Patch will be apply in qt4.4.2


 A             patches/0244-q3textedit-image.diff  
 M  +1 -1      patches/README  
 M  +2 -3      src/qt3support/other/q3mimefactory.cpp  


--- trunk/qt-copy/patches/README #850360:850361
@@ -1,5 +1,5 @@
 Please assign the numbers incrementally, and don't reuse them. The next one:
-#0244
+#0245
 
 This directory contains patches for Qt that haven't been accepted by TrollTech
 yet. All patches in this directory itself shouldn't make qt-copy incompatible
--- trunk/qt-copy/src/qt3support/other/q3mimefactory.cpp #850360:850361
@@ -182,9 +182,8 @@
         QByteArray mimetype("application/octet-stream");
         if (extensions.contains(e))
             mimetype = extensions[e].latin1();
-        QByteArray imgfmt = QImageReader::imageFormat(abs_name);
-        if (!imgfmt.isEmpty())
-            mimetype = "image/" + imgfmt.toLower();
+        if (!QImageReader::imageFormat(abs_name).isEmpty())
+            mimetype = "application/x-qt-image";
 
         QFile f(abs_name);
         if (f.open(QIODevice::ReadOnly) && f.size()) {
[prev in list] [next in list] [prev in thread] [next in thread]