646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
|
|
index 7992ed00d..a9e0f0ba7 100644
|
|
--- a/src/QGCApplication.cc
|
|
+++ b/src/QGCApplication.cc
|
|
@@ -207,24 +207,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
|
|
"sudo apt-get remove modemmanager</pre>").arg(qgcApp()->applicationName())));
|
|
return;
|
|
}
|
|
- // Determine if we have the correct permissions to access USB serial devices
|
|
- QFile permFile("/etc/group");
|
|
- if(permFile.open(QIODevice::ReadOnly)) {
|
|
- while(!permFile.atEnd()) {
|
|
- QString line = permFile.readLine();
|
|
- if (line.contains("dialout") && !line.contains(getenv("USER"))) {
|
|
- permFile.close();
|
|
- _exitWithError(QString(
|
|
- tr("The current user does not have the correct permissions to access serial devices. "
|
|
- "You should also remove modemmanager since it also interferes.<br/><br/>"
|
|
- "If you are using Ubuntu, execute the following commands to fix these issues:<br/>"
|
|
- "<pre>sudo usermod -a -G dialout $USER<br/>"
|
|
- "sudo apt-get remove modemmanager</pre>")));
|
|
- return;
|
|
- }
|
|
- }
|
|
- permFile.close();
|
|
- }
|
|
|
|
// Always set style to default, this way QT_QUICK_CONTROLS_STYLE environment variable doesn't cause random changes in ui
|
|
QQuickStyle::setStyle("Default");
|