48044543ea
OBS-URL: https://build.opensuse.org/request/show/514602 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=114
114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
Index: graphviz-2.40.1/cmd/gvedit/csettings.cpp
|
|
===================================================================
|
|
--- graphviz-2.40.1.orig/cmd/gvedit/csettings.cpp
|
|
+++ graphviz-2.40.1/cmd/gvedit/csettings.cpp
|
|
@@ -16,7 +16,7 @@
|
|
#include "csettings.h"
|
|
#include "qmessagebox.h"
|
|
#include "qfiledialog.h"
|
|
-#include <QtGui>
|
|
+#include <QtWidgets>
|
|
#include <qfile.h>
|
|
#include "mdichild.h"
|
|
#include "string.h"
|
|
Index: graphviz-2.40.1/cmd/gvedit/imageviewer.h
|
|
===================================================================
|
|
--- graphviz-2.40.1.orig/cmd/gvedit/imageviewer.h
|
|
+++ graphviz-2.40.1/cmd/gvedit/imageviewer.h
|
|
@@ -15,7 +15,7 @@
|
|
|
|
#ifndef IMAGEVIEWER_H
|
|
#define IMAGEVIEWER_H
|
|
-#include <QtGui>
|
|
+#include <QtWidgets>
|
|
#include <QMainWindow>
|
|
#include <QPrinter>
|
|
|
|
Index: graphviz-2.40.1/cmd/gvedit/mainwindow.cpp
|
|
===================================================================
|
|
--- graphviz-2.40.1.orig/cmd/gvedit/mainwindow.cpp
|
|
+++ graphviz-2.40.1/cmd/gvedit/mainwindow.cpp
|
|
@@ -11,7 +11,7 @@
|
|
* Contributors: See CVS logs. Details at http://www.graphviz.org/
|
|
*************************************************************************/
|
|
|
|
-#include <QtGui>
|
|
+#include <QtWidgets>
|
|
#include <qframe.h>
|
|
#include "mainwindow.h"
|
|
#include "mdichild.h"
|
|
Index: graphviz-2.40.1/cmd/gvedit/mdichild.cpp
|
|
===================================================================
|
|
--- graphviz-2.40.1.orig/cmd/gvedit/mdichild.cpp
|
|
+++ graphviz-2.40.1/cmd/gvedit/mdichild.cpp
|
|
@@ -12,7 +12,7 @@
|
|
*************************************************************************/
|
|
|
|
|
|
-#include <QtGui>
|
|
+#include <QtWidgets>
|
|
|
|
#include "mdichild.h"
|
|
#include "mainwindow.h"
|
|
Index: graphviz-2.40.1/cmd/gvedit/ui_settings.h
|
|
===================================================================
|
|
--- graphviz-2.40.1.orig/cmd/gvedit/ui_settings.h
|
|
+++ graphviz-2.40.1/cmd/gvedit/ui_settings.h
|
|
@@ -10,22 +10,22 @@
|
|
#ifndef UI_SETTINGS_H
|
|
#define UI_SETTINGS_H
|
|
|
|
-#include <QtCore/QVariant>
|
|
-#include <QtGui/QAction>
|
|
-#include <QtGui/QApplication>
|
|
-#include <QtGui/QButtonGroup>
|
|
-#include <QtGui/QComboBox>
|
|
-#include <QtGui/QDialog>
|
|
-#include <QtGui/QFrame>
|
|
-#include <QtGui/QHBoxLayout>
|
|
-#include <QtGui/QHeaderView>
|
|
-#include <QtGui/QLabel>
|
|
-#include <QtGui/QLineEdit>
|
|
-#include <QtGui/QPushButton>
|
|
-#include <QtGui/QSpacerItem>
|
|
-#include <QtGui/QTextEdit>
|
|
-#include <QtGui/QVBoxLayout>
|
|
-#include <QtGui/QWidget>
|
|
+#include <QVariant>
|
|
+#include <QAction>
|
|
+#include <QApplication>
|
|
+#include <QButtonGroup>
|
|
+#include <QComboBox>
|
|
+#include <QDialog>
|
|
+#include <QFrame>
|
|
+#include <QHBoxLayout>
|
|
+#include <QHeaderView>
|
|
+#include <QLabel>
|
|
+#include <QLineEdit>
|
|
+#include <QPushButton>
|
|
+#include <QSpacerItem>
|
|
+#include <QTextEdit>
|
|
+#include <QVBoxLayout>
|
|
+#include <QWidget>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
Index: graphviz-2.40.1/configure.ac
|
|
===================================================================
|
|
--- graphviz-2.40.1.orig/configure.ac
|
|
+++ graphviz-2.40.1/configure.ac
|
|
@@ -2561,10 +2561,10 @@ if test "x$with_qt" != "xyes"; then
|
|
use_qt="No (disabled)"
|
|
else
|
|
|
|
- AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-qt3 qmake,false)
|
|
+ AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
|
|
if test "$QMAKE" != "false"; then
|
|
- PKG_CHECK_MODULES(QTCORE, [QtCore],[
|
|
- PKG_CHECK_MODULES(QTGUI, [QtGui],[
|
|
+ PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
|
|
+ PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[
|
|
use_qt="Yes"
|
|
],[
|
|
use_qt="No (QtGui not available)"
|