feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Unbreak compilation after merge

Browse Source 
Change-Id: I5ef36a1978926381c3e7ebb007196a33fcdba4ba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Daniel Teske
2012-04-04 17:39:02 +02:00
committed by Friedemann Kleint
parent 55dc42b380
commit ae7f8e9260
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -131,11 +131,12 @@ public:
virtual WizardFlags flags() const virtual WizardFlags flags() const
{ return Core::IWizard::PlatformIndependent; } { return Core::IWizard::PlatformIndependent; }
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);
}; };
void ScratchFileWizard::runWizard(const QString &, QWidget *, const QString &) void ScratchFileWizard::runWizard(const QString &, QWidget *, const QString &, const QVariantMap &extraValues)
{ {
Q_UNUSED(extraValues)
QString tempPattern = QDir::tempPath(); QString tempPattern = QDir::tempPath();
if (!tempPattern.endsWith(QLatin1Char('/'))) if (!tempPattern.endsWith(QLatin1Char('/')))
tempPattern += QLatin1Char('/'); tempPattern += QLatin1Char('/');