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:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
This commit is contained in:
Oswald Buddenhagen
2014-03-27 18:20:00 +01:00
parent 187bb36945 0afa004c0b
commit f013c41d05
272 changed files with 8516 additions and 10735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -901,9 +901,14 @@ void DocumentManager::checkForReload()
{
if (d->m_changedFiles.isEmpty())
return;
if (!QApplication::activeWindow() || QApplication::activeModalWidget())
if (!QApplication::activeWindow())
return;
if (QApplication::activeModalWidget()) { // a modal dialog, recheck later
QTimer::singleShot(200, this, SLOT(checkForReload()));
return;
}
if (d->m_blockActivated)
return;

2
src/plugins/coreplugin/locator/opendocumentsfilter.cpp
View File

@@ -76,7 +76,7 @@ QList<LocatorFilterEntry> OpenDocumentsFilter::matchesFor(QFutureInterface<Core:
QString displayName = editorEntry.displayName();
if (regexp.exactMatch(displayName)) {
QFileInfo fi(fileName);
LocatorFilterEntry fiEntry(this, fi.fileName(), QString(fileName + lineNoSuffix));
LocatorFilterEntry fiEntry(this, displayName, QString(fileName + lineNoSuffix));
fiEntry.extraInfo = FileUtils::shortNativePath(FileName(fi));
fiEntry.fileName = fileName;
QList<LocatorFilterEntry> &category = displayName.startsWith(entry, caseSensitivityForPrefix)