[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-10-23 15:28:45
Message-ID: 1161617325.100935.10810.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 598442 by apaku:

Fix creating TARGETDEPS values for static libraries


 M  +5 -4      projectconfigurationdlg.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/projectconfigurationdlg.cpp #598441:598442
@@ -445,7 +445,9 @@
     {
         if ( insideItem->isOn() )
         {
-            if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).contains( "staticlib" ) )
+            if ( insideItem->prjItem->scope->variableValues( "CONFIG" ).contains( "staticlib" )
+                 || ( !insideItem->prjItem->scope->variableValues( "CONFIG" ).contains("dll")
+                      && insideItem->prjItem->scope->variableValues( "TEMPLATE" ).contains("lib") ) )
             {
                 values << insideItem->prjItem->getLibAddObject(
                     myProjectItem->scope->projectDir() );
@@ -829,7 +831,6 @@
     QStringList incList = myProjectItem->scope->variableValues( "INCLUDEPATH" );
     QPtrList <QMakeScopeItem> itemList = getAllProjects();
     QMakeScopeItem *item = itemList.first();
-
     while ( item )
     {
         if ( item->scope->variableValues( "TEMPLATE" ).contains( "lib" ) ||
@@ -839,7 +840,6 @@
             tmpInc = QDir::cleanDirPath( tmpInc );
             InsideCheckListItem *newItem = new InsideCheckListItem( insideinc_listview,
                                            insideinc_listview->lastItem(), item, this );
-            QStringList::Iterator it = incList.begin();
 
             if ( incList.contains( tmpInc ) )
             {
@@ -885,7 +885,8 @@
                 InsideCheckListItem * newItem = new InsideCheckListItem( insidelib_listview,
                                                 insidelib_listview->lastItem(), item, this );
                 QString tmpLibDir = item->getLibAddPath( myProjectItem->scope->projectDir() );
-
+                kdDebug(9024) << "lib path:" << tmpLib << endl;
+                kdDebug(9024) << "lib dir:" << tmpLibDir << endl;
                 if ( libList.contains( "-L" + tmpLibDir ) )
                 {
                     libList.remove( "-L" + tmpLibDir );
[prev in list] [next in list] [prev in thread] [next in thread]