Merge branch 'xcode-storyboard-file-type-2.8.12' into release

2014-01-09 14:06:05 -05:00 · 2014-01-09 14:06:05 -05:00 · 67fd61b061
parent 5e3458830e 93fc5a53a6
commit 67fd61b061
1 changed files with 4 additions and 2 deletions
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@ -877,8 +877,10 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
    }

  std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-
-  fileRef->AddAttribute("explicitFileType",
+  const char* attribute = (sourcecode == "file.storyboard") ?
+                           "lastKnownFileType" :
+                           "explicitFileType";
+  fileRef->AddAttribute(attribute,
                        this->CreateString(sourcecode.c_str()));

  // Store the file path relative to the top of the source tree.