On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / GuiLog.cpp

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index e5a8a96d546289c469e043d8583633417a7a4231..d81849a5ec659adaf8c4b96a1b3b3906f773f297 100644 (file)
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -18,6 +18,8 @@
 #include "qt_helpers.h"
 #include "Lexer.h"
 
+#include "frontends/Clipboard.h"
+
 #include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
@@ -37,12 +39,14 @@ namespace frontend {
 
 
 // Regular expressions needed at several places
+// FIXME: These regexes are incomplete. It would be good if we could collect those used in LaTeX::scanLogFile
+//        and LaTeX::scanBlgFile and re-use them here!(spitz, 2013-05-27)
 // Information
-QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|\\(|\\\\).*$");
+QRegExp exprInfo("^(Document Class:|LaTeX Font Info:|File:|Package:|Language:|Underfull|Overfull|.*> INFO - |\\(|\\\\).*$");
 // Warnings
-QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning).*$");
+QRegExp exprWarning("^(LaTeX Warning|LaTeX Font Warning|Package [\\w\\.]+ Warning|Class \\w+ Warning|Warning--|.*> WARN - ).*$");
 // Errors
-QRegExp exprError("^!.*$");
+QRegExp exprError("^(!|.*---line [0-9]+ of file|.*> FATAL - |.*> ERROR - ).*$");
 
 
 /////////////////////////////////////////////////////////////////////
@@ -311,7 +315,7 @@ void GuiLog::getContents(ostream & ss) const
 
 void GuiLog::on_copyPB_clicked()
 {
-       qApp->clipboard()->setText(logTB->toPlainText());
+       theClipboard().put(fromqstr(logTB->toPlainText()));
 }