r24968 by craig - Qt6: Also support 1.7.0.svn stories in 1.5.0 loader, for now

scribus-commit scribus-commit at lists.scribus.net
Wed Feb 23 20:37:51 UTC 2022


Author: craig
Date: Wed Feb 23 20:37:51 2022
New Revision: 24968

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24968
Log:
Qt6: Also support 1.7.0.svn stories in 1.5.0 loader, for now

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24968&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Wed Feb 23 20:37:51 2022
@@ -186,8 +186,10 @@
 	if (startElemPos < 0)
 		return false;
 	QRegularExpression regExp150("Version=\"1.5.[0-9]");
-	QRegularExpressionMatch match = regExp150.match(storyData.mid(startElemPos, 64));
-	return match.hasMatch();
+	QRegularExpression regExp170("Version=\"1.7.[0-9]");
+	QRegularExpressionMatch match150 = regExp150.match(storyData.mid(startElemPos, 64));
+	QRegularExpressionMatch match170 = regExp170.match(storyData.mid(startElemPos, 64));
+	return match150.hasMatch() | match170.hasMatch();
 }
 
 QIODevice* Scribus150Format::slaReader(const QString & fileName)




More information about the scribus-commit mailing list