Merge branch 'add_allowfilterstostayuponclear'
This commit is contained in:
+3
-1
@@ -30,8 +30,10 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
ui(new Ui::MainWindow)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||
qRegisterMetaTypeStreamOperators<QVector<QString>>();
|
||||
qRegisterMetaTypeStreamOperators<QVector<int>>();
|
||||
#endif
|
||||
|
||||
useHex = true;
|
||||
|
||||
@@ -178,7 +180,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
updateTimer.setInterval(250);
|
||||
updateTimer.start();
|
||||
|
||||
elapsedTime = new QTime;
|
||||
elapsedTime = new QElapsedTimer;
|
||||
elapsedTime->start();
|
||||
|
||||
isConnected = false;
|
||||
|
||||
Reference in New Issue
Block a user