Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.0

1 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
index f71de2b612..3d5b223d4c 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h
@@ -67,12 +67,14 @@ struct CustomWizardFile {
 struct CustomWizardParameters
 {
 public:
+    enum ParseResult { ParseOk, ParseDisabled, ParseFailed };
+
     CustomWizardParameters();
     void clear();
-    bool parse(QIODevice &device, const QString &configFileFullPath,
-               Core::BaseFileWizardParameters *bp, QString *errorMessage);
-    bool parse(const QString &configFileFullPath,
-               Core::BaseFileWizardParameters *bp, QString *errorMessage);
+    ParseResult parse(QIODevice &device, const QString &configFileFullPath,
+                      Core::BaseFileWizardParameters *bp, QString *errorMessage);
+    ParseResult parse(const QString &configFileFullPath,
+                      Core::BaseFileWizardParameters *bp, QString *errorMessage);
     QString toString() const;
 
     QString directory;