Merge pull request #82 from AgnosticPope/master
Fix Compile/build on Ubuntu 14.04
This commit is contained in:
+3
-1
@@ -14,7 +14,7 @@ CONFIG += c++11 qscintilla2
|
|||||||
|
|
||||||
TARGET = SavvyCAN
|
TARGET = SavvyCAN
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
|
INCLUDEPATH +=/usr/include/qt5/
|
||||||
|
|
||||||
SOURCES += main.cpp\
|
SOURCES += main.cpp\
|
||||||
mainwindow.cpp \
|
mainwindow.cpp \
|
||||||
@@ -147,3 +147,5 @@ DISTFILES +=
|
|||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
icons.qrc \
|
icons.qrc \
|
||||||
images.qrc
|
images.qrc
|
||||||
|
|
||||||
|
unix:!macx: LIBS += -lqt5scintilla2
|
||||||
|
|||||||
@@ -485,7 +485,7 @@ void ConnectionWindow::handleRevert()
|
|||||||
bool ConnectionWindow::isSocketCanAvailable()
|
bool ConnectionWindow::isSocketCanAvailable()
|
||||||
{
|
{
|
||||||
#ifdef Q_OS_LINUX
|
#ifdef Q_OS_LINUX
|
||||||
foreach (const QByteArray &backend, QCanBus::instance()->plugins()) {
|
for (const auto &backend : QCanBus::instance()->plugins()) {
|
||||||
if (backend == "socketcan")
|
if (backend == "socketcan")
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user