Merge

--HG--
branch : develop

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

src/libs/vmisc/debugbreak.h

@@ -115,7 +115,11 @@ static void __inline__ debug_break(void)
 		  * */
 		__builtin_trap();
     } else {
+        #ifdef _WIN32
+            __builtin_trap();
+        #else
             raise(SIGTRAP);
+        #endif
     }
 }
 

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 {