diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-14 01:57:58 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-14 01:57:58 +0000 |
| commit | 1b5ac6b603626d26dbb3484ae4cb7624cb18a620 (patch) | |
| tree | 9041a4b00af7a77dac1b32806fb24d03fbe30134 /user/kst/qt5.patch | |
| parent | eb2ee1e3dc396b3dcf52e391c7227faaeb858d20 (diff) | |
| download | packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.tar.gz packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.tar.bz2 packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.tar.xz packages-1b5ac6b603626d26dbb3484ae4cb7624cb18a620.zip | |
user/*: Modernise / fix syntax / deps / code
Diffstat (limited to 'user/kst/qt5.patch')
| -rw-r--r-- | user/kst/qt5.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/user/kst/qt5.patch b/user/kst/qt5.patch new file mode 100644 index 000000000..64c5d3c40 --- /dev/null +++ b/user/kst/qt5.patch @@ -0,0 +1,47 @@ +From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux <christophe@krop.fr> +Date: Sun, 3 Jun 2018 19:43:34 +0200 +Subject: Fix build with Qt 5.11 + +Summary: +- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead. +- Add a missing #include + +Subscribers: kde-edu + +Tags: #kde_edu + +Differential Revision: https://phabricator.kde.org/D13339 +--- + cmake/modules/KstMacros.cmake | 2 +- + src/libkstapp/view.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake +index 4ff9c15..bc3d8a6 100644 +--- a/cmake/modules/KstMacros.cmake ++++ b/cmake/modules/KstMacros.cmake +@@ -240,7 +240,7 @@ endmacro() + macro(kst_link) + target_link_libraries(${kst_name} ${ARGV}) + if(kst_qt5) +- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) ++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) + else() + target_link_libraries(${kst_name} + ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) +diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h +index 95c8c6a..2af5393 100644 +--- a/src/libkstapp/view.h ++++ b/src/libkstapp/view.h +@@ -14,6 +14,7 @@ + #define VIEW_H + + #include <QGraphicsView> ++#include <QMenu> + + #include "kst_export.h" + +-- +cgit v1.1 + |