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

List:       kde-commits
Subject:    [kdevelop] /: Make sure we're not ever passing a URL as a path
From:       Aleix Pol <null () kde ! org>
Date:       2017-05-31 16:51:23
Message-ID: E1dG6qB-0000tN-Fy () code ! kde ! org
[Download RAW message or body]

Git commit e0ee15b80cced287d8c4013ff0ca6a206efaf755 by Aleix Pol.
Committed on 31/05/2017 at 16:47.
Pushed by apol into branch 'master'.

Make sure we're not ever passing a URL as a path

M  +1    -1    projectbuilders/cmakebuilder/cmakejob.cpp
M  +2    -2    projectmanagers/cmake/cmakebuilderconfig.kcfg

https://commits.kde.org/kdevelop/e0ee15b80cced287d8c4013ff0ca6a206efaf755

diff --git a/projectbuilders/cmakebuilder/cmakejob.cpp \
b/projectbuilders/cmakebuilder/cmakejob.cpp index 06be041c7a..0ea657578e 100644
--- a/projectbuilders/cmakebuilder/cmakejob.cpp
+++ b/projectbuilders/cmakebuilder/cmakejob.cpp
@@ -82,7 +82,7 @@ QUrl CMakeJob::workingDirectory() const
 QStringList CMakeJob::commandLine() const
 {
     QStringList args;
-    args << CMakeBuilderSettings::self()->cmakeExecutable();
+    args << CMakeBuilderSettings::self()->cmakeExecutable().toLocalFile();
     args << QStringLiteral("-DCMAKE_EXPORT_COMPILE_COMMANDS=ON");
 
     QString installDir = CMake::currentInstallDir( m_project ).toLocalFile();
diff --git a/projectmanagers/cmake/cmakebuilderconfig.kcfg \
b/projectmanagers/cmake/cmakebuilderconfig.kcfg index 864e44bbdf..88a92b7c6a 100644
--- a/projectmanagers/cmake/cmakebuilderconfig.kcfg
+++ b/projectmanagers/cmake/cmakebuilderconfig.kcfg
@@ -6,8 +6,8 @@
   <include>cmakeutils.h</include>
   <kcfgfile name="kdeveloprc"/>
   <group name="CMakeBuilder">
-    <entry name="cmakeExecutable" key="cmakeExe" type="String">
-        <default code="true">CMake::findExecutable()</default>
+    <entry name="cmakeExecutable" key="cmakeExe" type="Url">
+        <default code="true">QUrl::fromLocalFile(CMake::findExecutable())</default>
         <whatsthis>The path to the default CMake executable.</whatsthis>
     </entry>
     <entry name="generator" key="generator" type="Int">


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