Author: jghali
Date: Sun Jan 30 00:58:27 2022
New Revision: 24848
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24848
Log:
Qt6: Build fixes
Modified:
trunk/Scribus/scribus/pageitem_textframe.cpp
trunk/Scribus/scribus/ui/unicodesearch.cpp
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24848&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sun Jan 30 00:58:27 2022
@@ -5756,7 +5756,7 @@
else if (nF->isAutoNoteFrame() || nF->isEndNotesFrame())
m_notesFramesMap.remove(nF);
}
- m_notesFramesMap.unite(notesMap);
+ m_notesFramesMap.insert(notesMap);
}
if (docWasChanged)
{
Modified: trunk/Scribus/scribus/ui/unicodesearch.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24848&path=/trunk/Scribus/scribus/ui/unicodesearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.cpp (original)
+++ trunk/Scribus/scribus/ui/unicodesearch.cpp Sun Jan 30 00:58:27 2022
@@ -8,6 +8,7 @@
#include <QDebug>
#include <QFile>
#include <QHeaderView>
+#include <QRegularExpression>
#include <QSortFilterProxyModel>
#include "unicodesearch.h"
@@ -211,15 +212,16 @@
QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
QString s(searchEdit->text());
if (s.isEmpty())
- m_proxyModel->setFilterRegExp(QRegExp("*",
-
Qt::CaseInsensitive,
-
QRegExp::Wildcard));
- else
- {
- QRegExp regExp(QString("*%1*").arg(s),
- Qt::CaseInsensitive,
- QRegExp::Wildcard);
- m_proxyModel->setFilterRegExp(regExp);
+ {
+ QString wildcardExp =
QRegularExpression::wildcardToRegularExpression(QString("*"));
+ QRegularExpression regExp(wildcardExp,
QRegularExpression::CaseInsensitiveOption);
+ m_proxyModel->setFilterRegularExpression(regExp);
+ }
+ else
+ {
+ QString wildcardExp =
QRegularExpression::wildcardToRegularExpression(QString("*%1*").arg(s));
+ QRegularExpression regExp(wildcardExp,
QRegularExpression::CaseInsensitiveOption);
+ m_proxyModel->setFilterRegularExpression(regExp);
}
tableView->setFocus(Qt::OtherFocusReason);
tableView->selectRow(0);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
