[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] languages/plugins/custom-definesandincludes/kcm_widget: Fix setting and enablement of par
From:       Albert Astals Cid <null () kde ! org>
Date:       2017-05-27 16:36:38
Message-ID: E1dEehi-00037h-Rp () code ! kde ! org
[Download RAW message or body]

Git commit 02f3b3a0acf9f90979fe53c93484464a5f95798d by Albert Astals Cid, on behalf \
of Aaron Puchert. Committed on 27/05/2017 at 16:35.
Pushed by aacid into branch 'master'.

Fix setting and enablement of parser options fields

The data for OpenCL and Cuda sources has been mistakenly written into
the C++ fields.

Differential Revision: https://phabricator.kde.org/D5977

M  +4    -4    languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.cpp


https://commits.kde.org/kdevelop/02f3b3a0acf9f90979fe53c93484464a5f95798d

diff --git a/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.cpp \
b/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.cpp index \
                c550491175..17ee3d88c6 100644
--- a/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.cpp
+++ b/languages/plugins/custom-definesandincludes/kcm_widget/parserwidget.cpp
@@ -168,8 +168,8 @@ void ParserWidget::setParserArguments(const ParserArguments& \
arguments)  
     setArguments(m_ui->languageStandardsCpp, m_ui->parserOptionsCpp, \
                arguments.cppArguments);
     setArguments(m_ui->languageStandardsC, m_ui->parserOptionsC, \
                arguments.cArguments);
-    setArguments(m_ui->languageStandardsCpp, m_ui->parserOptionsOpenCl, \
                arguments.openClArguments);
-    setArguments(m_ui->languageStandardsCpp, m_ui->parserOptionsCuda, \
arguments.cudaArguments); +    setArguments(m_ui->languageStandardsOpenCl, \
m_ui->parserOptionsOpenCl, arguments.openClArguments); +    \
setArguments(m_ui->languageStandardsCuda, m_ui->parserOptionsCuda, \
arguments.cudaArguments);  
     m_ui->parseHeadersInPlainC->setChecked(!arguments.parseAmbiguousAsCPP);
 
@@ -191,6 +191,6 @@ void ParserWidget::updateEnablements()
 {
     m_ui->parserOptionsCpp->setEnabled(m_ui->languageStandardsCpp->currentIndex() == \
                customProfileIdx);
     m_ui->parserOptionsC->setEnabled(m_ui->languageStandardsC->currentIndex() == \
                customProfileIdx);
-    m_ui->parserOptionsCpp->setEnabled(m_ui->languageStandardsOpenCl->currentIndex() \
                == customProfileIdx);
-    m_ui->parserOptionsCpp->setEnabled(m_ui->languageStandardsCuda->currentIndex() \
== customProfileIdx); +    \
m_ui->parserOptionsOpenCl->setEnabled(m_ui->languageStandardsOpenCl->currentIndex() \
== customProfileIdx); +    \
m_ui->parserOptionsCuda->setEnabled(m_ui->languageStandardsCuda->currentIndex() == \
customProfileIdx);  }


[prev in list] [next in list] [prev in thread] [next in thread]