Merge branch 'WIP' of github.com:collin80/SavvyCAN into WIP2, bug fixes,

2016-03-26 23:07:46 -04:00
parent 87c201aa44 4694d9f37c
commit 3c6f7cb2ea
9 changed files with 323 additions and 273 deletions
@@ -191,6 +191,7 @@ void ConnectionWindow::getKvaserPorts()

 void ConnectionWindow::getSocketcanPorts()
 {
+#ifdef Q_OS_LINUX
    QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
    QString interfaceName;

@@ -205,6 +206,7 @@ void ConnectionWindow::getSocketcanPorts()
            ui->cbPort->addItem(interfaceName);
        }
    }
+#endif
 }

 void ConnectionWindow::setSpeed(int speed0)