forked from qt-creator/qt-creator
Do not override mouse cursor needlessly
Task-number: QTCREATORBUG-3822
This commit is contained in:
@@ -138,12 +138,10 @@ bool SessionFile::load(const QString &fileName)
|
|||||||
|
|
||||||
// NPE: Load the session in the background?
|
// NPE: Load the session in the background?
|
||||||
// NPE: Let FileManager monitor filename
|
// NPE: Let FileManager monitor filename
|
||||||
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
|
|
||||||
|
|
||||||
PersistentSettingsReader reader;
|
PersistentSettingsReader reader;
|
||||||
if (!reader.load(m_fileName)) {
|
if (!reader.load(m_fileName)) {
|
||||||
qWarning() << "SessionManager::load failed!" << fileName;
|
qWarning() << "SessionManager::load failed!" << fileName;
|
||||||
QApplication::restoreOverrideCursor();
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,7 +214,6 @@ bool SessionFile::load(const QString &fileName)
|
|||||||
|
|
||||||
|
|
||||||
future.reportFinished();
|
future.reportFinished();
|
||||||
QApplication::restoreOverrideCursor();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,13 +61,10 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
|
|||||||
// We used to simply call ::exec() on the dialog
|
// We used to simply call ::exec() on the dialog
|
||||||
void ProjectLoadWizard::execDialog()
|
void ProjectLoadWizard::execDialog()
|
||||||
{
|
{
|
||||||
if (!pageIds().isEmpty()) {
|
if (!pageIds().isEmpty())
|
||||||
QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
|
|
||||||
exec();
|
exec();
|
||||||
QApplication::restoreOverrideCursor();
|
else
|
||||||
} else {
|
|
||||||
done(QDialog::Accepted);
|
done(QDialog::Accepted);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ProjectLoadWizard::~ProjectLoadWizard()
|
ProjectLoadWizard::~ProjectLoadWizard()
|
||||||
|
|||||||
Reference in New Issue
Block a user