aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with develop.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-01-13 16:06:54 +02:00
commit c44a16197b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/ValentinaTest/tst_vabstractdetail.cpp
View File

@ -841,6 +841,7 @@ void TST_VAbstractDetail::TestCorrectEquidistantPoints() const
Comparison(after, expect); Comparison(after, expect);
} }
#ifndef Q_OS_WIN
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_VAbstractDetail::PossibleInfiniteClearLoops_data() const void TST_VAbstractDetail::PossibleInfiniteClearLoops_data() const
{ {
@ -982,6 +983,7 @@ void TST_VAbstractDetail::PossibleInfiniteClearLoops() const
QVector<QPointF> res = VAbstractDetail::CheckLoops(path); QVector<QPointF> res = VAbstractDetail::CheckLoops(path);
Comparison(res, expect); Comparison(res, expect);
} }
#endif //#ifndef Q_OS_WIN
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void TST_VAbstractDetail::Case3() const void TST_VAbstractDetail::Case3() const

2
src/test/ValentinaTest/tst_vabstractdetail.h
View File

@ -53,8 +53,10 @@ private slots:
void CorrectEquidistantPoints() const; void CorrectEquidistantPoints() const;
void TestCorrectEquidistantPoints_data(); void TestCorrectEquidistantPoints_data();
void TestCorrectEquidistantPoints() const; void TestCorrectEquidistantPoints() const;
#ifndef Q_OS_WIN
void PossibleInfiniteClearLoops_data() const; void PossibleInfiniteClearLoops_data() const;
void PossibleInfiniteClearLoops() const; void PossibleInfiniteClearLoops() const;
#endif
private: private:
void Case3() const; void Case3() const;