Merge remote-tracking branch 'origin/4.3' into 4.4

Change-Id: I4876ce528e2422f63280535fe4f9dd6610a75dec

scripts/createDevPackage.py

@@ -57,17 +57,16 @@ def parse_arguments():
 
 source_include_patterns = [
     # directories
-    r"^scripts/.*$",     # everything under scripts/
-    r"^doc/.*$",         # everything under doc/
+    r"^(?!(share|tests)/.*$)(.*/)?$",                     # look into all directories except under share/ and tests/
     r"^share/(qtcreator/(qml/(qmlpuppet/(.*/)?)?)?)?$", # for shared headers for qt quick designer plugins
-    r"^src/(.*/)?$",     # all directories under src/
-    r"^plugins/(.*/)?$", # all directories under plugins/ (if this is run on extra plugin repositories)
     # files
     r"^HACKING$",
     r"^LICENSE.*$",
     r"^README.md$",
-    r"^.*\.pri$",
-    r"^.*\.h$",
+    r"^scripts/.*$", # include everything under scripts/
+    r"^doc/.*$",     # include everything under doc/
+    r"^.*\.pri$",    # .pri files in all directories that are looked into
+    r"^.*\.h$",      # .h files in all directories that are looked into
 ]
 
 build_include_patterns = [

src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp

@@ -756,6 +756,13 @@ void ModelController::moveObject(MPackage *newOwner, MObject *object)
     QMT_CHECK(object);
     QMT_CHECK(object != m_rootPackage);
 
+    // verify that newOwner is not a child of object
+    MObject *newOwnerObject = newOwner;
+    while (newOwnerObject && newOwnerObject != object)
+        newOwnerObject = newOwnerObject->owner();
+    if (newOwnerObject == object)
+        return;
+
     if (newOwner != object->owner()) {
         int formerRow = 0;
         MObject *formerOwner = object->owner();