Author: jghali
Date: Mon Jan 31 21:28:37 2022
New Revision: 24877
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24877
Log:
Qt6: Build fixes
Modified:
trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24877&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp Mon Jan 31
21:28:37 2022
@@ -168,7 +168,7 @@
++m_buf->position;
continue;
}
- data += m_buf->buf[m_buf->position];
+ data += QChar(m_buf->buf[m_buf->position]);
++m_buf->position;
}
}
Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24877&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp Mon Jan 31
21:28:37 2022
@@ -1617,7 +1617,7 @@
QString dataType = fname.left(startData);
fname.remove(0, startData + 1);
QByteArray ba;
- ba.append(fname);
+ ba.append(fname.toLatin1());
if (dataType.contains("base64"))
ba = QByteArray::fromBase64(ba);
QTemporaryFile *tempFile = new
QTemporaryFile(QDir::tempPath() + "/scribus_temp_svg_XXXXXX.png");
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24877&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Mon Jan 31
21:28:37 2022
@@ -1374,7 +1374,7 @@
// TODO: investigation why some test case need -2. (size of font in
logical point)
int fontSize = (params[0] != 0) ? (qAbs(params[0]) - 2) : 12;
handle->font.setPixelSize( fontSize );
- handle->font.setWeight( (params[ 4 ] >> 3) );
+ handle->font.setWeight( (QFont::Weight) ((params[ 4 ] >> 3)) );
handle->font.setItalic( (params[ 5 ] & 0x01) );
handle->font.setUnderline( (params[ 5 ] & 0x100) );
handle->font.setStrikeOut( (params[ 6 ] & 0x01) );
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
