Merge branch '2.8.7' into 2.8.8

cheese · Mar 5, 2021 · 3e2a490 · 3e2a490
2 parents c73f685 + b5670cc
commit 3e2a490
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cmake/QtChooser.cmake b/cmake/QtChooser.cmake
@@ -40,10 +40,12 @@ macro(qt_add_resources)
 endmacro()
 
 macro(qt_use_modules)
+    find_package(Qt5 REQUIRED WebEngine WebEngineWidgets WebSockets WebChannel)
     if(APPLE)
-        qt5_use_modules(${ARGV0} Core Gui Widgets Xml Network PrintSupport WebEngine WebEngineWidgets WebSockets WebChannel MacExtras)
+        find_package(Qt5 REQUIRED MacExtras)
+        target_link_libraries(${ARGV0} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebSockets Qt5::WebChannel Qt5::MacExtras)
     else(APPLE)
-        qt5_use_modules(${ARGV0} Core Gui Widgets Xml Network PrintSupport WebEngine WebEngineWidgets WebSockets WebChannel)
+        target_link_libraries(${ARGV0} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebSockets Qt5::WebChannel)
     endif(APPLE)
 endmacro()
 

diff --git a/src/utils/WizStyleHelper.cpp b/src/utils/WizStyleHelper.cpp
@@ -5,6 +5,7 @@
 #include <QRect>
 #include <QTransform>
 #include <QPainter>
+#include <QPainterPath>
 #include <QVector>
 #include <QTextLayout>
 #include <QDebug>