Fix building on Qt 5.15

CMakeLists.txt

@@ -34,7 +34,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 
 # Find the QtWidgets library
-find_package(Qt5Widgets)
+find_package(Qt5 COMPONENTS Widgets SerialPort Network Svg REQUIRED)
 
 # If set, cmake will download Qwt over SVN, build and use it as a static library.
 set(BUILD_QWT true CACHE BOOL "Download and build Qwt automatically.")
@@ -146,7 +146,7 @@ add_executable(${PROGRAM_NAME} WIN32
 target_link_libraries(${PROGRAM_NAME}
   ${QWT_LIBRARY}
   )
-qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Network Svg)
+target_link_libraries(${PROGRAM_NAME} Qt5::Widgets Qt5::SerialPort Qt5::Network Qt5::Svg)
 
 if (BUILD_QWT)
   add_dependencies(${PROGRAM_NAME} QWT)

src/asciireader.cpp

@@ -156,7 +156,7 @@ unsigned AsciiReader::readData()
 
 SamplePack* AsciiReader::parseLine(const QString& line) const
 {
-    auto separatedValues = line.split(delimiter, QString::SkipEmptyParts);
+    auto separatedValues = line.split(delimiter, Qt::SkipEmptyParts);
     unsigned numComingChannels = separatedValues.length();
 
     // check number of channels (skipped if auto num channels is enabled)

src/asciireadersettings.cpp

@@ -67,7 +67,7 @@ AsciiReaderSettings::AsciiReaderSettings(QWidget *parent) :
             });
 
     connect(&filterButtons,
-            SELECT<int, bool>::OVERLOAD_OF(&QButtonGroup::buttonToggled),
+            SELECT<int, bool>::OVERLOAD_OF(&QButtonGroup::idToggled),
             [this](int id, bool checked)
             {
                 emit filterChanged(static_cast<FilterMode>(id), ui->leFilterPrefix->text());

src/barchart.cpp

@@ -18,7 +18,9 @@
 */
 
 #include <QPalette>
+#include <QwtText>
 #include <qwt_scale_map.h>
+#include <qwt_math.h>
 
 #include "barchart.h"
 

src/commandpanel.cpp

@@ -27,7 +27,7 @@
 CommandPanel::CommandPanel(QSerialPort* port, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::CommandPanel),
-    _menu(trUtf8("&Commands")), _newCommandAction(trUtf8("&New Command"), this)
+    _menu("&Commands"), _newCommandAction("&New Command", this)
 {
     serialPort = port;
 
@@ -55,7 +55,7 @@ CommandWidget* CommandPanel::newCommand()
 {
     auto command = new CommandWidget();
     command_name_counter++;
-    command->setName(trUtf8("Command ") + QString::number(command_name_counter));
+    command->setName("Command " + QString::number(command_name_counter));
     ui->scrollAreaWidgetContents->layout()->addWidget(command);
     command->setFocusToEdit();
     connect(command, &CommandWidget::sendCommand, this, &CommandPanel::sendCommand);

src/framedreadersettings.cpp

@@ -50,7 +50,7 @@ FramedReaderSettings::FramedReaderSettings(QWidget *parent) :
         fbGroup.addButton(ui->rbSize1Byte, (int) SizeFieldType::Field1Byte);
         fbGroup.addButton(ui->rbSize2Byte, (int) SizeFieldType::Field2Byte);
 
-        connect(&fbGroup, static_cast<void(QButtonGroup::*)(int, bool)>(&QButtonGroup::buttonToggled),
+        connect(&fbGroup, static_cast<void(QButtonGroup::*)(int, bool)>(&QButtonGroup::idToggled),
                 [this](int id, bool enabled)
                 {
                     if (!enabled) return;

src/plot.cpp

@@ -22,6 +22,7 @@
 #include <QColor>
 #include <qwt_symbol.h>
 #include <qwt_plot_curve.h>
+#include <qwt_scale_map.h>
 #include <math.h>
 #include <algorithm>
 

src/plotcontrolpanel.cpp

@@ -143,14 +143,14 @@ PlotControlPanel::PlotControlPanel(QWidget *parent) :
         int rmin = -rmax-1;
         Range r = {double(rmin),  double(rmax)};
         ui->cbRangePresets->addItem(
-            QString().sprintf("Signed %d bits %d to +%d", nbits, rmin, rmax),
+            QString("Signed %1 bits %2 to +%3").arg(nbits).arg(rmin).arg(rmax),
             QVariant::fromValue(r));
     }
     for (int nbits = 8; nbits <= 24; nbits++) // unsigned binary formats
     {
         int rmax = pow(2, nbits)-1;
         ui->cbRangePresets->addItem(
-            QString().sprintf("Unsigned %d bits %d to +%d", nbits, 0, rmax),
+            QString("Unsigned %1 bits %2 to +%3").arg(nbits).arg(0).arg(rmax),
             QVariant::fromValue(Range{0, double(rmax)}));
     }
     ui->cbRangePresets->addItem("-1 to +1", QVariant::fromValue(Range{-1, +1}));

src/plotmenu.cpp

@@ -17,6 +17,7 @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <QDebug>
 #include "plotmenu.h"
 #include "setting_defines.h"
 #include "utils.h"

src/portcontrol.cpp

@@ -79,10 +79,10 @@ PortControl::PortControl(QSerialPort* port, QWidget* parent) :
                      SELECT<int>::OVERLOAD_OF(&QComboBox::activated),
                      this, &PortControl::onTbPortListActivated);
     QObject::connect(ui->cbPortList,
-                     SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
+                     SELECT<const QString&>::OVERLOAD_OF(&QComboBox::textActivated),
                      this, &PortControl::selectListedPort);
     QObject::connect(&tbPortList,
-                     SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
+                     SELECT<const QString&>::OVERLOAD_OF(&QComboBox::textActivated),
                      this, &PortControl::selectListedPort);
 
     // setup buttons
@@ -91,7 +91,7 @@ PortControl::PortControl(QSerialPort* port, QWidget* parent) :
 
     // setup baud rate selection widget
     QObject::connect(ui->cbBaudRate,
-                     SELECT<const QString&>::OVERLOAD_OF(&QComboBox::activated),
+                     SELECT<const QString&>::OVERLOAD_OF(&QComboBox::textActivated),
                      this, &PortControl::_selectBaudRate);
 
     // setup parity selection buttons
@@ -100,7 +100,7 @@ PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     parityButtons.addButton(ui->rbOddParity, (int) QSerialPort::OddParity);
 
     QObject::connect(&parityButtons,
-                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
+                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::idClicked),
                      this, &PortControl::selectParity);
 
     // setup data bits selection buttons
@@ -110,15 +110,15 @@ PortControl::PortControl(QSerialPort* port, QWidget* parent) :
     dataBitsButtons.addButton(ui->rb5Bits, (int) QSerialPort::Data5);
 
     QObject::connect(&dataBitsButtons,
-                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
+                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::idClicked),
                      this, &PortControl::selectDataBits);
 
     // setup stop bits selection buttons
     stopBitsButtons.addButton(ui->rb1StopBit, (int) QSerialPort::OneStop);
     stopBitsButtons.addButton(ui->rb2StopBit, (int) QSerialPort::TwoStop);
 
     QObject::connect(&stopBitsButtons,
-                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
+                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::idClicked),
                      this, &PortControl::selectStopBits);
 
     // setup flow control selection buttons
@@ -130,7 +130,7 @@ PortControl::PortControl(QSerialPort* port, QWidget* parent) :
                                  (int) QSerialPort::SoftwareControl);
 
     QObject::connect(&flowControlButtons,
-                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::buttonClicked),
+                     SELECT<int>::OVERLOAD_OF(&QButtonGroup::idClicked),
                      this, &PortControl::selectFlowControl);
 
     // initialize signal leds

src/recordpanel.cpp

@@ -85,8 +85,9 @@ RecordPanel::RecordPanel(Stream* stream, QWidget *parent) :
     connect(&recordAction, &QAction::toggled, ui->pbBrowse, &QWidget::setDisabled);
 
     QCompleter *completer = new QCompleter(this);
-    // TODO: QDirModel is deprecated, use QFileSystemModel (but it doesn't work)
-    completer->setModel(new QDirModel(completer));
+    // TODO: QDirModel is deprecated, use QFileSystemModel (but it doesn't work) 
+    // Works for me
+    completer->setModel(new QFileSystemModel(completer));
     completer->setCaseSensitivity(Qt::CaseInsensitive);
     ui->leFileName->setCompleter(completer);
 

src/scrollzoomer.cpp

@@ -12,6 +12,8 @@
 #include <qwt_plot_layout.h>
 #include <qwt_scale_engine.h>
 #include <qwt_scale_widget.h>
+#include <QStack>
+#include <QRectF>
 #include "scrollbar.h"
 #include "scrollzoomer.h"
 
@@ -304,12 +306,11 @@ bool ScrollZoomer::eventFilter( QObject *object, QEvent *event )
         {
             case QEvent::Resize:
             {
-                int left, top, right, bottom;
-                canvas()->getContentsMargins( &left, &top, &right, &bottom );
-
+                QMargins c_margins = canvas()->contentsMargins();
                 QRect rect;
                 rect.setSize( static_cast<QResizeEvent *>( event )->size() );
-                rect.adjust( left, top, -right, -bottom );
+                rect.adjust( c_margins.left(), c_margins.top(),
+                            -c_margins.right(), -c_margins.bottom() );
 
                 layoutScrollBars( rect );
                 break;

src/sneakylineedit.cpp

@@ -25,7 +25,7 @@ SneakyLineEdit::SneakyLineEdit(QWidget *parent) :
 {
     setFrame(false);
     setStyleSheet("QLineEdit{background-color: rgba(0,0,0,0);}");
-    setToolTip(trUtf8("Click to edit"));    
+    setToolTip("Click to edit");
 
     setBold(true);
 }

src/zoomer.cpp

@@ -19,7 +19,9 @@
 
 #include "zoomer.h"
 #include <qwt_plot.h>
-#include <QPen>
+#include <qwt_text.h>
+#include <QPainter>
+#include <QPainterPath>
 #include <QMouseEvent>
 #include <QtMath>
 #include <algorithm>