[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-29 20:56:13
Message-ID: 1170104173.932086.32377.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628351 by apaku:

Fix slotExecuteTarget for project files that don't set TEMPLATE at all.
Really execute only the target when sloBuildAndExecuteTarget was called


 M  +12 -5     trollprojectpart.cpp  
 M  +2 -1      trollprojectpart.h  
 M  +3 -2      trollprojectwidget.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/trollprojectpart.cpp #628350:628351
@@ -70,7 +70,8 @@
 
     setXMLFile("kdevtrollproject.rc");
 
-    m_executeAfterBuild = false;
+    m_executeProjectAfterBuild = false;
+    m_executeTargetAfterBuild = false;
 
     m_dirWatch = new KDirWatch(this);
 
@@ -417,7 +418,7 @@
 {
     partController()->saveAllFiles();
     if (isDirty()) {
-        m_executeAfterBuild = true;
+        m_executeProjectAfterBuild = true;
         m_widget->slotBuildProject();
     } else
         m_widget->slotExecuteProject();
@@ -427,7 +428,7 @@
 {
     partController()->saveAllFiles();
     if (isDirty()) {
-        m_executeAfterBuild = true;
+        m_executeTargetAfterBuild = true;
         m_widget->slotBuildTarget();
     } else
         m_widget->slotExecuteTarget();
@@ -724,10 +725,16 @@
 
     emit projectCompiled();
 
-    if( m_executeAfterBuild ){
+    if( m_executeProjectAfterBuild )
+    {
         m_widget->slotExecuteProject();
-        m_executeAfterBuild = false;
+        m_executeProjectAfterBuild = false;
+    }else if( m_executeTargetAfterBuild )
+        {
+        m_widget->slotExecuteTarget();
+        m_executeTargetAfterBuild = false;
     }
+
 }
 
 bool TrollProjectPart::isDirty()
--- branches/kdevelop/3.4/buildtools/qmake/trollprojectpart.h #628350:628351
@@ -90,7 +90,8 @@
     bool m_tmakeProject;
 
     QMap<QString, QDateTime> m_timestamp;
-    bool m_executeAfterBuild;
+    bool m_executeProjectAfterBuild;
+    bool m_executeTargetAfterBuild;
     QString m_buildCommand;
 
     KDirWatch* m_dirWatch;
--- branches/kdevelop/3.4/buildtools/qmake/trollprojectwidget.cpp #628350:628351
@@ -616,7 +616,6 @@
 void TrollProjectWidget::slotExecuteTarget()
 {
     //m_part->slotExecute();
-
     // no subproject selected
     if ( !m_shownSubproject )
         return ;
@@ -626,10 +625,12 @@
         return ;
 
 
+
     // Only run application projects
-    if ( m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) \
== -1 ) +    if ( !m_shownSubproject->scope->variableValues( "TEMPLATE" ).isEmpty() \
&& m_shownSubproject->scope->variableValues( "TEMPLATE" ).findIndex( "app" ) == -1 )  \
return ;  
+
     QString dircmd = "cd " + KProcess::quote( subprojectDirectory() + QString( \
                QChar( QDir::separator() ) ) + getCurrentDestDir() ) + " && ";
     QString program = KProcess::quote( "." + QString( QChar( QDir::separator() ) ) + \
getCurrentOutputFilename() );  


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