projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Implemented per device resolution setting and selection"
[harmattan/cameraplus]
/
src
/
gridlines.h
diff --git
a/src/gridlines.h
b/src/gridlines.h
index
91bfdc8
..
28db500
100644
(file)
--- a/
src/gridlines.h
+++ b/
src/gridlines.h
@@
-23,16
+23,34
@@
#ifndef GRID_LINES_H
#define GRID_LINES_H
#ifndef GRID_LINES_H
#define GRID_LINES_H
+#if defined(QT4)
#include <QDeclarativeItem>
#include <QDeclarativeItem>
+#elif defined(QT5)
+#include <QQuickPaintedItem>
+#endif
+#include <QLineF>
+#if defined(QT4)
class GridLines : public QDeclarativeItem {
class GridLines : public QDeclarativeItem {
+#elif defined(QT5)
+class GridLines : public QQuickPaintedItem {
+#endif
+
Q_OBJECT
public:
Q_OBJECT
public:
+#if defined(QT4)
GridLines(QDeclarativeItem *parent = 0);
GridLines(QDeclarativeItem *parent = 0);
+#elif defined(QT5)
+ GridLines(QQuickItem *parent = 0);
+#endif
~GridLines();
~GridLines();
+#if defined(QT4)
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+#elif defined(QT5)
+ void paint(QPainter* painter);
+#endif
protected:
void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry);
protected:
void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry);