diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-13 12:46:45 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-13 12:46:45 +0100 |
| commit | 7b9db3b5516e0165ba9a4a89058908a7ac3daf88 (patch) | |
| tree | 16546cd92f619256a34b19ec72d38cd483adf71a /src | |
| parent | ea29068e34d2aa1014a5535cddb660110911a158 (diff) | |
| parent | 3d3e6ad7f9b1ded891364b840d7d7b6292ff30cc (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I9baea78386e8b11faaf2ee3e26c8d87be8381a1e
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 | ||||
| -rw-r--r-- | src/sdk/installerbasecommons.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 35603eab3..9b25728d6 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -62,7 +62,7 @@ #include <productkeycheck.h> -#include <QtCore/QtConcurrentRun> +#include <QtConcurrentRun> #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDirIterator> diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index 5a08d20d3..becd7633a 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -441,8 +441,9 @@ 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; } @@ -450,8 +451,9 @@ 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; } |