Merge remote-tracking branch 'origin/2.5'

This commit is contained in:
Eike Ziller
2012-04-04 16:20:10 +02:00
40 changed files with 218 additions and 65 deletions

View File

@@ -169,7 +169,7 @@ public:
virtual QString descriptionImage() const;
virtual void runWizard(const QString &path, QWidget *parent, const QString &platform);
virtual void runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues);
virtual Core::FeatureSet requiredFeatures() const;
virtual WizardFlags flags() const;