Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

This commit is contained in:
con
2008-12-15 11:38:41 +01:00
8 changed files with 26 additions and 17 deletions

View File

@@ -311,7 +311,7 @@ QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
rowInResult = findInResultInsertPosition(item.name);
int rowInChanges = findInChangesInsertPosition(item.name);
qDebug()<<"addVariable "<<item.name<<existsInBaseEnvironment<<rowInResult<<rowInChanges;
//qDebug() << "addVariable " << item.name << existsInBaseEnvironment << rowInResult << rowInChanges;
if (existsInBaseEnvironment) {
m_items.insert(rowInChanges, item);