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

List:       kde-commits
Subject:    KDE/kdevelop/buildtools/importers/cmake
From:       Matt Rogers <mattr () kde ! org>
Date:       2006-09-26 2:13:30
Message-ID: 1159236810.563016.6121.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 588458 by mattr:

make sure to adjust the path for the cmakeinfo.xml file correctly
also turn off namespace processing for QDom. Will wait for the tests to
be finished to make sure i don't need this



 M  +4 -2      cmakeimporter.cpp  


--- trunk/KDE/kdevelop/buildtools/importers/cmake/cmakeimporter.cpp #588457:588458
@@ -82,7 +82,9 @@
     kDebug( 9025 ) << k_funcinfo << "build dir is " << qPrintable( buildDir ) << endl;
     m_rootItem = new KDevProjectFolderItem( fileName, 0 );
     KUrl cmakeInfoFile(buildDir);
-    cmakeInfoFile.addPath("/cmakeinfo.xml");
+    cmakeInfoFile.adjustPath( KUrl::AddTrailingSlash );
+    cmakeInfoFile.addPath("cmakeinfo.xml");
+    kDebug(9025) << k_funcinfo << "file is " << cmakeInfoFile.path() << endl;
     if ( !cmakeInfoFile.isLocalFile() )
     {
         //FIXME turn this into a real warning
@@ -94,7 +96,7 @@
         if ( cmakeFile.open(QIODevice::ReadOnly) )
         {
             QDomDocument cmakeInfo;
-            if ( cmakeInfo.setContent( &cmakeFile ) )
+            if ( cmakeInfo.setContent( &cmakeFile, false /* no namespaces */ ) )
             {   //start processing
                 QDomElement docElem = cmakeInfo.documentElement();
                 QDomNode n = docElem.firstChild();
[prev in list] [next in list] [prev in thread] [next in thread]