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

Find wizard templates in newly introduced userResourcePath(), too.

Browse Source
This commit is contained in:
Daniel Molkentin
2010-08-25 19:11:44 +02:00
parent 460cbadc82
commit 6efe7d33c1
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/customwizard/customwizard.cpp
View File

@@ -309,6 +309,11 @@ QList<CustomWizard*> CustomWizard::createWizards()
const QString templateDirName = Core::ICore::instance()->resourcePath() + const QString templateDirName = Core::ICore::instance()->resourcePath() +
QLatin1Char('/') + QLatin1String(templatePathC); QLatin1Char('/') + QLatin1String(templatePathC);
const QString userTemplateDirName = Core::ICore::instance()->userResourcePath() +
QLatin1Char('/') + QLatin1String(templatePathC);
const QDir templateDir(templateDirName); const QDir templateDir(templateDirName);
if (CustomWizardPrivate::verbose) if (CustomWizardPrivate::verbose)
verboseLog = QString::fromLatin1("### CustomWizard: Checking '%1'\n").arg(templateDirName); verboseLog = QString::fromLatin1("### CustomWizard: Checking '%1'\n").arg(templateDirName);
@@ -318,8 +323,19 @@ QList<CustomWizard*> CustomWizard::createWizards()
return rc; return rc;
} }
const QList<QFileInfo> dirs = templateDir.entryInfoList(QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot, const QDir userTemplateDir(userTemplateDirName);
if (CustomWizardPrivate::verbose)
verboseLog = QString::fromLatin1("### CustomWizard: Checking '%1'\n").arg(userTemplateDirName);
QList<QFileInfo> dirs = templateDir.entryInfoList(QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot,
QDir::Name|QDir::IgnoreCase); QDir::Name|QDir::IgnoreCase);
if (userTemplateDir.exists()) {
if (CustomWizardPrivate::verbose)
verboseLog = QString::fromLatin1("### CustomWizard: userTemplateDir '%1' found, adding\n").arg(userTemplateDirName);
dirs += userTemplateDir.entryInfoList(QDir::Dirs|QDir::Readable|QDir::NoDotAndDotDot,
QDir::Name|QDir::IgnoreCase);
}
const QString configFile = QLatin1String(configFileC); const QString configFile = QLatin1String(configFileC);
// Check and parse config file in each directory. // Check and parse config file in each directory.