diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index d5aac3a71..880f94f8e 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -678,7 +678,7 @@ void VApplication::GatherLogs() const *out <<"--------------------------" << endl; if (tmp.GetProtected()->open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream in(&tmp.GetProtected()); + QTextStream in(tmp.GetProtected().get()); while (!in.atEnd()) { *out << in.readLine() << endl; @@ -687,7 +687,7 @@ void VApplication::GatherLogs() const } else { - *out << "Log file error:" + logFile.errorString() << endl; + *out << "Log file error:" + tmp.GetProtected()->errorString() << endl; } } else diff --git a/src/libs/vmisc/debugbreak.h b/src/libs/vmisc/debugbreak.h index 9a1926bbd..914105e9d 100644 --- a/src/libs/vmisc/debugbreak.h +++ b/src/libs/vmisc/debugbreak.h @@ -114,9 +114,13 @@ static void __inline__ debug_break(void) * (gdb) handle SIGILL stop nopass * */ __builtin_trap(); - } else { - raise(SIGTRAP); - } + } else { + #ifdef _WIN32 + __builtin_trap(); + #else + raise(SIGTRAP); + #endif + } } #ifdef __cplusplus diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index cfc7a693a..b81b6903e 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -51,6 +51,8 @@ $$enable_ccache() # Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() +INCLUDEPATH += $$PWD/../vpatterndb + CONFIG(debug, debug|release){ # Debug mode unix {