palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-03 01:28:12 +02:00
Code Issues Projects Releases Wiki Activity

Merge

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-09-20 13:12:15 +03:00
parent 274cbb3aad 77cbcd673e
commit 305818bd8e
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/valentina/core/vapplication.cpp
View file

@ -678,7 +678,7 @@ void VApplication::GatherLogs() const
*out <<"--------------------------" << endl; *out <<"--------------------------" << endl;
if (tmp.GetProtected()->open(QIODevice::ReadOnly | QIODevice::Text)) if (tmp.GetProtected()->open(QIODevice::ReadOnly | QIODevice::Text))
{ {
QTextStream in(&tmp.GetProtected()); QTextStream in(tmp.GetProtected().get());
while (!in.atEnd()) while (!in.atEnd())
{ {
*out << in.readLine() << endl; *out << in.readLine() << endl;
@ -687,7 +687,7 @@ void VApplication::GatherLogs() const
} }
else else
{ {
*out << "Log file error:" + logFile.errorString() << endl; *out << "Log file error:" + tmp.GetProtected()->errorString() << endl;
} }
} }
else else

10
src/libs/vmisc/debugbreak.h
View file

@ -114,9 +114,13 @@ static void __inline__ debug_break(void)
* (gdb) handle SIGILL stop nopass * (gdb) handle SIGILL stop nopass
* */ * */
__builtin_trap(); __builtin_trap();
} else { } else {
raise(SIGTRAP); #ifdef _WIN32
} __builtin_trap();
#else
raise(SIGTRAP);
#endif
}
} }
#ifdef __cplusplus #ifdef __cplusplus

2
src/libs/vtools/vtools.pro
View file

@ -51,6 +51,8 @@ $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in common.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
INCLUDEPATH += $$PWD/../vpatterndb
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
# Debug mode # Debug mode
unix { unix {