Merged in curious_one/valentina (pull request #114)

Made compilable with msvc by adding compiler directive where necessary...

--HG--
branch : develop

src/libs/qmuparser/qmudef.h

@@ -31,6 +31,9 @@
     #pragma GCC diagnostic ignored "-Wattributes"
 #endif
 
+#ifdef Q_CC_MSVC
+    #include <ciso646>
+#endif /* Q_CC_MSVC */
 //---------------------------------------------------------------------------------------------------------------------
 inline QString NameRegExp()
 {

src/test/ValentinaTest/tst_vcommandline.cpp

@@ -32,6 +32,9 @@
 
 #include <QtTest>
 
+#ifdef Q_CC_MSVC
+    #include <ciso646>
+#endif /* Q_CC_MSVC */
 //---------------------------------------------------------------------------------------------------------------------
 TST_VCommandLine::TST_VCommandLine(QObject *parent)
     :QObject(parent)