Merged in curious_one/valentina (pull request #114)

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

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-05-04 15:30:09 +03:00
commit a3b95f5927
2 changed files with 6 additions and 0 deletions

View File

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

View File

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