Merge remote-tracking branch 'origin/1.1'

Change-Id: I7319a1deea008c9f4df077eaecf3147872fc4a21

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/corelib/tools/profile.h b/src/lib/corelib/tools/profile.h
index c3b0bbfe8..740f23931 100644
--- a/src/lib/corelib/tools/profile.h
+++ b/src/lib/corelib/tools/profile.h
@@ -36,6 +36,7 @@
 #include <QVariant>
 
 namespace qbs {
+class ErrorInfo;
 class Settings;
 
 class QBS_EXPORT Profile
@@ -44,7 +45,8 @@ public:
     explicit Profile(const QString &name, Settings *settings);
 
     bool exists() const;
-    QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
+    QVariant value(const QString &key, const QVariant &defaultValue = QVariant(),
+                   ErrorInfo *error = 0) const;
     void setValue(const QString &key, const QVariant &value);
     void remove(const QString &key);
 
@@ -57,7 +59,7 @@ public:
     void removeProfile();
 
     enum KeySelection { KeySelectionRecursive,  KeySelectionNonRecursive };
-    QStringList allKeys(KeySelection selection) const;
+    QStringList allKeys(KeySelection selection, ErrorInfo *error = 0) const;
 
     static QString cleanName(const QString &name);