Since fa640f66 we're always switching to the base state when going
from state A to state B. Fix autotests accordingly.

Commit 112df597 removed the definition, but not declaration of
test method.

Reviewed-by: erikv

Reviewed-by: Christian Kamm

Reviewed-by: Christian Kamm

With the inclusion of org.webkit 1.0 types some common ancestors are shared
with different version numbers. These used to override each other. With this
patch the hierarchy is preserved.

This commit includes several changes by Marco Bubke.

Reviewed-by: Marco Bubke

Reviewed-by: kkoehne

Fix for QTCREATORBUG-1490

Reviewed-By: Friedemann Kleint

Reviewed-by: Kai Koehne

Doh!
(cherry picked from commit df0e1e56)

Task-number: BAUHAUS-729, BAUHAUS-731

Bug: BAUHAUS-674

Fix  breakage resulting from 3d852917187e29892529ab51d24c1a1177068a88
(Qt 4.7), remove obsolete 'saddr'-element.

Integration tests

TestCore::testAnchorsAndRewriting
TestCore::testAnchorsAndRewritingCenter

Task-number: Bauhaus-109

The model depends on valid metainfo information.

Store qml versions in the metatype system. Instead of just assuming
e.g. "4, 6" or "4, 7" as default, support passing "-1, -1" as versioning
wildcard.

When inspecting the qml meta type system, versions are now stored also
for types that have no qml name / version. The version of the referenting
type is then taken, e.g. there are now entries for "Qt/Object", 4, 7 and
"Qt/Object", 1, 0 (from QmlProject, 1, 0).

Furthermore, some unused methods were removed, and the logic changed insofar
as that a type can have only one direct super type.

Reviewed-by: Thomas Hartmann
Reviewed-by: Marco Bubke

(cherry picked from commit f9e6a963)

Copy over used files to tests/auto/qml/qmldesigner/data directory.

Done-with: ckamm
Task-number: BAUHAUS-631

'property var' isn't supported any more, it's now 'property variant'

All types in the Qt namespace now have 4.7 as minimum version.