Update for Qt6 #3
Conversation
|
Seems to be working as expected now |
|
Don't include merge commits. |
jmlich
force-pushed
the
master
branch
2 times, most recently
from
8d56385
to
030d78e
Compare
There was a problem hiding this comment.
Please change the commit message style similar to:
sailfishos/qt-mobility-haptics-ffmemless#1 (review)
Rest looks good to me.
qt5 in .pro replaced by qt$${QT_MAJOR_VERSION}
QTextCodec is deprecated in Qt6
QIODevice::WriteOnly was moved to QIODeviceBase::WriteOnly
QRegExp was replaced by QRegularExpression
QString::SkipEmptyParts was moved to Qt::SkipEmptyParts
Co-authored-by: Chupligin Sergey <neochapay@gmail.com>
| @@ -4770,8 +4803,9 @@ QString MLocalePrivate::formatPhoneNumber( const QString& phoneNumber, | |||
| MLocale::PhoneNumberGrouping grouping ) const | |||
| { | |||
| // first do sanity check of the input string | |||
| QRegExp rx( "\\+?\\d*" ); | |||
| if ( ! rx.exactMatch( phoneNumber ) ) | |||
| QRegularExpression rx( QRegularExpression::anchoredPattern("\\+?\\d*") ); | |||
There was a problem hiding this comment.
anchoredPattern() introduced in qt 5.15. We still need support for older versions too.
| @@ -28,7 +28,9 @@ | |||
| #include <QMap> | |||
|
|
|||
| class QString; | |||
| class QStringList; | |||
| #if QT_VERSION < 0x051500 | |||
There was a problem hiding this comment.
Why this? All versions have QStringList in the API and even if those didn't, the class declaration shouldn't have too much side-effects?
| @@ -65,7 +65,11 @@ class MDebug | |||
| QtMsgType convertMsgType(int type); | |||
|
|
|||
| struct Stream { | |||
| #if QT_VERSION < 0x051500 | |||
There was a problem hiding this comment.
QIODeviceBase is a Qt6 thing?
| @@ -500,6 +502,12 @@ QList<MCharsetMatch> MCharsetDetector::detectAll() | |||
| QString MCharsetDetector::text(const MCharsetMatch &charsetMatch) | |||
| { | |||
| Q_D(MCharsetDetector); | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
There was a problem hiding this comment.
Elsewhere the #ifs not indented.
| @@ -500,6 +502,12 @@ QList<MCharsetMatch> MCharsetDetector::detectAll() | |||
| QString MCharsetDetector::text(const MCharsetMatch &charsetMatch) | |||
| { | |||
| Q_D(MCharsetDetector); | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
| if(charsetMatch.name().toLatin1().isEmpty() || charsetMatch.name().toLatin1() != "UTF-8") { | |||
| qWarning() << "Don`t use non utf8 charset"; | |||
There was a problem hiding this comment.
Wouldn't it make the class detecting encodings a bit pointless if it can be used only with utf8? Could use core5compat and use the QTextCodec?
| @@ -155,12 +155,15 @@ void Ut_Translations::testOriginalQtTr() | |||
| // Everything should be untranslated now: | |||
| QCOMPARE(tr(qPrintable(string_id)), string_id); | |||
|
|
|||
| #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) | |||
Even if it is not finished, I would like to open a discussion about what changes are needed for inclusion in the master. I may open separate pull requests for every part.