mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
6f210fbe44
- Add an OPTION to build without legacy code - Fix Qt4 includes (fixes a conflict when both Qt3 and Qt4 are installed) Reported upstream: http://www.vtk.org/Bug/view.php?id=13888
67 lines
2.1 KiB
Plaintext
67 lines
2.1 KiB
Plaintext
--- GUISupport/Qt/vtkQtConnection.h.orig 2013-02-18 14:31:05.000000000 +0100
|
|
+++ GUISupport/Qt/vtkQtConnection.h 2013-02-18 14:30:33.000000000 +0100
|
|
@@ -33,7 +33,7 @@
|
|
|
|
#include "vtkObject.h"
|
|
#include "vtkCommand.h" // for event defines
|
|
-#include "qobject.h"
|
|
+#include <QObject>
|
|
|
|
class QObject;
|
|
class vtkCallbackCommand;
|
|
--- GUISupport/Qt/QVTKWidget.cxx.orig 2013-02-18 14:31:29.000000000 +0100
|
|
+++ GUISupport/Qt/QVTKWidget.cxx 2013-02-18 14:34:52.000000000 +0100
|
|
@@ -38,11 +38,12 @@
|
|
#include "QVTKInteractorAdapter.h"
|
|
#include "QVTKInteractor.h"
|
|
|
|
-#include "qevent.h"
|
|
-#include "qapplication.h"
|
|
-#include "qpainter.h"
|
|
-#include "qsignalmapper.h"
|
|
-#include "qtimer.h"
|
|
+#include <QEvent>
|
|
+#include <QKeyEvent>
|
|
+#include <QApplication>
|
|
+#include <QPainter>
|
|
+#include <QSignalMapper>
|
|
+#include <QTimer>
|
|
#if defined(Q_WS_X11)
|
|
#include "qx11info_x11.h"
|
|
#endif
|
|
--- GUISupport/Qt/vtkQtSQLQuery.cxx.orig 2013-02-18 14:39:23.000000000 +0100
|
|
+++ GUISupport/Qt/vtkQtSQLQuery.cxx 2013-02-18 14:39:53.000000000 +0100
|
|
@@ -19,7 +19,7 @@
|
|
-------------------------------------------------------------------------*/
|
|
|
|
// Check for Qt SQL module before defining this class.
|
|
-#include <qglobal.h>
|
|
+#include <Qt/qglobal.h>
|
|
#if (QT_EDITION & QT_MODULE_SQL)
|
|
|
|
#include "vtkQtSQLQuery.h"
|
|
--- GUISupport/Qt/vtkQtConnection.cxx.orig 2013-02-18 14:43:41.000000000 +0100
|
|
+++ GUISupport/Qt/vtkQtConnection.cxx 2013-02-18 14:43:54.000000000 +0100
|
|
@@ -28,8 +28,8 @@
|
|
#include "vtkEventQtSlotConnect.h"
|
|
#include "vtkCallbackCommand.h"
|
|
|
|
-#include <qobject.h>
|
|
-#include <qmetaobject.h>
|
|
+#include <QObject>
|
|
+#include <QMetaObject>
|
|
|
|
// constructor
|
|
vtkQtConnection::vtkQtConnection(vtkEventQtSlotConnect* owner)
|
|
--- GUISupport/Qt/vtkQtSQLDatabase.cxx.orig 2013-02-18 14:44:08.000000000 +0100
|
|
+++ GUISupport/Qt/vtkQtSQLDatabase.cxx 2013-02-18 14:44:16.000000000 +0100
|
|
@@ -19,7 +19,7 @@
|
|
-------------------------------------------------------------------------*/
|
|
|
|
// Check for Qt SQL module before defining this class.
|
|
-#include <qglobal.h>
|
|
+#include <Qt/qglobal.h>
|
|
#if (QT_EDITION & QT_MODULE_SQL)
|
|
|
|
#include "vtkQtSQLDatabase.h"
|