diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-06-28 12:58:09 +0300 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-07-01 12:42:33 +0300 |
commit | 108e7d9e5fad438e565305104ec3712bff6561b6 (patch) | |
tree | 32e8166483325cf96f73fe8cac74bab9a8fd7f7d /src/sensors/qsensormanager.cpp | |
parent | 763b64cca21817af24d944d631c0fb676da8ba23 (diff) |
Fix and improve sensor configuration file lookup
This commit addresses some of the sensor configuration lookup issues
- The CMake rule to use compile-time flag was opposite than intended
- The configuration file is now looked from all returned configuration
paths, not just the last one which seemed a bit arbitrary
- Update related documentation, and while doing that also remove
references to "N900" which probably won't say that much to people
these days (N900 was a smart phone released 12 years ago)
Pick-to: 6.2
Task-number: QTBUG-92505
Task-number: QTBUG-92512
Change-Id: Ib66ae052a815bbe3af32bd896931e65375e8546e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/sensors/qsensormanager.cpp')
-rw-r--r-- | src/sensors/qsensormanager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 43286467..95d9b6c0 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -96,10 +96,12 @@ public: QString config = QString::fromLocal8Bit(QTSENSORS_CONFIG_PATH); #else QStringList configs = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation); - if (configs.count() == 0) return; // QStandardPaths is broken? - QString config = configs.at(configs.count()-1); - if (config.isEmpty()) return; // QStandardPaths is broken? - config += QLatin1String("/QtProject/Sensors.conf"); + QString config; + for (const QString& c : configs) { + config = c + QLatin1String("/QtProject/Sensors.conf"); + if (QFile::exists(config)) + break; + } #endif qCDebug(sensorsCategory) << "Loading config from" << config; if (!QFile::exists(config)) { |