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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
This commit is contained in:
Oswald Buddenhagen
2010-11-04 19:18:45 +01:00
parent d6d7b97a61 f4ac36b485
commit dd45277a19
21 changed files with 167 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -719,6 +719,7 @@ void Qt4PriFileNode::folderChanged(const QString &folder)
}
contents.updateSubFolders(this, this);
m_project->updateFileList();
}
bool Qt4PriFileNode::deploysFolder(const QString &folder) const