diff options
| author | Christian Kandeler <[email protected]> | 2019-11-28 14:37:02 +0100 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2019-11-28 14:48:36 +0000 |
| commit | 8a2fb303788c7e0b40533c7cef28c4a5168c581c (patch) | |
| tree | 9d63f4182845829393be8e3db547e3f728848d4a /src/plugins/qmakeprojectmanager/makefileparse.cpp | |
| parent | 110f8491c902e2a656f957ea60a7841c6778d729 (diff) | |
QmakeBuildConfiguration: Make use of SeparateDebugInfoAspect
Change-Id: I0dceadf2a6ef34187fa4107f3fc5d6831ecb7bfe
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makefileparse.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index 5fd6d5b0be3..939704373c2 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -224,7 +224,7 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments) } if (foundForceDebugInfo && foundSeparateDebugInfo) { - m_config.separateDebugInfo = true; + m_config.separateDebugInfo = ProjectExplorer::SeparateDebugInfoAspect::Value::Enabled; } else if (foundForceDebugInfo) { // Found only force_debug_info, so readd it QMakeAssignment newQA; @@ -376,7 +376,8 @@ void MakeFileParse::parseCommandLine(const QString &command, const QString &proj qCDebug(logging()) << " OsType" << m_config.osType; qCDebug(logging()) << " LinkQmlDebuggingQQ2" << m_config.linkQmlDebuggingQQ2; qCDebug(logging()) << " Qt Quick Compiler" << m_config.useQtQuickCompiler; - qCDebug(logging()) << " Separate Debug Info" << m_config.separateDebugInfo; + qCDebug(logging()) << " Separate Debug Info" + << (m_config.separateDebugInfo == ProjectExplorer::SeparateDebugInfoAspect::Value::Enabled); // Create command line of all unfiltered arguments foreach (const QMakeAssignment &qa, assignments) @@ -523,6 +524,7 @@ void QmakeProjectManagerPlugin::testMakefileParser() QCOMPARE(qmsc.osType, static_cast<QMakeStepConfig::OsType>(osType)); QCOMPARE(qmsc.linkQmlDebuggingQQ2, linkQmlDebuggingQQ2); QCOMPARE(qmsc.useQtQuickCompiler, useQtQuickCompiler); - QCOMPARE(qmsc.separateDebugInfo, separateDebugInfo); + QCOMPARE(qmsc.separateDebugInfo == ProjectExplorer::SeparateDebugInfoAspect::Value::Enabled, + separateDebugInfo); } #endif |