From f1feb0e25ce35eb77bbffbb172ae46d2416d1461 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Wed, 3 Dec 2008 16:18:33 +0100 Subject: [PATCH 1/3] Fixed the current progress value of the background parser. --- src/plugins/cpptools/cppmodelmanager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 1708e62de35..313ea7f21ff 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -505,7 +505,7 @@ CppModelManager::ProjectInfo *CppModelManager::projectInfo(ProjectExplorer::Proj QFuture CppModelManager::refreshSourceFiles(const QStringList &sourceFiles) { - if (qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) { + if (! sourceFiles.isEmpty() && qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) { const QMap workingCopy = buildWorkingCopyList(); QFuture result = QtConcurrent::run(&CppModelManager::parse, this, @@ -657,6 +657,8 @@ void CppModelManager::parse(QFutureInterface &future, QStringList files, QMap 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 &future, #endif } + future.setProgressValue(files.size()); + // Restore the previous thread priority. QThread::currentThread()->setPriority(QThread::NormalPriority); } From 4686ec8150daa8ae2fcc6a2e3bf3185828dd455b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Wed, 3 Dec 2008 16:34:01 +0100 Subject: [PATCH 2/3] Some updates to .gitignore --- .gitignore | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 0f3b119423d..f140cb47ca6 100644 --- a/.gitignore +++ b/.gitignore @@ -68,8 +68,8 @@ src/corelib/lib src/network/lib src/xml/lib/ -# Files copied by syncIde -# ----------------------- +# Binaries +# -------- bin/Aggregation.dll bin/CodeModel.dll bin/ExtensionSystem.dll @@ -77,24 +77,4 @@ bin/QtConcurrent.dll bin/Utils.dll bin/qtcreator bin/qtcreator.exe -shared/help/bookmarkdialog.ui -shared/help/bookmarkmanager.cpp -shared/help/bookmarkmanager.h -shared/help/contentwindow.cpp -shared/help/contentwindow.h -shared/help/filternamedialog.cpp -shared/help/filternamedialog.h -shared/help/filternamedialog.ui -shared/help/helpviewer.cpp -shared/help/helpviewer.h -shared/help/indexwindow.cpp -shared/help/indexwindow.h -shared/help/topicchooser.cpp -shared/help/topicchooser.h -shared/help/topicchooser.ui -shared/proparser/abstractproitemvisitor.h -shared/proparser/profileevaluator.cpp -shared/proparser/profileevaluator.h -shared/proparser/proitems.cpp -shared/proparser/proitems.h -shared/proparser/proparserutils.h +tests/manual/cplusplus/cplusplus0 From 6dc7be59759f71270214751dc604f12cf5248408 Mon Sep 17 00:00:00 2001 From: con Date: Wed, 3 Dec 2008 16:34:33 +0100 Subject: [PATCH 3/3] Fixes: - Cancel button and default button for wizards on Mac --- src/libs/utils/filewizarddialog.cpp | 2 ++ src/plugins/coreplugin/basefilewizard.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp index 8608fed73ec..8441cdb8638 100644 --- a/src/libs/utils/filewizarddialog.cpp +++ b/src/libs/utils/filewizarddialog.cpp @@ -44,6 +44,8 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) : m_filePage(new FileWizardPage) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + setOption(QWizard::NoCancelButton, false); + setOption(QWizard::NoDefaultButton, false); setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png"))); addPage(m_filePage); connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick())); diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index f72353743b8..58030ba20c9 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -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)