Merge remote-tracking branch 'origin/2.5'

2012-04-04 16:20:10 +02:00
parent 12624eb7f4 06aa0363b0
commit c814538d95
40 changed files with 218 additions and 65 deletions
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -141,7 +141,8 @@ public slots:

    void showNewItemDialog(const QString &title,
                           const QList<IWizard *> &wizards,
-                           const QString &defaultLocation = QString());
+                           const QString &defaultLocation = QString(),
+                           const QVariantMap &extraVariables = QVariantMap());

    bool showOptionsDialog(const QString &category = QString(),
                           const QString &page = QString(),