diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-01-31 14:03:04 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-01-31 14:03:04 -0800 |
| commit | 9d9d72f47b48c0b1c50c28e02c3f61742440c2cc (patch) | |
| tree | 1bda21bccc7c78c78a04920ce03424d06e3c2150 /ui | |
| parent | ed8ee831fda2df69657af95dc34a3ea6b3ef4c88 (diff) | |
Qt: Fix Logray compilation with Qt 6.4
Copy+paste afa2579124 to fix
wireshark/ui/logray/logray_main_window_slots.cpp:1564:40: error: attempt to use a deleted function
stats_tree_action->setData(cfg->abbr);
^
Qt/6.4.2/macos/lib/QtCore.framework/Headers/qvariant.h:199:5: note: 'QVariant<char *, false>' has been explicitly marked deleted here
QVariant(T) = delete;
^
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/logray/logray_main_window_slots.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/logray/logray_main_window_slots.cpp b/ui/logray/logray_main_window_slots.cpp index 222deed797..abae655f02 100644 --- a/ui/logray/logray_main_window_slots.cpp +++ b/ui/logray/logray_main_window_slots.cpp @@ -1561,7 +1561,7 @@ void LograyMainWindow::addStatsPluginsToMenu() { } stats_tree_action = new QAction(stat_name, this); - stats_tree_action->setData(cfg->abbr); + stats_tree_action->setData(QString::fromUtf8(cfg->abbr)); parent_menu->addAction(stats_tree_action); connect(stats_tree_action, &QAction::triggered, this, [this]() { QAction* action = qobject_cast<QAction*>(sender()); |