r24851 by jghali - Qt6: Build fixes

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 30 03:43:25 UTC 2022


Author: jghali
Date: Sun Jan 30 03:43:25 2022
New Revision: 24851

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

Modified:
    trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
    trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
    trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h
    trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
    trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
    trunk/Scribus/scribus/plugins/plugins_pch.h
    trunk/Scribus/scribus/plugins/short-words/configuration.h
    trunk/Scribus/scribus/plugins/short-words/swdialog.cpp
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/scfonts.h
    trunk/Scribus/scribus/scxmlstreamwriter.h
    trunk/Scribus/win32/msvc2019/scriptplugin/scriptplugin.vcxproj
    trunk/Scribus/win32/msvc2019/shortwords/shortwords.vcxproj

Modified: trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp	Sun Jan 30 03:43:25 2022
@@ -7,6 +7,7 @@
 
 #include <QSortFilterProxyModel>
 #include <QHeaderView>
+#include <QRegularExpression>
 
 #include "fontpreview.h"
 #include "prefsfile.h"
@@ -159,15 +160,16 @@
 	fontList->blockSignals(true);
 	QString s(searchEdit->text());
 	if (s.isEmpty())
-		m_proxyModel->setFilterRegExp(QRegExp("*",
-											Qt::CaseInsensitive,
-											QRegExp::Wildcard));
+	{
+		QString wildcardExp = QRegularExpression::wildcardToRegularExpression(QString("*"));
+		QRegularExpression regExp(wildcardExp, QRegularExpression::CaseInsensitiveOption);
+		m_proxyModel->setFilterRegularExpression(regExp);
+	}
 	else
 	{
-		QRegExp regExp(QString("*%1*").arg(s),
-					   Qt::CaseInsensitive,
-					   QRegExp::Wildcard);
-		m_proxyModel->setFilterRegExp(regExp);
+		QString wildcardExp = QRegularExpression::wildcardToRegularExpression(QString("*%1*").arg(s));
+		QRegularExpression regExp(wildcardExp, QRegularExpression::CaseInsensitiveOption);
+		m_proxyModel->setFilterRegularExpression(regExp);
 	}
 	fontList->resizeColumnsToContents();
 	fontList->blockSignals(false);

Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp	Sun Jan 30 03:43:25 2022
@@ -595,7 +595,7 @@
 {
 #if defined(_WIN32)
 	QString fname = QDir::toNativeSeparators(filename);
-	QByteArray fn = (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? fname.toUtf8() : fname.toLocal8Bit();
+	QByteArray fn = fname.toUtf8();
 #else
 	QByteArray fn(filename.toLocal8Bit());
 #endif

Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h	(original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.h	Sun Jan 30 03:43:25 2022
@@ -7,12 +7,13 @@
 #ifndef PDBIM_H
 #define PDBIM_H
 
+#include <QString>
+#include <QStringList>
+
 #include "pluginapi.h"
 
 class gtWriter;
 class gtParagraphStyle;
-class QString;
-class QStringList;
 
 extern "C" PLUGIN_API void GetText(const QString& filename, const QString& encoding, bool textOnly, gtWriter *writer);
 

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp	Sun Jan 30 03:43:25 2022
@@ -250,7 +250,7 @@
 	sreader->parse(fileName);
 #if defined(_WIN32)
 	QString fname = QDir::toNativeSeparators(fileName);
-	QByteArray fn = (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? fname.toUtf8() : fname.toLocal8Bit();
+	QByteArray fn = fname.toUtf8();
 #else
 	QByteArray fn(fileName.toLocal8Bit());
 #endif

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp	Sun Jan 30 03:43:25 2022
@@ -276,11 +276,11 @@
 			currentStyle->getFont()->setHscale(static_cast<int>(getSize(attrValue, -1.0)));
 		else if ((attrName == "style:text-position") &&
 				 (((attrValue).indexOf("sub") != -1) ||
-				  (((attrValue).at(0) == "-") && ((attrValue).at(0) != "0"))))
+				  (((attrValue).at(0) == '-') && ((attrValue).at(0) != '0'))))
 			currentStyle->getFont()->toggleEffect(SUBSCRIPT);
 		else if ((attrName == "style:text-position") &&
 				 (((attrValue).indexOf("super") != -1) ||
-				  (((attrValue).at(0) != "-") && ((attrValue).at(0) != "0"))))
+				  (((attrValue).at(0) != '-') && ((attrValue).at(0) != '0'))))
 			currentStyle->getFont()->toggleEffect(SUPERSCRIPT);
 		else if ((attrName == "fo:margin-top") && (pstyle != nullptr))
 			pstyle->setSpaceAbove(getSize(attrValue));
@@ -486,7 +486,7 @@
 {
 #if defined(_WIN32)
 	QString fname = QDir::toNativeSeparators(fileName);
-	QByteArray fn = (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? fname.toUtf8() : fname.toLocal8Bit();
+	QByteArray fn = fname.toUtf8();
 #else
 	QByteArray fn(fileName.toLocal8Bit());
 #endif

Modified: trunk/Scribus/scribus/plugins/plugins_pch.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/plugins_pch.h
==============================================================================
--- trunk/Scribus/scribus/plugins/plugins_pch.h	(original)
+++ trunk/Scribus/scribus/plugins/plugins_pch.h	Sun Jan 30 03:43:25 2022
@@ -1,65 +1,65 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info at nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info at nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
- * This is a precompiled header file for use in Xcode / Mac GCC /
- * GCC >= 3.4 / VC to greatly speed the building of Qt. It may also be
- * of use to people developing their own project, but it is probably
- * better to define your own header.  Use of this header is currently
- * UNSUPPORTED.
- */
- 
- /*
- * Additions and adaptation for Scribus by Jean Ghali
- */
-
-// from corelib/global/qt_pch.h
-#if defined __cplusplus
-#include <qglobal.h>
-
-#ifdef Q_WS_WIN
-# define _POSIX_
-# include <limits.h>
-# undef _POSIX_
-#endif
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info at nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info at nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * This is a precompiled header file for use in Xcode / Mac GCC /
+ * GCC >= 3.4 / VC to greatly speed the building of Qt. It may also be
+ * of use to people developing their own project, but it is probably
+ * better to define your own header.  Use of this header is currently
+ * UNSUPPORTED.
+ */
+ 
+ /*
+ * Additions and adaptation for Scribus by Jean Ghali
+ */
+
+// from corelib/global/qt_pch.h
+#if defined __cplusplus
+#include <qglobal.h>
+
+#ifdef Q_WS_WIN
+# define _POSIX_
+# include <limits.h>
+# undef _POSIX_
+#endif
 
 #include <QCoreApplication>
 #include <QList>
@@ -67,29 +67,29 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QTextCodec>
-
-#include <QApplication>
-#include <QBitmap>
-#include <QBoxLayout>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCursor>
-#include <QEvent>
-#include <QGridLayout>
-#include <QImage>
-#include <QLayout>
-#include <QPainter>
-#include <QPixmap>
-#include <QTransform>
-#include <QWidget>
-
-#include <stdlib.h>
-
-#include "pageitem.h"
-#include "scribus.h"
-#include "scribuscore.h"
-#include "scribusdoc.h"
-#include "scribusview.h"
-
-#endif
+#include <QTextCodec>
+
+#include <QApplication>
+#include <QBitmap>
+#include <QBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QCursor>
+#include <QEvent>
+#include <QGridLayout>
+#include <QImage>
+#include <QLayout>
+#include <QPainter>
+#include <QPixmap>
+#include <QTransform>
+#include <QWidget>
+
+#include <stdlib.h>
+
+#include "pageitem.h"
+#include "scribus.h"
+#include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
+
+#endif

Modified: trunk/Scribus/scribus/plugins/short-words/configuration.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/short-words/configuration.h
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/configuration.h	(original)
+++ trunk/Scribus/scribus/plugins/short-words/configuration.h	Sun Jan 30 03:43:25 2022
@@ -8,9 +8,9 @@
 #define _SCRIBUS_SHORTCFG_H_
 
 #include <QObject>
+#include <QStringList>
 
 class QString;
-class QStringList;
 class PrefsContext;
 
 /*! \brief This is the Scribus Short Words configuration specification.

Modified: trunk/Scribus/scribus/plugins/short-words/swdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/plugins/short-words/swdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/swdialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/short-words/swdialog.cpp	Sun Jan 30 03:43:25 2022
@@ -31,6 +31,7 @@
 #include <QPushButton>
 #include <QGroupBox>
 #include <QRadioButton>
+#include <QStringList>
 #include <QToolTip>
 
 #include "commonstrings.h"

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp	(original)
+++ trunk/Scribus/scribus/scfonts.cpp	Sun Jan 30 03:43:25 2022
@@ -91,21 +91,22 @@
 	SCFontsIterator it( *this );
 	for ( ; it.hasNext(); it.next())
 	{
-		if (it.current().usable())
-		{
-			if (fontMap.contains(it.current().family()))
-			{
-				if (!fontMap[it.current().family()].contains(it.current().style()))
-				{
-					fontMap[it.current().family()].append(it.current().style());
-				}
-			}
-			else
-			{
-				QStringList styles;
-				styles.append(it.current().style());
-				fontMap.insert(it.current().family(), styles);
-			}
+		ScFace& currentFace = it.current();
+		if (!currentFace.usable())
+			continue;
+
+		if (fontMap.contains(currentFace.family()))
+		{
+			if (!fontMap[currentFace.family()].contains(currentFace.style()))
+			{
+				fontMap[currentFace.family()].append(currentFace.style());
+			}
+		}
+		else
+		{
+			QStringList styles;
+			styles.append(it.current().style());
+			fontMap.insert(it.current().family(), styles);
 		}
 	}
 }

Modified: trunk/Scribus/scribus/scfonts.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/scfonts.h
==============================================================================
--- trunk/Scribus/scribus/scfonts.h	(original)
+++ trunk/Scribus/scribus/scfonts.h	Sun Jan 30 03:43:25 2022
@@ -95,7 +95,7 @@
 	ScFace& current()          { return *m_it; }
 	QString currentKey() const { return m_it.key(); }
 	bool hasNext()       const { return m_it != m_end_it; }
-	ScFace& next()             { ++m_it; return current(); }
+	auto next()                { ++m_it; return m_it; }
 
 private:
 	QMap<QString, ScFace>::Iterator m_it;

Modified: trunk/Scribus/scribus/scxmlstreamwriter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/scribus/scxmlstreamwriter.h
==============================================================================
--- trunk/Scribus/scribus/scxmlstreamwriter.h	(original)
+++ trunk/Scribus/scribus/scxmlstreamwriter.h	Sun Jan 30 03:43:25 2022
@@ -9,6 +9,7 @@
 
 #include "scribusapi.h"
 
+#include <cstdint>
 #include <QByteArray>
 #include <QString>
 #include <QXmlStreamWriter>
@@ -20,9 +21,12 @@
 	ScXmlStreamWriter(QByteArray* array) : QXmlStreamWriter(array) {}
 	ScXmlStreamWriter(QIODevice* device) : QXmlStreamWriter(device) {}
 	ScXmlStreamWriter(QString*   string) : QXmlStreamWriter(string) {}
+
 	void writeAttribute(const QString & name, const QString & value) { QXmlStreamWriter::writeAttribute(name, value); }
 	void writeAttribute(const QString & name, int value)    { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
+	void writeAttribute(const QString & name, int64_t value)    { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 	void writeAttribute(const QString & name, uint value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
+	void writeAttribute(const QString & name, uint64_t value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 	void writeAttribute(const QString & name, double value) { QXmlStreamWriter::writeAttribute(name, QString::number(value, 'g', 15)); }
 };
 

Modified: trunk/Scribus/win32/msvc2019/scriptplugin/scriptplugin.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/win32/msvc2019/scriptplugin/scriptplugin.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2019/scriptplugin/scriptplugin.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2019/scriptplugin/scriptplugin.vcxproj	Sun Jan 30 03:43:25 2022
@@ -96,7 +96,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -124,7 +124,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +153,7 @@
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtNetwork;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include\QtXml;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);$(PYTHON3_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

Modified: trunk/Scribus/win32/msvc2019/shortwords/shortwords.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24851&path=/trunk/Scribus/win32/msvc2019/shortwords/shortwords.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2019/shortwords/shortwords.vcxproj	(original)
+++ trunk/Scribus/win32/msvc2019/shortwords/shortwords.vcxproj	Sun Jan 30 03:43:25 2022
@@ -96,7 +96,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;and=&&;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -124,7 +124,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;and=&&;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -153,7 +153,7 @@
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;and=&&;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\..\scribus;..\..\..\scribus\ui;$(QT6_DIR)\include\QtCore;$(QT6_DIR)\include\QtCore5Compat;$(QT6_DIR)\include\QtGui;$(QT6_DIR)\include\QtWebKit;$(QT6_DIR)\include\QtWebKitWidgets;$(QT6_DIR)\include\QtWidgets;$(QT6_DIR)\include;$(CAIRO_INCLUDE_DIR);$(FREETYPE_INCLUDE_DIR);$(ICU_INCLUDE_DIR);$(LCMS_INCLUDE_DIR);$(LIBJPEG_INCLUDE_DIR);$(LIBTIFF_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_USE_MATH_DEFINES;_USRDLL;_WINDOWS;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO;and=&&;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>




More information about the scribus-commit mailing list