diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 13:57:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-12 13:57:52 (GMT) |
| commit | b4f62b875b135f94ccc587f1937db3347fd62198 (patch) | |
| tree | 2e9c1ca261a6bcde36e030d8875004a2f376d375 /Source | |
| parent | af0ee419553c501cb81f6210b9b1f724844c3dcd (diff) | |
| parent | 9a673737163a3474c83c8100c57454318344ef1c (diff) | |
| download | CMake-b4f62b875b135f94ccc587f1937db3347fd62198.zip CMake-b4f62b875b135f94ccc587f1937db3347fd62198.tar.gz CMake-b4f62b875b135f94ccc587f1937db3347fd62198.tar.bz2 | |
Merge topic 'fix-autouic-regression'
9a673737 QtAutoUic: Add a test for the regression in the parent commit.
7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSourceFile.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx index 27fda40..6847475 100644 --- a/Source/cmSourceFile.cxx +++ b/Source/cmSourceFile.cxx @@ -24,7 +24,7 @@ cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name): this->CustomCommand = 0; this->Properties.SetCMakeInstance(mf->GetCMakeInstance()); this->FindFullPathFailed = false; - this->IsUiFile = ("ui" == + this->IsUiFile = (".ui" == cmSystemTools::GetFilenameLastExtension(this->Location.GetName())); } |