From kde-commits  Wed Oct 17 23:09:30 2007
From: Andreas Pakulat <apaku () gmx ! de>
Date: Wed, 17 Oct 2007 23:09:30 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdevelop/buildtools/qmake
Message-Id: <1192662570.218178.5383.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=119266258106140

SVN commit 726541 by apaku:

Small bugfix for in-project libs.
Display foo.pro if a subproject is not a dir but only the file.
BUG:150798

 M  +19 -3     projectconfigurationdlg.cpp  
 M  +7 -2      qmakescopeitem.cpp  


--- branches/KDE/3.5/kdevelop/buildtools/qmake/projectconfigurationdlg.cpp #726540:726541
@@ -52,7 +52,7 @@
 #include "urlutil.h"
 
 InsideCheckListItem::InsideCheckListItem( QListView *parent, QMakeScopeItem *item, ProjectConfigurationDlg *config ) :
-        QCheckListItem( parent, item->relativePath().right( item->relativePath().length() - 1 ), QCheckListItem::CheckBox )
+        QCheckListItem( parent, item->relativePath().endsWith("/") ? item->relativePath().right( item->relativePath().length() - 1 ) : item->relativePath(), QCheckListItem::CheckBox )
 {
     prjItem = item;
     m_config = config;
@@ -1069,7 +1069,12 @@
     for( QStringList::const_iterator it = intIncList.begin(); it != intIncList.end(); ++it )
     {
         insideinc_listview->insertItem( items[*it] );
+        items.remove(*it);
     }
+    for( QMap<QString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ )
+    {
+        insideinc_listview->insertItem( it3.data() );
+    }
 }
 
 void ProjectConfigurationDlg::updateLibControls()
@@ -1097,11 +1102,13 @@
             {
                 // create lib string
                 QString tmpLib = item->getLibAddObject( myProjectItem->scope->projectDir() );
+
                 InsideCheckListItem * newItem = new InsideCheckListItem( insidelib_listview,
                                                 insidelib_listview->lastItem(), item, this );
                 insidelib_listview->takeItem( newItem );
                 items[tmpLib] = newItem;
                 QString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() );
+                kdDebug(9024) << "lib:" << tmpLib << " dir:" << tmpLibDir << "|" << libList << endl;
                 if ( libList.findIndex( "-L" + tmpLibDir ) != -1 )
                 {
                     libList.remove( "-L" + tmpLibDir );
@@ -1135,8 +1142,13 @@
         if( !lib.startsWith( "-L" ) )
         {
             insidelib_listview->insertItem( items[lib] );
+            items.remove(lib);
         }
     }
+    for( QMap<QString,InsideCheckListItem*>::ConstIterator it3 = items.begin(); it3 != items.end(); it3++ )
+    {
+        insidelib_listview->insertItem( it3.data() );
+    }
 }
 
 void ProjectConfigurationDlg::updateDependenciesControl( )
@@ -1181,8 +1193,7 @@
     //add all other prj in itemList unchecked
 
     extDeps_view->clear();
-    QStringList::Iterator it1 = depsList.begin();
-    for ( ;it1 != depsList.end();++it1 )
+    for ( QStringList::Iterator it1 = depsList.begin();it1 != depsList.end();++it1 )
     {
         intDepList << *it1;
         new QListViewItem( extDeps_view, extDeps_view->lastItem(), ( *it1 ) );
@@ -1192,8 +1203,13 @@
     for( QStringList::const_iterator it = intDepList.begin(); it != intDepList.end(); ++it )
     {
         intDeps_view->insertItem( items[*it] );
+        items.remove(*it);
     }
 
+    for( QMap<QString,InsideCheckListItem*>::ConstIterator it2 = items.begin(); it2 != items.end(); it2++ )
+    {
+        intDeps_view->insertItem( it2.data() );
+    }
 }
 
 
--- branches/KDE/3.5/kdevelop/buildtools/qmake/qmakescopeitem.cpp #726540:726541
@@ -337,8 +337,13 @@
         return "";
     if( scope->scopeType() == Scope::ProjectScope )
     {
-        return URLUtil::getRelativePath( m_widget->projectDirectory(), scope->projectDir() );
-
+        if( scope->parent() && scope->parent()->variableValues("SUBDIRS").contains( URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() ) ) )
+        {
+            return URLUtil::relativePathToFile( scope->parent()->projectDir(), scope->projectDir()+"/"+scope->fileName() );
+        }else
+        {
+            return URLUtil::getRelativePath( m_widget->projectDirectory(), scope->projectDir() );
+        }
     }else
         return static_cast<QMakeScopeItem*>( parent() ) ->relativePath();
 //     if( !scope->parent() )