[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:       2007-01-05 2:52:35
Message-ID: 1167965555.066551.14893.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 620036 by apaku:

Ignore radio button setting in run options


 M  +7 -15     trollprojectpart.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/trollprojectpart.cpp #620035:620036
@@ -478,31 +478,23 @@
 
 QString TrollProjectPart::mainProgram() const
 {
-    bool relative = false; // dummy, remove!
 
     QDomDocument &dom = *projectDom();
 
     if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) )
     {
-        QString directoryRadioString = DomUtil::readEntry(dom, "/kdevtrollproject/run/directoryradio");
-        QString DomMainProgram = DomUtil::readEntry(dom, "/kdevtrollproject/run/mainprogram");
+        QString DomMainProgram = DomUtil::readEntry(*dom, "/kdevtrollproject/run/mainprogram");
 
-        if ( directoryRadioString == "custom" )
-            return DomMainProgram;
+        if ( DomMainProgram.isEmpty() ) return QString();
 
-        if ( relative == false )
-            return buildDirectory() + QString( QChar( QDir::separator() ) ) + DomMainProgram;
-
-        if ( directoryRadioString == "executable" )
+        if ( DomMainProgram.startsWith("/") )   // assume absolute path
         {
-            int pos = DomMainProgram.findRev(QString( QChar( QDir::separator() ) ));
-            if (pos != -1)
-                return DomMainProgram.mid(pos+1);
-
             return DomMainProgram;
         }
-
-        return DomMainProgram;
+        else // assume project relative path
+        {
+            return projectDirectory() + "/" + DomMainProgram;
+        }
     }else
     {
         if( !m_widget->currentSubproject())
[prev in list] [next in list] [prev in thread] [next in thread]