diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-09 11:20:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-09 14:31:14 +0200 |
| commit | 56c3d8ffaba76a69a36c6083ee0abdf103355025 (patch) | |
| tree | e9ee2ffb9157a567797ac267d0789c40ed46547b /src/plugins/qnx/blackberryinstallwizard.h | |
| parent | 1ba9c8ef148eddb96751246ed627bf5bddccf5fc (diff) | |
| download | qt-creator-56c3d8ffaba76a69a36c6083ee0abdf103355025.tar.gz | |
Unify wizards with TOC and cancel button.
QTBUG-28385 is biting us over and over (QWizard doesn't have close
button nor cancel button on Mac in Qt 5), and actually there's no reason
for us having a wizard without the features from Utils::Wizard.
Task-number: QTCREATORBUG-10346
Task-number: QTBUG-28385
Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/qnx/blackberryinstallwizard.h')
| -rw-r--r-- | src/plugins/qnx/blackberryinstallwizard.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qnx/blackberryinstallwizard.h b/src/plugins/qnx/blackberryinstallwizard.h index b81a26e636..c00b7970cd 100644 --- a/src/plugins/qnx/blackberryinstallwizard.h +++ b/src/plugins/qnx/blackberryinstallwizard.h @@ -32,9 +32,9 @@ #ifndef QNX_INTERNAL_BLACKBERRYDEVICECONFIGURATIONWIZARD_H #define QNX_INTERNAL_BLACKBERRYDEVICECONFIGURATIONWIZARD_H -#include <QProcess> +#include <utils/wizard.h> -#include <QWizard> +#include <QProcess> namespace Qnx { namespace Internal { @@ -61,7 +61,7 @@ public: Mode mode; }; -class BlackBerryInstallWizard : public QWizard +class BlackBerryInstallWizard : public Utils::Wizard { Q_OBJECT public: |