projects
/
profile
/
ivi
/
qtdeclarative.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a hidden XandYAxis enum value
[profile/ivi/qtdeclarative.git]
/
src
/
quick
/
items
/
qquickpincharea_p.h
diff --git
a/src/quick/items/qquickpincharea_p.h
b/src/quick/items/qquickpincharea_p.h
index
435d3ec
..
f3687e0
100644
(file)
--- a/
src/quick/items/qquickpincharea_p.h
+++ b/
src/quick/items/qquickpincharea_p.h
@@
-112,7
+112,7
@@
public:
emit maximumRotationChanged();
}
emit maximumRotationChanged();
}
- enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, X
andYAxis=0x03
};
+ enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, X
AndYAxis=0x03, XandYAxis=XAndYAxis
};
Axis axis() const { return m_axis; }
void setAxis(Axis a) {
if (a == m_axis)
Axis axis() const { return m_axis; }
void setAxis(Axis a) {
if (a == m_axis)