Merge pull request #82 from AgnosticPope/master

Fix Compile/build on Ubuntu 14.04
This commit is contained in:
Collin Kidder
2017-07-06 21:02:56 -04:00
committed by GitHub
2 changed files with 4 additions and 2 deletions
+3 -1
View File
@@ -14,7 +14,7 @@ CONFIG += c++11 qscintilla2
TARGET = SavvyCAN
TEMPLATE = app
INCLUDEPATH +=/usr/include/qt5/
SOURCES += main.cpp\
mainwindow.cpp \
@@ -147,3 +147,5 @@ DISTFILES +=
RESOURCES += \
icons.qrc \
images.qrc
unix:!macx: LIBS += -lqt5scintilla2
+1 -1
View File
@@ -485,7 +485,7 @@ void ConnectionWindow::handleRevert()
bool ConnectionWindow::isSocketCanAvailable()
{
#ifdef Q_OS_LINUX
foreach (const QByteArray &backend, QCanBus::instance()->plugins()) {
for (const auto &backend : QCanBus::instance()->plugins()) {
if (backend == "socketcan")
return true;
}