diff options
| author | Michal Klocek <michal.klocek@digia.com> | 2013-09-12 18:41:34 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2013-09-13 12:25:14 +0200 |
| commit | 50f2bf8baf69425b39a68fa9001b6769390deff0 (patch) | |
| tree | 108c99fc6198391cc657d71e68b4b04db1f8ef23 | |
| parent | 3379918d4aeb3efb47a80d6bfa6d87f4313dce77 (diff) | |
Bugfix ported from 1.5 branch on customer request
Remove some superfluous qApp->processEvents().
This shouldn't be there, as it forces event handling in certain
situations which break other parts of the UI event handling. We
experienced a missing redraw which caused hacky workarounds.
Original gerrit id: I2185ecb1b99d1ff20caa9a08637d77100e520445
Change-Id: I46f028838d680ba46183df6d0368811eb041d2e2
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | src/libs/installer/packagemanagergui.cpp | 3 | ||||
| -rw-r--r-- | src/sdk/installerbasecommons.cpp | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 9b80e70a3..034b450e6 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -62,7 +62,6 @@ #include <QtCore/QSettings> #include <QtCore/QTimer> -#include <QApplication> #include <QCheckBox> #include <QDesktopServices> #include <QFileDialog> @@ -727,8 +726,6 @@ QWidget *PackageManagerPage::findWidget(const QString &objectName) const void PackageManagerPage::setVisible(bool visible) { QWizardPage::setVisible(visible); - qApp->processEvents(); - if (m_fresh && !visible) { // this is only hit once when the page gets added to the wizard m_fresh = false; diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index 19b76ce7c..d2fb5e27b 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -317,10 +317,6 @@ void IntroductionPageImpl::setPackageManager(bool value) void IntroductionPageImpl::onCoreNetworkSettingsChanged() { - // force a repaint of the ui as after the settings dialog has been closed and the wizard has been - // restarted, the "Next" button looks still disabled. TODO: figure out why this happens at all! - gui()->repaint(); - m_updatesFetched = false; m_allPackagesFetched = false; } @@ -344,8 +340,6 @@ void IntroductionPageImpl::entering() void IntroductionPageImpl::leaving() { - // TODO: force repaint on next page, keeps unpainted after fetch - QTimer::singleShot(100, gui()->page(nextId()), SLOT(repaint())); setButtonText(QWizard::CancelButton, gui()->defaultButtonText(QWizard::CancelButton)); } @@ -442,9 +436,6 @@ bool TargetDirectoryPageImpl::askQuestion(const QString &identifier, const QStri QMessageBox::StandardButton bt = MessageBoxHandler::warning(MessageBoxHandler::currentBestSuitParent(), identifier, TargetDirectoryPageImpl::tr("Warning"), message, QMessageBox::Yes | QMessageBox::No); -#ifndef Q_OS_MAC - QTimer::singleShot(100, wizard()->page(nextId()), SLOT(repaint())); -#endif return bt == QMessageBox::Yes; } @@ -452,9 +443,6 @@ bool TargetDirectoryPageImpl::failWithError(const QString &identifier, const QSt { MessageBoxHandler::critical(MessageBoxHandler::currentBestSuitParent(), identifier, TargetDirectoryPageImpl::tr("Error"), message); -#ifndef Q_OS_MAC - QTimer::singleShot(100, wizard()->page(nextId()), SLOT(repaint())); -#endif return false; } |