Allow build on Qt6 #6
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pvuorela
reviewed
Oct 19, 2023
| @@ -87,7 +87,11 @@ struct Q_GALLERY_EXPORT QGalleryProperty | |||
| return QGalleryMetaDataFilter(QLatin1String(m_name), string, QGalleryFilter::Wildcard); } | |||
| QGalleryMetaDataFilter regExp(const QString &rx) const { | |||
| return QGalleryMetaDataFilter(QLatin1String(m_name), rx, QGalleryFilter::RegExp); } | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
There was a problem hiding this comment.
Pondering if we should provide QRegularExpression even for Qt5 as it's available there.
| @@ -102,7 +102,11 @@ QVariant QGalleryTrackerStringListColumn::toVariant(TrackerSparqlCursor *cursor, | |||
| { | |||
| switch (TrackerSparqlValueType type = tracker_sparql_cursor_get_value_type(cursor, index)) { | |||
| case TRACKER_SPARQL_VALUE_TYPE_STRING: | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
There was a problem hiding this comment.
Use the qt5 version with Qt::SkipEmptyParts.
| @@ -262,7 +262,11 @@ QModelIndex QDeclarativeGalleryQueryModel::index(int row, int column, const QMod | |||
|
|
|||
| QJSValue QDeclarativeGalleryQueryModel::get(const QJSValue &index) const | |||
| { | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
| QJSEngine *scriptEngine = qjsEngine(this); | |||
There was a problem hiding this comment.
Think this should be available also on Qt5.
|
|
||
| setRoleNames(roleNames); | ||
| m_roleNames.insert(ItemId, QByteArray("itemId")); | ||
| m_roleNames.insert(ItemType, QByteArray("itemType")); |
There was a problem hiding this comment.
Feels suspicious just adjusting the content of rolenames without notifying anyone, but seems that's how setRoleNames() is even working. Guess so then.
pvuorela
reviewed
Nov 28, 2023
| @@ -371,7 +378,11 @@ void QGalleryTrackerResultSetPrivate::syncFinish(const int rIndex, const int iIn | |||
|
|
|||
| bool QGalleryTrackerResultSetPrivate::waitForSyncFinish(int msecs) | |||
| { | |||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | |||
| QTimer timer; | |||
There was a problem hiding this comment.
I think QTimer should work for all Qt versions that matter. Let's just switch to that? Applies on many places.
pvuorela
requested changes
Nov 28, 2023
pvuorela
reviewed
Nov 28, 2023
| @@ -46,6 +46,7 @@ | |||
| #include "qgalleryabstractrequest.h" | |||
| #include "qgallerytrackerresultset_p.h" | |||
| #include "qgallerytrackerlistcolumn_p.h" | |||
| #include "qregularexpression.h" | |||
There was a problem hiding this comment.
Suppose this should be <QRegularExpression>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.