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

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

Browse Source
This commit is contained in:
hjk
2008-12-03 16:52:08 +01:00
parent 741a3e8ed9 6dc7be5975
commit 2f1f67f52a
4 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/basefilewizard.cpp
View File

@@ -509,6 +509,8 @@ QPixmap BaseFileWizard::watermark()
void BaseFileWizard::setupWizard(QWizard *w)
{
w->setPixmap(QWizard::WatermarkPixmap, watermark());
w->setOption(QWizard::NoCancelButton, false);
w->setOption(QWizard::NoDefaultButton, false);
}
bool BaseFileWizard::postGenerateFiles(const GeneratedFiles &l, QString *errorMessage)

6
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -505,7 +505,7 @@ CppModelManager::ProjectInfo *CppModelManager::projectInfo(ProjectExplorer::Proj
QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles)
{
if (qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) {
if (! sourceFiles.isEmpty() && qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) {
const QMap<QString, QByteArray> workingCopy = buildWorkingCopyList();
QFuture<void> result = QtConcurrent::run(&CppModelManager::parse, this,
@@ -657,6 +657,8 @@ void CppModelManager::parse(QFutureInterface<void> &future,
QStringList files,
QMap<QString, QByteArray> workingCopy)
{
Q_ASSERT(! files.isEmpty());
// Change the priority of the background parser thread to idle.
QThread::currentThread()->setPriority(QThread::IdlePriority);
@@ -698,6 +700,8 @@ void CppModelManager::parse(QFutureInterface<void> &future,
#endif
}
future.setProgressValue(files.size());
// Restore the previous thread priority.
QThread::currentThread()->setPriority(QThread::NormalPriority);
}