-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Fix browser tooltip refresh for table comments #64441
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
nyalldawson
merged 14 commits into
qgis:master
from
TimMcCauley:fix-comments-on-refresh
Jan 20, 2026
Merged
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a2908d9
Fix browser tooltip refresh for table comments
TimMcCauley 640f715
using equality check instead
TimMcCauley 5d95c51
reverting and removing logging
TimMcCauley beb5ab4
Merge branch 'master' into fix-comments-on-refresh
TimMcCauley 3d532c3
refreshes parent after set comment
TimMcCauley 197206a
Merge branch 'master' into fix-comments-on-refresh
TimMcCauley 4c7392b
Merge branch 'qgis:master' into fix-comments-on-refresh
TimMcCauley 61d8832
Update .gitignore
TimMcCauley b22e64b
Update qgsdataitem.cpp
TimMcCauley 370f60f
Update qgsdataitem.cpp
TimMcCauley 66d5012
Update qgsdataitem.cpp
TimMcCauley 3f76e2a
Update qgsdataitem.cpp
TimMcCauley 15d3242
Update qgsdataitem.cpp
TimMcCauley de174b8
Update qgsdataitem.cpp
TimMcCauley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| .kdev4/ | ||
| .project | ||
| .pydevproject | ||
| .qtcreator | ||
| .venv | ||
| .vscode | ||
| .qtcreator | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -207,7 +207,7 @@ void QgsDataItem::populate( bool foreground ) | |
| // The watcher must not be created with item (in constructor) because the item may be created in thread and the watcher created in thread does not work correctly. | ||
| if ( !mFutureWatcher ) | ||
| { | ||
| mFutureWatcher = std::make_unique<QFutureWatcher<QVector<QgsDataItem *> >>( this ); | ||
| mFutureWatcher = std::make_unique<QFutureWatcher<QVector<QgsDataItem *> >> ( this ); | ||
|
||
| } | ||
|
|
||
| connect( mFutureWatcher.get(), &QFutureWatcherBase::finished, this, &QgsDataItem::childrenCreated ); | ||
|
|
@@ -308,7 +308,7 @@ void QgsDataItem::refresh() | |
| setState( Qgis::BrowserItemState::Populating ); | ||
| if ( !mFutureWatcher ) | ||
| { | ||
| mFutureWatcher = std::make_unique<QFutureWatcher<QVector<QgsDataItem *> >>( this ); | ||
| mFutureWatcher = std::make_unique<QFutureWatcher<QVector<QgsDataItem *> >> ( this ); | ||
| } | ||
| connect( mFutureWatcher.get(), &QFutureWatcherBase::finished, this, &QgsDataItem::childrenCreated ); | ||
| mFutureWatcher->setFuture( QtConcurrent::run( runCreateChildren, this ) ); | ||
|
|
@@ -599,4 +599,3 @@ QgsErrorItem::QgsErrorItem( QgsDataItem *parent, const QString &error, const QSt | |
|
|
||
| setState( Qgis::BrowserItemState::Populated ); // no more children | ||
| } | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unrelated change (and duplicate of line 33)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done