diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-21 18:15:32 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-21 18:15:32 +0000 |
| commit | 823402ac87d7d4895f08d171ef6637457a41dd45 (patch) | |
| tree | f83b41fd4de289e601c33813fa889216caf7aa88 /emulators | |
| parent | Update to version 0.5.2 (diff) | |
Make the port build with the upcoming Qt 4.8.1.
vncview.cpp defines a macro called "error" (which is ugly), and
qfile.h, which is included later, defined a class method called error,
and conflicts arise.
Fix it by moving the macro definition after the Qt headers are
included.
Notes
Notes:
svn path=/head/; revision=297136
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/aqemu/files/patch-Embedded_Display__vncview.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/emulators/aqemu/files/patch-Embedded_Display__vncview.cpp b/emulators/aqemu/files/patch-Embedded_Display__vncview.cpp new file mode 100644 index 000000000000..655f74937d50 --- /dev/null +++ b/emulators/aqemu/files/patch-Embedded_Display__vncview.cpp @@ -0,0 +1,26 @@ +--- Embedded_Display/vncview.cpp~ 2012-05-21 15:10:07.000000000 -0300 ++++ Embedded_Display/vncview.cpp 2012-05-21 15:10:25.000000000 -0300 +@@ -23,6 +23,11 @@ + + #include "vncview.h" + ++#include <QApplication> ++#include <QImage> ++#include <QPainter> ++#include <QMouseEvent> ++ + #ifdef QTONLY + #include <QMessageBox> + #include <QInputDialog> +@@ -38,11 +43,6 @@ + #include <KXMLGUIClient> + #endif + +-#include <QApplication> +-#include <QImage> +-#include <QPainter> +-#include <QMouseEvent> +- + // Definition of key modifier mask constants + #define KMOD_Alt_R 0x01 + #define KMOD_Alt_L 0x02 |