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

List:       kde-commits
Subject:    branches/kdevelop/3.4/buildtools/qmake
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-01-29 18:33:55
Message-ID: 1170095635.839720.17849.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628315 by apaku:

Fix problem when include() used quotes around the filename
CCBUG: 140652


 M  +9 -7      scope.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/scope.cpp #628314:628315
@@ -117,16 +117,18 @@
     m_part(part), m_defaultopts(defaultopts)
 {
     QString absfilename;
-    QString tmp;
-    if( incfile.contains(")" ) )
-        tmp = incfile.mid(0, incfile.find(")") );
-    else
-        tmp = incfile;
+    QString tmp = incfile.stripWhiteSpace();
+    if( tmp.contains(")" ) )
+        tmp = tmp.mid(0, tmp.find(")") );
+
+    if( tmp.startsWith( "\"" ) )
+        tmp = tmp.mid( 1, tmp.length()-2 );
+
     if( QFileInfo(tmp).isRelative() )
     {
-        absfilename = path + QString( QChar( QDir::separator() ) ) + tmp;
+        absfilename = QDir::cleanDirPath( path + QString( QChar( QDir::separator() ) \
) + tmp );  }else
-        absfilename = tmp;
+        absfilename = QDir::cleanDirPath( tmp );
     if ( !loadFromFile( absfilename ) )
     {
         if( !QFileInfo( absfilename ).exists() && QFileInfo( QFileInfo( absfilename \
).dirPath( true ) ).exists() )


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