aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/tools/preferences.h
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-06-08 14:17:46 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-06-09 12:16:46 +0000
commit3b92dff5cc8eb57dc1cfd13aa81c9be763d646ef (patch)
tree056c689054fdfa13f77bb41c038da247a3dbde9f /src/lib/corelib/tools/preferences.h
parent7343f24c774af89e7ddf9cf24c3932c703b5937c (diff)
Use stored profile contents when re-resolving implicitly
As per our policy to take as much data as possible from an existing build graph. We can now do incremental builds on a project whose original profile is no longer available. This will enable us to import projects built on the command line into Qt Creator, for instance. Change-Id: I0498628c0c6d9a2f049f4769152685d392640bcf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/tools/preferences.h')
-rw-r--r--src/lib/corelib/tools/preferences.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/preferences.h b/src/lib/corelib/tools/preferences.h
index 042a15a9e..98468b78c 100644
--- a/src/lib/corelib/tools/preferences.h
+++ b/src/lib/corelib/tools/preferences.h
@@ -53,6 +53,7 @@ class QBS_EXPORT Preferences
{
public:
explicit Preferences(Settings *settings, const QString &profileName = QString());
+ Preferences(Settings *settings, const QVariantMap &profileContents);
bool useColoredOutput() const;
int jobs() const;
@@ -68,6 +69,7 @@ private:
Settings *m_settings;
QString m_profile;
+ QVariantMap m_profileContents;
};
} // namespace qbs