summaryrefslogtreecommitdiffstats
path: root/src/systeminfo/linux/qdeviceinfo_linux.cpp
diff options
context:
space:
mode:
authorJakub Adam <jakub.adam@ktknet.cz>2014-03-05 10:01:08 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-23 20:41:53 +0100
commit3f65ffadaaeffb6726562d4565673a1aabb7c282 (patch)
tree9842d00aae37970659903b83bef59e0463bdb63a /src/systeminfo/linux/qdeviceinfo_linux.cpp
parentb0cc72a9d9bfcfd6da21d1719deebbc4c0e120f0 (diff)
Allow searching a term in a specific release file
Change-Id: I4a926c140101165a78107ae9d65f974d1b14b868 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'src/systeminfo/linux/qdeviceinfo_linux.cpp')
-rw-r--r--src/systeminfo/linux/qdeviceinfo_linux.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/systeminfo/linux/qdeviceinfo_linux.cpp b/src/systeminfo/linux/qdeviceinfo_linux.cpp
index 89eb8cdb..36ef1db2 100644
--- a/src/systeminfo/linux/qdeviceinfo_linux.cpp
+++ b/src/systeminfo/linux/qdeviceinfo_linux.cpp
@@ -476,11 +476,17 @@ QString QDeviceInfoPrivate::boardName()
return boardNameString;
}
-QString QDeviceInfoPrivate::findInRelease(const QString &searchTerm)
+QString QDeviceInfoPrivate::findInRelease(const QString &searchTerm, const QString &file)
{
QString result;
- QStringList releaseFies = QDir(QStringLiteral("/etc/")).entryList(QStringList() << QStringLiteral("*-release"));
- foreach (const QString &file, releaseFies) {
+ QStringList releaseFiles;
+ if (file.isEmpty()) {
+ releaseFiles = QDir(QStringLiteral("/etc/")).entryList(QStringList() << QStringLiteral("*-release"));
+ } else {
+ releaseFiles.append(file);
+ }
+
+ foreach (const QString &file, releaseFiles) {
if (!result.isEmpty())
continue;
QFile release(QStringLiteral("/etc/") + file);