aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects/KvsObject_painter.h
diff options
context:
space:
mode:
authorGravatar Fabio Bas2012-09-25 13:15:57 +0000
committerGravatar Fabio Bas2012-09-25 13:15:57 +0000
commit4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c (patch)
tree2a36735ae8685b0d6011f1bfdf0d27ec6211089b /src/modules/objects/KvsObject_painter.h
parentProperly sort the console windows when sorting by name is selected in the tre... (diff)
downloadKVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.gz
KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.tar.bz2
KVIrc-4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c.zip
qt5 support (sip): code only, no touch to build system by now
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6251 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/objects/KvsObject_painter.h')
-rw-r--r--src/modules/objects/KvsObject_painter.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/modules/objects/KvsObject_painter.h b/src/modules/objects/KvsObject_painter.h
index d6e28e3dc..dc69396d4 100644
--- a/src/modules/objects/KvsObject_painter.h
+++ b/src/modules/objects/KvsObject_painter.h
@@ -25,13 +25,17 @@
//
//=============================================================================
-#include <QPrinter>
+#warning QPrinter support in KvsObject_painter needs Qt5PrintSupport module: cmake rules, ifdefs, etc
-#include <qpainter.h>
-#include <qpaintdevice.h>
+#include "object_macros.h"
+#if (QT_VERSION < 0x050000)
+ #include <QPrinter>
+#endif
+
+#include <QPainter>
+#include <QPaintDevice>
#include "KviCString.h"
#include <QPainterPath>
-#include "object_macros.h"
class KvsObject_painter : public KviKvsObject
@@ -40,7 +44,9 @@ class KvsObject_painter : public KviKvsObject
public:
KVSO_DECLARE_OBJECT(KvsObject_painter)
protected:
+#if (QT_VERSION < 0x050000)
QPrinter * m_pPrinter;
+#endif
bool bDonotdeleteinternalqpainter;
QPainter * m_pPainter;
QMatrix m_pMatrix;