Merge remote-tracking branch 'origin/4.0'

Change-Id: I9793f0f9019b16f3725c5a9708a5ccf81557cdc6
2016-06-03 09:49:51 +02:00
parent 8fd12818c9 c7419c1fff
commit 33210099f1
6 changed files with 83 additions and 38 deletions
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -951,7 +951,7 @@ bool JsonFieldPage::isComplete() const
                showError(message);
                hasErrorMessage = true;
            }
-            if (f->isMandatory())
+            if (f->isMandatory() && !f->widget()->isHidden())
                result = false;
        }
    }