From ed80653bd40153a460f189478a4d740a4efdf219 Mon Sep 17 00:00:00 2001 From: James Willis Date: Tue, 25 Apr 2017 19:52:23 -0700 Subject: [PATCH 1/2] Fix compile --- connections/connectionwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connections/connectionwindow.cpp b/connections/connectionwindow.cpp index 6e2c3f7..0d15a9a 100644 --- a/connections/connectionwindow.cpp +++ b/connections/connectionwindow.cpp @@ -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; } From d8c54ecdff692f00d2e7f29b86eaa4d01a6ddc20 Mon Sep 17 00:00:00 2001 From: James Willis Date: Tue, 25 Apr 2017 19:52:46 -0700 Subject: [PATCH 2/2] Use default location for QScintella library on Linux --- SavvyCAN.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SavvyCAN.pro b/SavvyCAN.pro index 507299d..271fd4e 100644 --- a/SavvyCAN.pro +++ b/SavvyCAN.pro @@ -14,7 +14,7 @@ CONFIG += c++11 qscintilla2 TARGET = SavvyCAN TEMPLATE = app - +INCLUDEPATH +=/usr/include/qt5/ SOURCES += main.cpp\ mainwindow.cpp \ @@ -142,3 +142,5 @@ DISTFILES += RESOURCES += \ icons.qrc \ images.qrc + +unix:!macx: LIBS += -lqt5scintilla2