Merge remote branch 'origin/2.0'

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

diff --cc share/qtcreator/gdbmacros/dumper.py
index 4bd98a0,d49e168..8876dba
--- 1/share/qtcreator/gdbmacros/dumper.py
--- 2/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@@ -1349,11 -1322,11 +1349,18 @@@ class Dumper
                  value = item.value
                  type = value.type
  
 -        typedefStrippedType = stripTypedefs(type);
 -        nsStrippedType = self.stripNamespaceFromType(
 -            typedefStrippedType).replace("::", "__")
 +        typedefStrippedType = stripTypedefs(type)
 +        nsStrippedType = self.stripNamespaceFromType(typedefStrippedType)\
 +            .replace("::", "__")
 +
 +        # Is this derived from QObject?
++        try:
++            item.value['staticMetaObject']
++            hasMetaObject = True
++        except:
++            hasMetaObject = False
+ 
+         # Is this derived from QObject?
          try:
              item.value['staticMetaObject']
              hasMetaObject = True

diff --cc share/qtcreator/gdbmacros/gdbmacros.py
Simple merge

diff --cc share/qtcreator/translations/qtcreator_de.ts
Simple merge

diff --cc src/plugins/projectexplorer/customwizard/customwizard.cpp
Simple merge

diff --cc src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index d821ed5,0346920..848944b
--- 1/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
--- 2/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@@ -463,31 -419,8 +471,31 @@@ CustomWizardParameters::ParseResul
                      break;
                  case ParseWithinField: // field attribute
                      field.name = attributeValue(reader, fieldNameAttributeC);
-                     field.mandatory = booleanAttributeValue(reader, fieldMandatoryAttributeC);
+                     field.mandatory = booleanAttributeValue(reader, fieldMandatoryAttributeC, false);
                      break;
 +                case ParseWithinFieldDescription:
 +                    assignLanguageElementText(reader, language, &field.description);
 +                    state = ParseWithinField; // The above reads away the end tag, set state.
 +                    break;
 +                case ParseWithinFieldControl: // Copy widget control attributes
 +                    field.controlAttributes = attributesToStringMap(reader.attributes());
 +                    break;
 +                case ParseWithinComboEntries:
 +                    break;
 +                case ParseWithinComboEntry: // Combo entry with 'value' attribute
 +                    field.controlAttributes.insert(CustomWizardField::comboEntryValueKey(comboEntryCount),
 +                                                   attributeValue(reader, "value"));
 +                    break;
 +                case ParseWithinComboEntryText: {
 +
 +                        // This reads away the end tag, set state here.
 +                        QString text;
 +                        if (assignLanguageElementText(reader, language, &text))
 +                            field.controlAttributes.insert(CustomWizardField::comboEntryTextKey(comboEntryCount),
 +                                                           text);
 +                        state = ParseWithinComboEntry;
 +                }
 +                     break;
                  case ParseWithinFile: { // file attribute
                          CustomWizardFile file;
                          file.source = attributeValue(reader, fileNameSourceAttributeC);
@@@ -510,20 -443,14 +518,20 @@@
              break;
          case QXmlStreamReader::EndElement:
              state = nextClosingState(state, reader.name());
 -            if (state == ParseError) {
 +            switch (state) {
 +            case ParseError:
                  *errorMessage = msgError(reader, configFileFullPath,
                                           QString::fromLatin1("Unexpected end element %1").arg(reader.name().toString()));
-                 return false;
+                 return ParseFailed;
 -            }
 -            if (state == ParseWithinFields) { // Leaving a field element
 +            case ParseWithinFields:  // Leaving a field element
                  fields.push_back(field);
                  field.clear();
 +                break;
 +            case ParseWithinComboEntries:
 +                comboEntryCount++;
 +                break;
 +            default:
 +                break;
              }
              break;
          default:

diff --cc src/plugins/projectexplorer/customwizard/customwizardparameters.h
Simple merge