Commit dd4ca75c authored by Stephen C. North's avatar Stephen C. North 🙀

Copy patches to migrate gvedit to QT5, from gitlab graphviz

44d64ada7fcee208004ea0df2a822299d424b143  except I left out -fPIC
from cmd/gvedit/Makefile.am because I can hardly comprehend why
this has to be hardwired.  This also adds QT5 checks in the top
configure.ac (abandoning QT3 and QT4) and changes
AM_INIT_AUTOMAKE([no-define subdir-objects]) to
AM_INIT_AUTOMAKE([no-define]) which I don't pretend to understand.
parent e30c1f50
Pipeline #25110144 failed with stages
in 1 minute and 40 seconds
......@@ -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"
......
......@@ -15,7 +15,7 @@
#ifndef IMAGEVIEWER_H
#define IMAGEVIEWER_H
#include <QtGui>
#include <QtWidgets>
#include <QMainWindow>
#include <QPrinter>
......
......@@ -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"
......
......@@ -12,7 +12,7 @@
*************************************************************************/
#include <QtGui>
#include <QtWidgets>
#include "mdichild.h"
#include "mainwindow.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
......
......@@ -208,7 +208,7 @@ DEFAULT_DPI=96
AC_DEFINE_UNQUOTED(DEFAULT_DPI,$DEFAULT_DPI,Default DPI.)
AC_DEFINE_UNQUOTED(BROWSER,"$BROWSER",[Command to open a browser on a URL])
AM_INIT_AUTOMAKE([no-define subdir-objects])
AM_INIT_AUTOMAKE([no-define])
# Suppress verbose compile lines
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
......@@ -2332,10 +2332,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)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment