Commit 2f1f67f5 authored by hjk's avatar hjk
Browse files

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

parents 741a3e8e 6dc7be59
...@@ -68,8 +68,8 @@ src/corelib/lib ...@@ -68,8 +68,8 @@ src/corelib/lib
src/network/lib src/network/lib
src/xml/lib/ src/xml/lib/
# Files copied by syncIde # Binaries
# ----------------------- # --------
bin/Aggregation.dll bin/Aggregation.dll
bin/CodeModel.dll bin/CodeModel.dll
bin/ExtensionSystem.dll bin/ExtensionSystem.dll
...@@ -77,24 +77,4 @@ bin/QtConcurrent.dll ...@@ -77,24 +77,4 @@ bin/QtConcurrent.dll
bin/Utils.dll bin/Utils.dll
bin/qtcreator bin/qtcreator
bin/qtcreator.exe bin/qtcreator.exe
shared/help/bookmarkdialog.ui tests/manual/cplusplus/cplusplus0
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
...@@ -44,6 +44,8 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) : ...@@ -44,6 +44,8 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
m_filePage(new FileWizardPage) m_filePage(new FileWizardPage)
{ {
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setOption(QWizard::NoCancelButton, false);
setOption(QWizard::NoDefaultButton, false);
setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png"))); setPixmap(QWizard::WatermarkPixmap, QPixmap(QLatin1String(":/qworkbench/images/qtwatermark.png")));
addPage(m_filePage); addPage(m_filePage);
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick())); connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
......
...@@ -509,6 +509,8 @@ QPixmap BaseFileWizard::watermark() ...@@ -509,6 +509,8 @@ QPixmap BaseFileWizard::watermark()
void BaseFileWizard::setupWizard(QWizard *w) void BaseFileWizard::setupWizard(QWizard *w)
{ {
w->setPixmap(QWizard::WatermarkPixmap, watermark()); w->setPixmap(QWizard::WatermarkPixmap, watermark());
w->setOption(QWizard::NoCancelButton, false);
w->setOption(QWizard::NoDefaultButton, false);
} }
bool BaseFileWizard::postGenerateFiles(const GeneratedFiles &l, QString *errorMessage) bool BaseFileWizard::postGenerateFiles(const GeneratedFiles &l, QString *errorMessage)
......
...@@ -505,7 +505,7 @@ CppModelManager::ProjectInfo *CppModelManager::projectInfo(ProjectExplorer::Proj ...@@ -505,7 +505,7 @@ CppModelManager::ProjectInfo *CppModelManager::projectInfo(ProjectExplorer::Proj
QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles) 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(); const QMap<QString, QByteArray> workingCopy = buildWorkingCopyList();
QFuture<void> result = QtConcurrent::run(&CppModelManager::parse, this, QFuture<void> result = QtConcurrent::run(&CppModelManager::parse, this,
...@@ -657,6 +657,8 @@ void CppModelManager::parse(QFutureInterface<void> &future, ...@@ -657,6 +657,8 @@ void CppModelManager::parse(QFutureInterface<void> &future,
QStringList files, QStringList files,
QMap<QString, QByteArray> workingCopy) QMap<QString, QByteArray> workingCopy)
{ {
Q_ASSERT(! files.isEmpty());
// Change the priority of the background parser thread to idle. // Change the priority of the background parser thread to idle.
QThread::currentThread()->setPriority(QThread::IdlePriority); QThread::currentThread()->setPriority(QThread::IdlePriority);
...@@ -698,6 +700,8 @@ void CppModelManager::parse(QFutureInterface<void> &future, ...@@ -698,6 +700,8 @@ void CppModelManager::parse(QFutureInterface<void> &future,
#endif #endif
} }
future.setProgressValue(files.size());
// Restore the previous thread priority. // Restore the previous thread priority.
QThread::currentThread()->setPriority(QThread::NormalPriority); QThread::currentThread()->setPriority(QThread::NormalPriority);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment