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

List:       kdevelop-bugs
Subject:    [Bug 106388] Qmake manager ignores files when exporting and ignores
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2006-11-22 20:58:32
Message-ID: 20061122205832.30704.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=106388         
apaku gmx de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From apaku gmx de  2006-11-22 21:58 -------
SVN commit 607028 by apaku:

- Include ui.h files when calculating project files.
- If DISTFILES or INSTALL targets contain * get a list of files from the apropriate \
dir via QDir

BUG: 106388


 M  +36 -2     scope.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/scope.cpp #607027:607028
 @ -1248,7 +1248,22  @
             for ( ;filesit != files.end(); ++filesit )
             {
                 QString file = myRelPath + QString(QChar(QDir::separator())) + \
                *filesit;
-                res.insert( file );
+                if( file.contains("*") )
+                {
+                    QFileInfo fi( projectDirectory + QString( QChar( \
QDir::separator() ) ) + file ); +                    QDir absDir = fi.dir( true );
+                    absDir.setNameFilter( fi.fileName() );
+                    absDir.setFilter( QDir::Files | QDir::Readable | \
QDir::NoSymLinks ); +                    QStringList list = absDir.entryList();
+                    for( QStringList::const_iterator it = list.begin(); it != \
list.end(); ++it ) +                    {
+                        res.insert( getRelativePath( projectDirectory, \
absDir.path()+QString( QChar( QDir::separator() ) )+*it ) ); +                    }
+                }
+                else
+                {
+                    res.insert( file );
+                }
             }
         }
 
 @ -1270,7 +1285,22  @
         for ( it = values.begin(); it != values.end(); ++it )
         {
             QString file = myRelPath + QString(QChar(QDir::separator())) + *it;
-            res.insert( file );
+            if( file.contains("*") )
+            {
+                QFileInfo fi( projectDirectory + QString( QChar( QDir::separator() ) \
) + file ); +                QDir absDir = fi.dir( true );
+                absDir.setNameFilter( fi.fileName() );
+                absDir.setFilter( QDir::Files | QDir::Readable | QDir::NoSymLinks );
+                QStringList list = absDir.entryList();
+                for( QStringList::const_iterator it = list.begin(); it != \
list.end(); ++it ) +                {
+                    res.insert( getRelativePath( projectDirectory, \
absDir.path()+QString( QChar( QDir::separator() ) )+*it ) ); +                }
+            }
+            else
+            {
+                res.insert( file );
+            }
         }
 
         if ( isQt4Project() )
 @ -1313,6 +1343,8  @
             {
                 QString file = myRelPath + QString(QChar(QDir::separator())) + *it;
                 res.insert( file );
+                if( QFileInfo(projectDir()+QString(QChar(QDir::separator())) + \
*it+".h").exists() ) +                    res.insert( file+".h" );
             }
         }
         else
 @ -1322,6 +1354,8  @
             {
                 QString file = myRelPath + QString(QChar(QDir::separator())) + *it;
                 res.insert( file );
+                if( QFileInfo(projectDir()+QString(QChar(QDir::separator())) + \
*it+".h").exists() ) +                    res.insert( file+".h" );
             }
         }


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