r24841 by craig - Qt6: Build fixes

[scribus-commit]

Author: craig
Date: Sat Jan 29 23:00:54 2022
New Revision: 24841

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24841
Log:
Qt6: Build fixes

Modified:
    trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
    trunk/Scribus/scribus/scribusXml.h
    trunk/Scribus/scribus/sctextstream.h
    trunk/Scribus/scribus/ui/outputpreview_pdf.cpp
    trunk/Scribus/scribus/ui/outputpreview_ps.cpp

Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24841&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	(original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp	Sat Jan 29 23:00:54 2022
@@ -5,6 +5,8 @@
 for which a new license (GPL+exception) is in place.
 */
 #include "scimgdataloader.h"
+
+#include <QIODevice>
 
 ScImgDataLoader::ScImgDataLoader()
 {

Modified: trunk/Scribus/scribus/scribusXml.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24841&path=/trunk/Scribus/scribus/scribusXml.h
==============================================================================
--- trunk/Scribus/scribus/scribusXml.h	(original)
+++ trunk/Scribus/scribus/scribusXml.h	Sat Jan 29 23:00:54 2022
@@ -15,8 +15,7 @@
 #ifndef _SCRIBUSXML_H
 #define _SCRIBUSXML_H
 
-#include <QDomDocument>
-#include <QDomElement>
+
 #include <QList>
 #include <QProgressBar>
 

Modified: trunk/Scribus/scribus/sctextstream.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24841&path=/trunk/Scribus/scribus/sctextstream.h
==============================================================================
--- trunk/Scribus/scribus/sctextstream.h	(original)
+++ trunk/Scribus/scribus/sctextstream.h	Sat Jan 29 23:00:54 2022
@@ -13,6 +13,7 @@
 #ifndef SCTEXTSTREAM_H
 #define SCTEXTSTREAM_H
 
+#include <QIODevice>
 #include <QString>
 #include <QTextStream>
 

Modified: trunk/Scribus/scribus/ui/outputpreview_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24841&path=/trunk/Scribus/scribus/ui/outputpreview_pdf.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreview_pdf.cpp	(original)
+++ trunk/Scribus/scribus/ui/outputpreview_pdf.cpp	Sat Jan 29 23:00:54 2022
@@ -1103,7 +1103,7 @@
 
 	if (m_optionsUi->enableCMYK->isChecked())
 		m_previewLabel->setPixmap(createPreview(m_currentPage, qRound(72 * m_scaleFactor)));
-	m_previewLabel->resize(m_previewLabel->pixmap()->size());
+	m_previewLabel->resize(m_previewLabel->pixmap().size());
 }
 
 void OutputPreview_PDF::toggleAllFromHeader()
@@ -1116,7 +1116,7 @@
 
 	if (m_optionsUi->enableCMYK->isChecked())
 		m_previewLabel->setPixmap(createPreview(m_currentPage, qRound(72 * m_scaleFactor)));
-	m_previewLabel->resize(m_previewLabel->pixmap()->size());
+	m_previewLabel->resize(m_previewLabel->pixmap().size());
 }
 
 void OutputPreview_PDF::toggleCMYK()
@@ -1144,7 +1144,7 @@
 	}
 	if (m_optionsUi->enableCMYK->isChecked())
 		m_previewLabel->setPixmap(createPreview(m_currentPage, qRound(72 * m_scaleFactor)));
-	m_previewLabel->resize(m_previewLabel->pixmap()->size());
+	m_previewLabel->resize(m_previewLabel->pixmap().size());
 }
 
 void OutputPreview_PDF::imageLoadError(QPixmap &pixmap)

Modified: trunk/Scribus/scribus/ui/outputpreview_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24841&path=/trunk/Scribus/scribus/ui/outputpreview_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outputpreview_ps.cpp	(original)
+++ trunk/Scribus/scribus/ui/outputpreview_ps.cpp	Sat Jan 29 23:00:54 2022
@@ -963,7 +963,7 @@
 
 	if (m_optionsUi->enableCMYK->isChecked())
 		m_previewLabel->setPixmap(createPreview(m_currentPage, qRound(72 * m_scaleFactor)));
-	m_previewLabel->resize(m_previewLabel->pixmap()->size());
+	m_previewLabel->resize(m_previewLabel->pixmap().size());
 }
 
 void OutputPreview_PS::toggleAllFromHeader()
@@ -976,7 +976,7 @@
 
 	if (m_optionsUi->enableCMYK->isChecked())
 		m_previewLabel->setPixmap(createPreview(m_currentPage, qRound(72 * m_scaleFactor)));
-	m_previewLabel->resize(m_previewLabel->pixmap()->size());
+	m_previewLabel->resize(m_previewLabel->pixmap().size());
 }
 
 void OutputPreview_PS::toggleCMYK()
@@ -1004,7 +1004,7 @@
 	}
 	if (m_optionsUi->enableCMYK->isChecked())
 		m_previewLabel->setPixmap(createPreview(m_currentPage, qRound(72 * m_scaleFactor)));
-	m_previewLabel->resize(m_previewLabel->pixmap()->size());
+	m_previewLabel->resize(m_previewLabel->pixmap().size());
 }
 
 void OutputPreview_PS::imageLoadError(QPixmap &pixmap)