Skip to content
Snippets Groups Projects
Commit 05fae9f6 authored by Daniel Müller's avatar Daniel Müller
Browse files

* Linux adjustments

parent a74636e4
No related branches found
No related tags found
No related merge requests found
# Paths # Paths -- Change these to match your system
win32 { win32 {
INCLUDEPATH += F:\Lib\OpenCV\build-Release\install\include INCLUDEPATH += F:\Lib\OpenCV\build-Release\install\include
...@@ -6,10 +6,26 @@ win32 { ...@@ -6,10 +6,26 @@ win32 {
LIBS += -LF:\Lib\OpenCV\build-Release\install\x86\mingw\lib LIBS += -LF:\Lib\OpenCV\build-Release\install\x86\mingw\lib
} }
linux {
INCLUDEPATH += /media/tak/data/opencv/bin-release/include
DEPENDPATH += /media/tak/data/opencv/bin-release/lib
LIBS += -L/media/tak/data/opencv/bin-release/lib
}
# OpenCV # OpenCV
LIBS += libopencv_core340 win32 {
LIBS += libopencv_imgcodecs340 LIBS += libopencv_core340
LIBS += libopencv_imgproc340 LIBS += libopencv_imgcodecs340
LIBS += libopencv_features2d340 LIBS += libopencv_imgproc340
LIBS += libopencv_highgui340 LIBS += libopencv_features2d340
LIBS += libopencv_highgui340
}
unix {
LIBS += -lopencv_core
LIBS += -lopencv_imgcodecs
LIBS += -lopencv_imgproc
LIBS += -lopencv_features2d
LIBS += -lopencv_highgui
}
...@@ -78,7 +78,7 @@ auto ObjectVector<ObjType>::indexOf(const ObjType* obj) const ...@@ -78,7 +78,7 @@ auto ObjectVector<ObjType>::indexOf(const ObjType* obj) const
if (it == this->cend()) if (it == this->cend())
return -1; return -1;
else else
return it - this->cbegin(); return static_cast<int>(it - this->cbegin());
} }
template<typename ObjType> template<typename ObjType>
......
...@@ -6,11 +6,6 @@ QFrame ...@@ -6,11 +6,6 @@ QFrame
margin: 0px; margin: 0px;
} }
QFrame QToolButton
{
margin-bottom: -1px;
}
QFrame QFrame QFrame QFrame
{ {
border: none; border: none;
...@@ -32,12 +27,6 @@ QSplitter QFrame ...@@ -32,12 +27,6 @@ QSplitter QFrame
margin: 0px; margin: 0px;
} }
QSplitter QFrame QToolButton
{
margin-bottom: -1px;
}
QSplitter QFrame QFrame QSplitter QFrame QFrame
{ {
border: none; border: none;
......
...@@ -14,5 +14,5 @@ double MathUtils::vectorLength(double x, double y) ...@@ -14,5 +14,5 @@ double MathUtils::vectorLength(double x, double y)
QPoint MathUtils::round(const QPointF& point) QPoint MathUtils::round(const QPointF& point)
{ {
return QPoint{std::lround(point.x()), std::lround(point.y())}; return QPoint{static_cast<int>(std::lround(point.x())), static_cast<int>(std::lround(point.y()))};
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment