diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-04-23 06:10:12 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2010-04-24 18:44:48 (GMT) |
| commit | 9af9e1d92504647e41d27c1229a2572a90bf4fd7 (patch) | |
| tree | a009b26774699be83b0a944ee0587805023b9689 /qmake/generators/win32/msbuild_objectmodel.cpp | |
| parent | e8e26d3f3f7eedf080892dc000ca11360e4cf1c6 (diff) | |
| download | Qt-9af9e1d92504647e41d27c1229a2572a90bf4fd7.zip Qt-9af9e1d92504647e41d27c1229a2572a90bf4fd7.tar.gz Qt-9af9e1d92504647e41d27c1229a2572a90bf4fd7.tar.bz2 | |
Fix all qmake Makefiles to include the MSBuild backend
Reviewed-by: trustme
Diffstat (limited to 'qmake/generators/win32/msbuild_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index f459885..d011c5c 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -2705,13 +2705,13 @@ bool VCXFilter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QSt // VCXProjectSingleConfig -------------------------------------------- -VCXFilter nullFilter; +VCXFilter nullVCXFilter; VCXFilter& VCXProjectSingleConfig::filterForExtraCompiler(const QString &compilerName) { for (int i = 0; i < ExtraCompilersFiles.count(); ++i) if (ExtraCompilersFiles.at(i).Name == compilerName) return ExtraCompilersFiles[i]; - return nullFilter; + return nullVCXFilter; } |