Removed unneeded concurrent module
This commit is contained in:
parent
12edb52d0c
commit
bdb3660134
@ -5,7 +5,7 @@
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += core gui serialport concurrent
|
||||
QT += core gui serialport
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
|
||||
@ -364,8 +364,9 @@ void MainWindow::homeall()
|
||||
|
||||
void MainWindow::on_sendbtn_clicked()
|
||||
{
|
||||
emit injectCommand(ui->sendtext->text());
|
||||
userHistory.append(ui->sendtext->text());
|
||||
QString command = ui->sendtext->text();
|
||||
emit injectCommand(command);
|
||||
userHistory.append(command);
|
||||
userHistoryPos = 0;
|
||||
}
|
||||
|
||||
|
||||
@ -5,14 +5,13 @@
|
||||
#include <QFileDialog>
|
||||
#include <QtSerialPort/QtSerialPort>
|
||||
#include <QFile>
|
||||
#include <QFuture>
|
||||
#include <QThread>
|
||||
#include <QVector>
|
||||
#include <QTextStream>
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QSettings>
|
||||
#include <QElapsedTimer>
|
||||
#include <QMessageBox>
|
||||
#include <QRegExp>
|
||||
#include <QMap>
|
||||
|
||||
#include "settingswindow.h"
|
||||
#include "aboutwindow.h"
|
||||
@ -43,6 +42,7 @@ public:
|
||||
QThread *senderThread;
|
||||
|
||||
protected:
|
||||
QMap <QString, QString> macros;
|
||||
QFile gfile;
|
||||
QVector<QString> gcode;
|
||||
QQueue <QString> userCommands;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user