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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
This commit is contained in:
Eike Ziller
2014-04-02 13:24:34 +02:00
parent c9a9814f89 0c68cbbaa9
commit cab8e4aa03
268 changed files with 6338 additions and 7906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -40,6 +40,9 @@
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljsutils.h>
#include <qmljstools/qmljsrefactoringchanges.h>
#include <projectexplorer/session.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/project.h>
#include <QCoreApplication>
#include <QDir>
@@ -108,6 +111,16 @@ public:
if (!refactoring.createFile(newFileName, txt))
return;
if (path == QFileInfo(fileName()).path()) {
// hack for the common case, next version should use the wizard
ProjectExplorer::Node * oldFileNode = ProjectExplorer::SessionManager::nodeForFile(fileName());
if (oldFileNode) {
ProjectExplorer::FolderNode *containingFolder = oldFileNode->parentFolderNode();
if (containingFolder)
containingFolder->addFiles(QStringList(newFileName));
}
}
Core::IVersionControl *versionControl = Core::VcsManager::findVersionControlForDirectory(path);
if (versionControl
&& versionControl->supportsOperation(Core::IVersionControl::AddOperation)) {