feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I4876ce528e2422f63280535fe4f9dd6610a75dec
This commit is contained in:
Eike Ziller
2017-07-28 13:19:50 +02:00
parent da06a6546d 48d3fd1af5
commit aed6a66be3
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/createDevPackage.py
View File

@@ -57,17 +57,16 @@ def parse_arguments():
source_include_patterns = [ source_include_patterns = [
# directories # directories
r"^scripts/.*$", # everything under scripts/ r"^(?!(share|tests)/.*$)(.*/)?$", # look into all directories except under share/ and tests/
r"^doc/.*$", # everything under doc/
r"^share/(qtcreator/(qml/(qmlpuppet/(.*/)?)?)?)?$", # for shared headers for qt quick designer plugins 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 # files
r"^HACKING$", r"^HACKING$",
r"^LICENSE.*$", r"^LICENSE.*$",
r"^README.md$", r"^README.md$",
r"^.*\.pri$", r"^scripts/.*$", # include everything under scripts/
r"^.*\.h$", 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 = [ build_include_patterns = [

7
src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
View File

@@ -756,6 +756,13 @@ void ModelController::moveObject(MPackage *newOwner, MObject *object)
QMT_CHECK(object); QMT_CHECK(object);
QMT_CHECK(object != m_rootPackage); 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()) { if (newOwner != object->owner()) {
int formerRow = 0; int formerRow = 0;
MObject *formerOwner = object->owner(); MObject *formerOwner = object->owner();