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

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-09-04 15:12:34
Message-ID: 1157382754.121502.2431.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 580821 by amantia:

Resolve symlinks only for local files and keep the url notation.

 M  +11 -12    quanta.kdevelop  
 M  +4 -4      utility/quantacommon.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/quanta.kdevelop #580820:580821
@@ -12,6 +12,7 @@
     <version>3.2-CVS-1</version>
     <description>Quanta Plus Web Development Environment</description>
     <ignoreparts>
+      <part>kdevkonsoleview</part>
       <part>kdevvalgrind</part>
     </ignoreparts>
     <projectdirectory>.</projectdirectory>
@@ -48,7 +49,7 @@
     </compiler>
     <run>
       <mainprogram>quanta/src/quanta</mainprogram>
-      <programargs></programargs>
+      <programargs/>
       <terminal>false</terminal>
       <envvars/>
       <directoryradio>build</directoryradio>
@@ -63,15 +64,15 @@
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevpgf77options</f77compiler>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
         <cflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT</cflags>
         <cxxflags>-DKDE_NO_COMPAT -DQT_NO_COMPAT -DDEBUG_PARSER</cxxflags>
-        <f77flags></f77flags>
+        <f77flags/>
         <topsourcedir>/home/andris/development/kdewebdev</topsourcedir>
-        <cppflags></cppflags>
-        <ldflags></ldflags>
+        <cppflags/>
+        <ldflags/>
         <envvars>
           <envvar value="kommander klinkstatus kfilereplace kxsldbg kimagemapeditor" \
name="DO_NOT_COMPILE2" />  </envvars>
@@ -244,10 +245,10 @@
   </kdevcvs>
   <kdevfilecreate>
     <filetypes>
-      <type icon="" ext="h" name="C++ header" create="template" >
+      <type icon="" ext="h" create="template" name="C++ header" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
+      <type icon="source_cpp" ext="cpp" create="template" name="C++ source" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
@@ -274,9 +275,7 @@
       <processPrimaryTypes>true</processPrimaryTypes>
       <processFunctionArguments>false</processFunctionArguments>
     </codecompletion>
-    <references>
-      <pcs>KDElibs3</pcs>
-    </references>
+    <references/>
     <creategettersetter>
       <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
--- branches/KDE/3.5/kdewebdev/quanta/utility/quantacommon.cpp #580820:580821
@@ -694,10 +694,10 @@
   for (QStringList::Iterator it = list.begin(); it != end; ++it)
   {
     KURL u = KURL::fromPathOrURL(*it);
-    if (u.isValid())
+    if (u.isValid() && u.isLocalFile())
     {
       u.setPath(QExtFileInfo::canonicalPath(u.path()));
-      *it = u.path();
+      *it = u.url();
     }
   }
   return list;
@@ -707,10 +707,10 @@
 {
   QString path = config->readPathEntry(pKey);
   KURL u = KURL::fromPathOrURL(path);
-  if (u.isValid())
+  if (u.isValid() && u.isLocalFile())
   {
     u.setPath(QExtFileInfo::canonicalPath(u.path()));
-    path = u.path();
+    path = u.url();
   }
   return path;
 }


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