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

Make compile with MSVC 2012

Browse Source 
That compiler doesn't have variadic templates so std::tie takes
at most 5 parameters.

Change-Id: I9c8b56a3847be54a9cc4a5a356835efd8772ffa7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-03-23 11:53:07 +01:00
parent 7481bff2b4
commit 69f8463fdd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -114,8 +114,10 @@ public:
inline bool operator ==(const QMakeStepConfig &a, const QMakeStepConfig &b) { inline bool operator ==(const QMakeStepConfig &a, const QMakeStepConfig &b) {
return std::tie(a.archConfig, a.osType, a.linkQmlDebuggingQQ1, a.linkQmlDebuggingQQ2, a.useQtQuickCompiler, a.separateDebugInfo) return std::tie(a.archConfig, a.osType, a.linkQmlDebuggingQQ1, a.linkQmlDebuggingQQ2)
== std::tie(b.archConfig, b.osType, b.linkQmlDebuggingQQ1, b.linkQmlDebuggingQQ2, b.useQtQuickCompiler, b.separateDebugInfo); == std::tie(b.archConfig, b.osType, b.linkQmlDebuggingQQ1, b.linkQmlDebuggingQQ2)
&& std::tie(a.useQtQuickCompiler, a.separateDebugInfo)
== std::tie(b.useQtQuickCompiler, b.separateDebugInfo);
} }
inline bool operator !=(const QMakeStepConfig &a, const QMakeStepConfig &b) { inline bool operator !=(const QMakeStepConfig &a, const QMakeStepConfig &b) {