OSDN Git Service

recognize backslashes when evaluating a feature file's relativity
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 18 Mar 2011 19:03:56 +0000 (20:03 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 18 Mar 2011 20:28:04 +0000 (21:28 +0100)
this is an utterly irrelevant non-feature, but whatever.

src/shared/proparser/profileevaluator.cpp

index 63bea8f..fc7a8ec 100644 (file)
@@ -3028,7 +3028,8 @@ bool ProFileEvaluator::Private::evaluateFeatureFile(const QString &fileName)
     if (!fn.endsWith(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())
             m_option->feature_roots = qmakeFeaturePaths();
         int start_root = 0;