Fix support for qt5.6

skiars · Jul 22, 2019 · 564ff18 · 564ff18
1 parent d84cadc
commit 564ff18
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 21 deletions.
diff --git a/SerialTool/SerialTool.pro b/SerialTool/SerialTool.pro
@@ -5,7 +5,7 @@
 #-------------------------------------------------
 QT       += core gui widgets serialport network charts script uitools
 
-TARGET = SerialTool_pre
+TARGET = SerialTool
 
 TEMPLATE = app
 

diff --git a/SerialTool/src/views/scriptextension/scriptextensionview.cpp b/SerialTool/src/views/scriptextension/scriptextensionview.cpp
@@ -13,7 +13,7 @@ ScriptExtensionView::ScriptExtensionView(const QString &fileName, QWidget *paren
 {
     QFile file(fileName);
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        loadUi(fileName.chopped(3) + ".ui");
+        loadUi(fileName.left(fileName.size() - 3) + ".ui");
         QScriptValue scriptObj = m_script->newQObject(this);
         m_script->globalObject().setProperty("view", scriptObj);
         m_script->evaluate(file.readAll());

diff --git a/SerialTool/src/views/terminal/qvterminal/qvterminal.cpp b/SerialTool/src/views/terminal/qvterminal/qvterminal.cpp
@@ -5,6 +5,7 @@
 #include <QScrollBar>
 #include <QApplication>
 #include <QClipboard>
+#include <QAction>
 #include <QDebug>
 #include <QMenu>
 
@@ -27,7 +28,7 @@ QVTerminal::QVTerminal(QWidget *parent)
 
     _layout = new QVTLayout();
 
-    _pasteAction = new QAction("Paste");
+    _pasteAction = new QAction("Paste", this);
     _pasteAction->setShortcut(QKeySequence("Ctrl+V"));
     connect(_pasteAction, &QAction::triggered, this, &QVTerminal::paste);
     addAction(_pasteAction);

diff --git a/SerialTool/src/views/terminal/qvterminal/qvterminal.pri b/SerialTool/src/views/terminal/qvterminal/qvterminal.pri
diff --git a/SerialTool/src/views/texttr/textedit.cpp b/SerialTool/src/views/texttr/textedit.cpp
@@ -47,12 +47,12 @@ void TextEdit::setFonts(QString fonts, int size, QColor color, QString style)
     if (style.indexOf("bold") != -1) { // 粗体字
         SendScintilla(SCI_STYLESETBOLD, 0, true);
     } else {
-        SendScintilla(SCI_STYLESETBOLD, 0, false);
+        SendScintilla(SCI_STYLESETBOLD, 0, static_cast<long>(false));
     }
     if (style.indexOf("italic") != -1) { // 斜体字
         SendScintilla(SCI_STYLESETITALIC, 0, true);
     } else {
-        SendScintilla(SCI_STYLESETITALIC, 0, false);
+        SendScintilla(SCI_STYLESETITALIC, 0, static_cast<long>(false));
     }
     SendScintilla(SCI_STYLECLEARALL); // 设置全局风格