rpms/kdevelop/F-7 fix_missing_output_kdev3.5.1,NONE,1.1

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Thu Feb 28 18:32:35 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/kdevelop/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11274/F-7

Added Files:
	fix_missing_output_kdev3.5.1 
Log Message:
Sync from devel:
* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.1-2
- apply upstream patch to fix outputview


--- NEW FILE fix_missing_output_kdev3.5.1 ---
Index: parts/outputviews/makewidget.cpp
===================================================================
--- parts/outputviews/makewidget.cpp	(Revision 780035)
+++ parts/outputviews/makewidget.cpp	(Revision 780036)
@@ -532,28 +532,31 @@
 {
     QString sline;
     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
+    
     if( forceCLocale )
         sline = QString::fromAscii( stdoutbuf+line );
     else
         sline = QString::fromLocal8Bit( stdoutbuf+line );
-    stdoutbuf.truncate(0);
 
     if ( !appendToLastLine( sline ) )
         m_directoryStatusFilter.processLine( sline );
+    stdoutbuf.truncate(0);
 }
 
 void MakeWidget::insertStderrLine( const QCString& line )
 {
     QString sline;
     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
+    
     if( forceCLocale ) {
         sline = QString( stderrbuf+line );
     }
     else
         sline = QString::fromLocal8Bit( stderrbuf+line );
+    
+    if ( !appendToLastLine( sline ) )
+        m_errorFilter.processLine( sline );
     stderrbuf.truncate(0);
-    if ( !appendToLastLine( line ) )
-        m_errorFilter.processLine( line );
 }
 
 void MakeWidget::slotProcessExited(KProcess *)
@@ -832,7 +835,7 @@
 
 void MakeWidget::storePartialStdoutLine(const QCString & line)
 {
-    stderrbuf += line;
+    stdoutbuf += line;
 }
 
 #include "makewidget.moc"




More information about the fedora-extras-commits mailing list