[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:       2006-11-22 23:06:04
Message-ID: 1164236764.099466.11211.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 607071 by apaku:

Fix a small problem in variable Resolving


 M  +2 -1      scope.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/scope.cpp #607070:607071
@@ -879,6 +879,7 @@
                         continue;
                     QDir subproject;
                     QString projectfile;
+                    kdDebug(9024) << "reading subproject: " << str << endl;
                     if( str.startsWith("$") )
                         str = resolveVariables(str, *it);
                     if( str.endsWith(".pro") )
@@ -1195,7 +1196,7 @@
     QMap<QString, QStringList> variables;
     for( QStringList::iterator it = result.begin(); it != result.end(); ++it )
     {
-        QRegExp re("\\$\\$([^\\) /]*)( |\\)|/)");
+        QRegExp re("\\$\\$([^\\) /]*)( |\\)|/|$)");
         int pos = 0;
         while( pos >= 0 )
         {
[prev in list] [next in list] [prev in thread] [next in thread]