From 4423d6b937936e4eb52c0c6aa6520e435fa57729 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Fri, 18 Sep 2015 23:38:11 +0300 Subject: [PATCH 1/2] Fixed build problem on Windows --HG-- branch : develop --- src/app/valentina/core/vapplication.cpp | 4 ++-- src/libs/vmisc/debugbreak.h | 10 +++++++--- src/libs/vtools/vtools.pro | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index 712c8f802..d93ad802c 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -688,7 +688,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; @@ -697,7 +697,7 @@ void VApplication::GatherLogs() const } else { - *out << "Log file error:" + logFile.errorString() << endl; + *out << "Log file error:" + log->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 { From 77cbcd673ed40ab1a213f7e0e0629c2b7bb64916 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Sat, 19 Sep 2015 21:02:10 +0300 Subject: [PATCH 2/2] Fixed wrong string in vapplication.cpp --HG-- branch : develop --- src/app/valentina/core/vapplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index d93ad802c..dccf00708 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -697,7 +697,7 @@ void VApplication::GatherLogs() const } else { - *out << "Log file error:" + log->errorString() << endl; + *out << "Log file error:" + tmp.GetProtected()->errorString() << endl; } } else