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

QmlDesigner: fixes autotest: testCopyModelRewriter1()

Browse Source 
See: BAUHAUS-393
This commit is contained in:
Thomas Hartmann
2010-03-29 16:00:03 +02:00
parent 4ecdc78c35
commit b5d66dca1b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/core/model/modelmerger.cpp
View File

@@ -108,7 +108,7 @@ static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QStri
int number = 1; int number = 1;
splitIdInBaseNameAndNumber(newId, &baseId, &number); splitIdInBaseNameAndNumber(newId, &baseId, &number);
while (view->hasId(newId) || idRenamingHash.contains(newId)) { while (view->hasId(newId) || idRenamingHash.values().contains(newId)) {
newId = baseId + QString::number(number); newId = baseId + QString::number(number);
number++; number++;
} }
@@ -160,6 +160,7 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode)
QHash<QString, QString> idRenamingHash; QHash<QString, QString> idRenamingHash;
setupIdRenamingHash(modelNode, idRenamingHash, view()); setupIdRenamingHash(modelNode, idRenamingHash, view());
qDebug() << idRenamingHash;
ModelNode newNode(createNodeFromNode(modelNode, idRenamingHash, view())); ModelNode newNode(createNodeFromNode(modelNode, idRenamingHash, view()));
return newNode; return newNode;

8
tests/auto/qml/qmldesigner/coretests/testcore.cpp
View File

@@ -2751,8 +2751,6 @@ void TestCore::testRewriterFirstDefinitionInside()
void TestCore::testCopyModelRewriter1() void TestCore::testCopyModelRewriter1()
{ {
QSKIP("Fix me!!! Task BaAUHAUS-393", SkipAll);
const QLatin1String qmlString("\n" const QLatin1String qmlString("\n"
"import Qt 4.6\n" "import Qt 4.6\n"
"\n" "\n"
@@ -2865,20 +2863,20 @@ void TestCore::testCopyModelRewriter1()
" x: 10\n" " x: 10\n"
" y: 10\n" " y: 10\n"
" Rectangle {\n" " Rectangle {\n"
" id: rectangle11\n" " id: rectangle4\n"
" x: 10\n" " x: 10\n"
" y: 10\n" " y: 10\n"
" }\n" " }\n"
"\n" "\n"
" Rectangle {\n" " Rectangle {\n"
" id: rectangle21\n" " id: rectangle5\n"
" x: 100\n" " x: 100\n"
" y: 100\n" " y: 100\n"
" anchors.fill: root1\n" " anchors.fill: root1\n"
" }\n" " }\n"
"\n" "\n"
" Rectangle {\n" " Rectangle {\n"
" id: rectangle31\n" " id: rectangle6\n"
" x: 140\n" " x: 140\n"
" y: 180\n" " y: 180\n"
" gradient: Gradient {\n" " gradient: Gradient {\n"