Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 14 insertions, 1 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/uidebug.h b/SQLiteStudio3/guiSQLiteStudio/uidebug.h
index d1b04b7..d2a2a51 100644
--- a/SQLiteStudio3/guiSQLiteStudio/uidebug.h
+++ b/SQLiteStudio3/guiSQLiteStudio/uidebug.h
@@ -3,6 +3,9 @@
 
 #include "guiSQLiteStudio_global.h"
 #include <QtDebug>
+#include <QTextStream>
+
+class QFile;
 
 class GUI_API_EXPORT MsgHandlerThreadProxy : public QObject
 {
@@ -10,6 +13,15 @@ class GUI_API_EXPORT MsgHandlerThreadProxy : public QObject
 
     public:
         explicit MsgHandlerThreadProxy(QObject* parent = 0);
+        MsgHandlerThreadProxy(const QString& file, QObject* parent = 0);
+        ~MsgHandlerThreadProxy();
+
+    private:
+        void init();
+        void initFile(const QString& fileName);
+
+        QFile* outFile = nullptr;
+        QTextStream outFileStream;
 
     public slots:
         void debug(const QString& msg);
@@ -25,10 +37,11 @@ class GUI_API_EXPORT MsgHandlerThreadProxy : public QObject
 
     private slots:
         void print(const QString& txt);
+        void printToFile(const QString& txt);
 };
 
 GUI_API_EXPORT void uiMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
-GUI_API_EXPORT void setUiDebug(bool enabled, bool useUiConsole = true);
+GUI_API_EXPORT void setUiDebug(bool enabled, bool useUiConsole = true, const QString& file = QString());
 GUI_API_EXPORT void showUiDebugConsole();
 GUI_API_EXPORT bool isDebugEnabled();
 GUI_API_EXPORT bool isDebugConsoleEnabled();