|
|
@ -1,132 +0,0 @@ |
|
|
|
diff -Naur ugene-34.0.orig/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp ugene-34.0/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
|
|
|
|
--- ugene-34.0.orig/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp 2020-06-13 19:53:24.205679490 +0100
|
|
|
|
@@ -24,6 +24,7 @@
|
|
|
|
#include <U2Lang/Descriptor.h> |
|
|
|
|
|
|
|
#include <QPainter> |
|
|
|
+#include <QPainterPath>
|
|
|
|
#include <QPalette> |
|
|
|
#include <QTextDocument> |
|
|
|
#include <QAbstractTextDocumentLayout> |
|
|
|
diff -Naur ugene-34.0.orig/src/corelibs/U2Gui/src/util/GUIUtils.cpp ugene-34.0/src/corelibs/U2Gui/src/util/GUIUtils.cpp
|
|
|
|
--- ugene-34.0.orig/src/corelibs/U2Gui/src/util/GUIUtils.cpp 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/corelibs/U2Gui/src/util/GUIUtils.cpp 2020-06-13 19:53:06.228392856 +0100
|
|
|
|
@@ -27,6 +27,7 @@
|
|
|
|
#include <QPainter> |
|
|
|
#include <QProcess> |
|
|
|
#include <QUrl> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
#include <U2Core/AppContext.h> |
|
|
|
#include <U2Core/AppSettings.h> |
|
|
|
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h ugene-34.0/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h
|
|
|
|
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/corelibs/U2View/src/ov_msa/AlignmentLogo.h 2020-06-13 19:52:16.460622835 +0100
|
|
|
|
@@ -29,6 +29,7 @@
|
|
|
|
|
|
|
|
#include <QMainWindow> |
|
|
|
#include <QGraphicsItem> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
namespace U2 { |
|
|
|
|
|
|
|
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h ugene-34.0/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h
|
|
|
|
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/corelibs/U2View/src/ov_phyltree/GraphicsCircularBranchItem.h 2020-06-13 19:52:33.107872757 +0100
|
|
|
|
@@ -23,6 +23,7 @@
|
|
|
|
#define _U2_GRAPHICS_CIRCULAR_BRANCH_ITEM_H_ |
|
|
|
|
|
|
|
#include <U2Core/Task.h> |
|
|
|
+#include <QPainterPath>
|
|
|
|
#include "GraphicsBranchItem.h" |
|
|
|
|
|
|
|
class QGraphicsItem; |
|
|
|
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/Overview.cpp ugene-34.0/src/corelibs/U2View/src/ov_sequence/Overview.cpp
|
|
|
|
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/Overview.cpp 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/corelibs/U2View/src/ov_sequence/Overview.cpp 2020-06-13 19:51:57.811344586 +0100
|
|
|
|
@@ -38,6 +38,7 @@
|
|
|
|
|
|
|
|
#include <QVBoxLayout> |
|
|
|
#include <QToolTip> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
|
|
|
|
namespace U2 { |
|
|
|
diff -Naur ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h ugene-34.0/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h
|
|
|
|
--- ugene-34.0.orig/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.h 2020-06-13 19:51:01.330513725 +0100
|
|
|
|
@@ -28,6 +28,7 @@
|
|
|
|
#include <U2Core/AnnotationSelection.h> |
|
|
|
|
|
|
|
#include <QPainter> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
|
|
|
|
namespace U2 { |
|
|
|
diff -Naur ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.cpp ugene-34.0/src/plugins/circular_view/src/CircularItems.cpp
|
|
|
|
--- ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.cpp 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/plugins/circular_view/src/CircularItems.cpp 2020-06-13 19:48:04.175017252 +0100
|
|
|
|
@@ -23,6 +23,7 @@
|
|
|
|
#include <limits> |
|
|
|
|
|
|
|
#include <QGraphicsLineItem> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
#include <U2Algorithm/GeomUtils.h> |
|
|
|
|
|
|
|
diff -Naur ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.h ugene-34.0/src/plugins/circular_view/src/CircularItems.h
|
|
|
|
--- ugene-34.0.orig/src/plugins/circular_view/src/CircularItems.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/plugins/circular_view/src/CircularItems.h 2020-06-13 19:48:56.656762297 +0100
|
|
|
|
@@ -24,6 +24,7 @@
|
|
|
|
|
|
|
|
#include <QFont> |
|
|
|
#include <QGraphicsPathItem> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
#include <U2Core/Annotation.h> |
|
|
|
|
|
|
|
diff -Naur ugene-34.0.orig/src/plugins/circular_view/src/CircularView.h ugene-34.0/src/plugins/circular_view/src/CircularView.h
|
|
|
|
--- ugene-34.0.orig/src/plugins/circular_view/src/CircularView.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/plugins/circular_view/src/CircularView.h 2020-06-13 19:47:22.767349263 +0100
|
|
|
|
@@ -41,6 +41,7 @@
|
|
|
|
#include <QFont> |
|
|
|
#include <QAction> |
|
|
|
#include <QScrollBar> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
|
|
|
|
namespace U2 { |
|
|
|
diff -Naur ugene-34.0.orig/src/plugins/query_designer/src/QueryViewItems.h ugene-34.0/src/plugins/query_designer/src/QueryViewItems.h
|
|
|
|
--- ugene-34.0.orig/src/plugins/query_designer/src/QueryViewItems.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/plugins/query_designer/src/QueryViewItems.h 2020-06-13 19:50:29.858059029 +0100
|
|
|
|
@@ -33,6 +33,7 @@
|
|
|
|
#include <QFontMetricsF> |
|
|
|
#include <QKeyEvent> |
|
|
|
#include <QFlag> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
#define GRID_STEP 40 |
|
|
|
|
|
|
|
diff -Naur ugene-34.0.orig/src/plugins/workflow_designer/src/ItemViewStyle.h ugene-34.0/src/plugins/workflow_designer/src/ItemViewStyle.h
|
|
|
|
--- ugene-34.0.orig/src/plugins/workflow_designer/src/ItemViewStyle.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/plugins/workflow_designer/src/ItemViewStyle.h 2020-06-13 19:49:20.049081604 +0100
|
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
#include <QAction> |
|
|
|
#include <QGraphicsScene> |
|
|
|
#include <QGraphicsItem> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
class QDomElement; |
|
|
|
|
|
|
|
diff -Naur ugene-34.0.orig/src/plugins/workflow_designer/src/WorkflowViewItems.h ugene-34.0/src/plugins/workflow_designer/src/WorkflowViewItems.h
|
|
|
|
--- ugene-34.0.orig/src/plugins/workflow_designer/src/WorkflowViewItems.h 2020-03-23 11:31:05.000000000 +0000
|
|
|
|
+++ ugene-34.0/src/plugins/workflow_designer/src/WorkflowViewItems.h 2020-06-13 19:50:05.937720134 +0100
|
|
|
|
@@ -29,6 +29,7 @@
|
|
|
|
#include <QWidget> |
|
|
|
#include <QGraphicsScene> |
|
|
|
#include <QGraphicsItem> |
|
|
|
+#include <QPainterPath>
|
|
|
|
|
|
|
|
class QDomElement; |
|
|
|
|