Update upstream source from tag 'upstream/3.3.3+dfsg1'

Update to upstream version '3.3.3+dfsg1'
with Debian dir 9a301fff4922aed2fec0c04c7d011947168c42f1

1 files changed, 7 insertions, 1 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/diff/diff_match_patch.cpp b/SQLiteStudio3/coreSQLiteStudio/diff/diff_match_patch.cpp
index aa5765a..176e919 100644
--- a/SQLiteStudio3/coreSQLiteStudio/diff/diff_match_patch.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/diff/diff_match_patch.cpp
@@ -2042,7 +2042,13 @@ QList<Patch> diff_match_patch::patch_fromText(const QString &textline) {
   if (textline.isEmpty()) {
     return patches;
   }
-  QStringList text = textline.split("\n", QString::SkipEmptyParts);
+  QStringList text = textline.split("\n",
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+                                    Qt::SkipEmptyParts
+#else
+                                    QString::SkipEmptyParts
+#endif
+                                    );
   Patch patch;
   QRegExp patchHeader("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@$");
   char sign;