diff --git a/gui/QT/option/settings.cpp b/gui/QT/option/settings.cpp index f73e8f90f..c48405bb8 100644 --- a/gui/QT/option/settings.cpp +++ b/gui/QT/option/settings.cpp @@ -247,6 +247,7 @@ Settings::Settings() : dummy(this){ if(!i.parent[0]) opt.addOnChangeCallback(test_callback); #endif + (void) opt; //suppress unused warning } for(const auto &i : optionCallbacks){ diff --git a/gui/QT/option/spinbox_ui.cpp b/gui/QT/option/spinbox_ui.cpp index 6b2be467b..a9538cc6e 100644 --- a/gui/QT/option/spinbox_ui.cpp +++ b/gui/QT/option/spinbox_ui.cpp @@ -10,7 +10,7 @@ SpinBoxUi::SpinBoxUi(QSpinBox *spinbox, Settings *settings, const std::string &o } void SpinBoxUi::connectSignals(){ - connect(spinbox, Overload::of(&QSpinBox::valueChanged), + connect(spinbox, &QSpinBox::textChanged, this, &SpinBoxUi::textEdited); } diff --git a/gui/QT/ui/log_window.ui b/gui/QT/ui/log_window.ui index 8770a26b4..c565591da 100644 --- a/gui/QT/ui/log_window.ui +++ b/gui/QT/ui/log_window.ui @@ -91,9 +91,6 @@ Monospace - - 40 - diff --git a/gui/QT/window/log_window.cpp b/gui/QT/window/log_window.cpp index 7f64907b5..8511fce91 100644 --- a/gui/QT/window/log_window.cpp +++ b/gui/QT/window/log_window.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "log_window.hpp" LogWindow::LogWindow(QWidget *parent): QDialog(parent){ @@ -11,6 +12,12 @@ LogWindow::LogWindow(QWidget *parent): QDialog(parent){ | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint); +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + ui.terminal->setTabStopWidth(40); +#else + ui.terminal->setTabStopDistance(40); +#endif + connect(ui.copyBtn, SIGNAL(clicked()), this, SLOT(copyToClipboard())); connect(ui.saveBtn, SIGNAL(clicked()), this, SLOT(saveToFile())); } diff --git a/gui/QT/window/ultragrid_window.cpp b/gui/QT/window/ultragrid_window.cpp index 7aff4b6b3..a849bd768 100644 --- a/gui/QT/window/ultragrid_window.cpp +++ b/gui/QT/window/ultragrid_window.cpp @@ -380,7 +380,7 @@ void UltragridWindow::processFinished(int code, QProcess::ExitStatus status){ msgBox.setText("Ultragrid has exited with an error! If you need help, please send an email " "to ultragrid-dev@cesnet.cz with log attached."); QPushButton *showLogBtn = msgBox.addButton(tr("Show log"), QMessageBox::ActionRole); - QPushButton *dissmissBtn = msgBox.addButton(tr("Dismiss"), QMessageBox::RejectRole); + msgBox.addButton(tr("Dismiss"), QMessageBox::RejectRole); msgBox.exec(); if(msgBox.clickedButton() == showLogBtn){