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

List:       kde-commits
Subject:    branches/kdevelop/3.4/buildtools/custommakefiles
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-02-17 22:50:11
Message-ID: 1171752611.070024.11073.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 634666 by apaku:

builddirectory might not be an absolute path, make it relative to project directory in that case
BUG:141835


 M  +5 -1      customprojectpart.cpp  


--- branches/kdevelop/3.4/buildtools/custommakefiles/customprojectpart.cpp #634665:634666
@@ -707,7 +707,11 @@
 QString CustomProjectPart::buildDirectory() const
 {
     QString dir = DomUtil::readEntry( *projectDom(), "/kdevcustomproject/build/builddir" );
-    return dir.isEmpty() ? projectDirectory() : dir;
+    if( dir.isEmpty() )
+        return projectDirectory();
+    if( QFileInfo( dir ).isRelative() )
+        return QDir::cleanDirPath( projectDirectory() + "/" + dir );
+    return dir;
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]