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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
hjk
2009-01-06 16:05:05 +01:00
parent 9da009aaa1 2f2588bee7
commit c88245ac08
7 changed files with 105 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/find/currentdocumentfind.cpp
View File

@@ -147,9 +147,11 @@ void CurrentDocumentFind::updateCurrentFindFilter(QWidget *old, QWidget *now)
if (!impl)
candidate = candidate->parentWidget();
}
if (!impl)
if (!impl || impl == m_currentFind)
return;
removeFindSupportConnections();
if (m_currentFind)
m_currentFind->highlightAll(QString(), 0);
m_currentWidget = candidate;
m_currentFind = impl;
if (m_currentFind) {

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

@@ -566,7 +566,6 @@ QStringList Qt4Project::files(FilesMode fileMode) const
if (fileMode == AllFiles)
files += m_projectFiles->generatedFiles[i];
}
files += m_projectFiles->proFiles;
return files;
}