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

List:       kdevelop-bugs
Subject:    [Bug 120795] can only debug the main application
From:       Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date:       2007-01-01 14:13:49
Message-ID: 20070101141349.31724.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=120795         




------- Additional Comments From jens.dagerbo swipnet se  2007-01-01 15:13 -------
SVN commit 618534 by dagerbo:

If "main program" is empty, make sure we use the active subproject no matter what the \
launch path configuration is set to.

CCBUG: 120795

 M  +12 -9     trollprojectpart.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/trollprojectpart.cpp #618533:618534
 @ -483,6 +483,8  @
   *   if run/directoryradio == custom or relative == false
   *        The absolute path to executable
   */
+
+
 QString TrollProjectPart::mainProgram(bool relative) const
 {
     QDomDocument &dom = *projectDom();
 @ -490,28 +492,29  @
     QString directoryRadioString = DomUtil::readEntry(dom, \
                "/kdevtrollproject/run/directoryradio");
     QString DomMainProgram = DomUtil::readEntry(dom, \
"/kdevtrollproject/run/mainprogram");  
+    if ( DomMainProgram.isEmpty() )
+    {
+        return m_widget->subprojectDirectory() + QString( QChar( QDir::separator() ) \
) + m_widget->getCurrentOutputFilename(); +    }
+
     if ( directoryRadioString == "custom" )
         return DomMainProgram;
 
-    if ( relative == false && !DomMainProgram.isEmpty() )
+    if ( relative == false )
         return buildDirectory() + QString( QChar( QDir::separator() ) ) + \
DomMainProgram;  
-    if ( directoryRadioString == "executable" ) {
+    if ( directoryRadioString == "executable" ) 
+    {
         int pos = DomMainProgram.findRev(QString( QChar( QDir::separator() ) ));
         if (pos != -1)
             return DomMainProgram.mid(pos+1);
 
-        if ( DomMainProgram.isEmpty() )
-        {
-            return runDirectory() + QString( QChar( QDir::separator() ) ) + \
                m_widget->getCurrentOutputFilename();
-        }
         return DomMainProgram;
     }
-    else
-        return DomMainProgram;
+
+    return DomMainProgram;
 }
 
-
 /** Retuns a QString with the run command line arguments */
 QString TrollProjectPart::runArguments() const
 {


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