Compare commits

...

4 Commits

Author SHA1 Message Date
Harrissou Sant-anna
092583ed3d
Merge 34ca57f39123fd1cd75b39e444d6649cfb9ee753 into b927df884feb840b67724af5c82c8088a9d20bfe 2025-07-02 06:54:07 +02:00
Loïc Bartoletti
b927df884f
Merge pull request #62484 from jef-n/fix-62478
fix #62478 (followup eac401c009)
2025-07-02 06:09:23 +02:00
Juergen E. Fischer
6fd32d92fd fix #62478 (followup eac401c009) 2025-07-01 17:54:58 +02:00
Harrissou Sant-anna
34ca57f391
Replace label in contextual menu of SQL History item
The query contextual menu item loads the query in the main widget, it does not execute it.
2025-07-01 17:52:03 +02:00
2 changed files with 7 additions and 4 deletions

View File

@ -658,6 +658,9 @@ class Repositories(QObject):
.text() .text()
.strip() .strip()
) )
supports_qt6 = pluginNodes.item(i).firstChildElement(
"supports_qt6"
).text().strip().upper() in ["TRUE", "YES"]
if not qgisMaximumVersion: if not qgisMaximumVersion:
if qgisMinimumVersion[0] == "3" and supports_qt6: if qgisMinimumVersion[0] == "3" and supports_qt6:
qgisMaximumVersion = "4.99" qgisMaximumVersion = "4.99"

View File

@ -164,13 +164,13 @@ class DatabaseQueryRootNode : public DatabaseQueryHistoryNode
{ {
if ( QgsDatabaseQueryHistoryWidget *queryHistoryWidget = qobject_cast< QgsDatabaseQueryHistoryWidget * >( context.historyWidget() ) ) if ( QgsDatabaseQueryHistoryWidget *queryHistoryWidget = qobject_cast< QgsDatabaseQueryHistoryWidget * >( context.historyWidget() ) )
{ {
QAction *executeAction = new QAction( QAction *loadAction = new QAction(
QObject::tr( "Execute SQL Command…" ), menu QObject::tr( "Load SQL Command…" ), menu
); );
QObject::connect( executeAction, &QAction::triggered, menu, [this, queryHistoryWidget] { QObject::connect( loadAction, &QAction::triggered, menu, [this, queryHistoryWidget] {
queryHistoryWidget->emitSqlTriggered( mEntry.entry.value( QStringLiteral( "connection" ) ).toString(), mEntry.entry.value( QStringLiteral( "provider" ) ).toString(), mEntry.entry.value( QStringLiteral( "query" ) ).toString() ); queryHistoryWidget->emitSqlTriggered( mEntry.entry.value( QStringLiteral( "connection" ) ).toString(), mEntry.entry.value( QStringLiteral( "provider" ) ).toString(), mEntry.entry.value( QStringLiteral( "query" ) ).toString() );
} ); } );
menu->addAction( executeAction ); menu->addAction( loadAction );
} }
QAction *copyAction = new QAction( QAction *copyAction = new QAction(