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

recognize backslashes when evaluating a feature file's relativity

Browse Source 
this is an utterly irrelevant non-feature, but whatever.
This commit is contained in:
Oswald Buddenhagen
2011-03-18 20:03:56 +01:00
parent f8bc129055
commit 2e22ba59d9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/shared/proparser/profileevaluator.cpp
View File

@@ -3028,7 +3028,8 @@ bool ProFileEvaluator::Private::evaluateFeatureFile(const QString &fileName)
if (!fn.endsWith(QLatin1String(".prf"))) if (!fn.endsWith(QLatin1String(".prf")))
fn += QLatin1String(".prf"); fn += QLatin1String(".prf");
if (!fileName.contains((ushort)'/') || !IoUtils::exists(resolvePath(fn))) { if ((!fileName.contains((ushort)'/') && !fileName.contains((ushort)'\\'))
|| !IoUtils::exists(resolvePath(fn))) {
if (m_option->feature_roots.isEmpty()) if (m_option->feature_roots.isEmpty())
m_option->feature_roots = qmakeFeaturePaths(); m_option->feature_roots = qmakeFeaturePaths();
int start_root = 0; int start_root = 0;