5 files changed, 13 insertions, 11 deletions
diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp
index d9d06e4994..1de1603253 100644
--- a/src/libs/utils/filewizarddialog.cpp
+++ b/src/libs/utils/filewizarddialog.cpp
@@ -35,13 +35,14 @@
 namespace Utils {
 
 FileWizardDialog::FileWizardDialog(QWidget *parent) :
-    QWizard(parent),
+    Wizard(parent),
     m_filePage(new FileWizardPage)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setOption(QWizard::NoCancelButton, false);
     setOption(QWizard::NoDefaultButton, false);
-    addPage(m_filePage);
+    const int filePageId = addPage(m_filePage);
+    wizardProgress()->item(filePageId)->setTitle(tr("Location"));
     connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
 }
 
diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h
index a071ba3ac0..0b3470139c 100644
--- a/src/libs/utils/filewizarddialog.h
+++ b/src/libs/utils/filewizarddialog.h
@@ -31,8 +31,7 @@
 #define FILEWIZARDDIALOG_H
 
 #include "utils_global.h"
-
-#include <QtGui/QWizard>
+#include "wizard.h"
 
 namespace Utils {
 
@@ -43,7 +42,7 @@ class FileWizardPage;
    and path. Custom pages can be added via Core::IWizardExtension.
 */
 
-class QTCREATOR_UTILS_EXPORT FileWizardDialog : public QWizard {
+class QTCREATOR_UTILS_EXPORT FileWizardDialog : public Wizard {
     Q_OBJECT
     Q_DISABLE_COPY(FileWizardDialog)
 public:
diff --git a/src/libs/utils/filewizardpage.ui b/src/libs/utils/filewizardpage.ui
index 2657a586bd..17b78cae6d 100644
--- a/src/libs/utils/filewizardpage.ui
+++ b/src/libs/utils/filewizardpage.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="title">
-   <string>Choose the location</string>
+   <string>Choose the Location</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
@@ -38,16 +38,16 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>Utils::FileNameValidatingLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">utils/filenamevalidatinglineedit.h</header>
+  </customwidget>
+  <customwidget>
    <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header>pathchooser.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>Utils::FileNameValidatingLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>filenamevalidatinglineedit.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index 4489c95ca2..dea12c3abe 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -33,6 +33,7 @@
 #include <QHBoxLayout>
 #include <QMap>
 #include <QHash>
+#include <QVariant>
 
 namespace Utils {
 
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h
index 87e43278c1..94993deb30 100644
--- a/src/libs/utils/wizard.h
+++ b/src/libs/utils/wizard.h
@@ -38,6 +38,7 @@
 
 namespace Utils {
 
+class Wizard;
 class WizardProgress;
 class WizardPrivate;