projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e79eedc
)
Match QRect change
author
Alan Alpert
<alan.alpert@nokia.com>
Tue, 17 Jan 2012 04:27:31 +0000
(14:27 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 17 Jan 2012 04:36:36 +0000
(
05:36
+0100)
3b973971fb1e483b9b3514358a415781c3c24ba8
changes the order of data
members on mac, the struct we're using to fake QRect needs to match.
Change-Id: Id2ecf1726e64514e12dd72980a0c0ad2b693c483
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/declarative/qml/qdeclarativeinstruction_p.h
patch
|
blob
|
history
diff --git
a/src/declarative/qml/qdeclarativeinstruction_p.h
b/src/declarative/qml/qdeclarativeinstruction_p.h
index
11f8029
..
29140d0
100644
(file)
--- a/
src/declarative/qml/qdeclarativeinstruction_p.h
+++ b/
src/declarative/qml/qdeclarativeinstruction_p.h
@@
-367,17
+367,10
@@
union QDeclarativeInstruction
QML_INSTR_HEADER
int propertyIndex;
struct QRect {
-#if defined(Q_OS_MAC)
- int y1;
- int x1;
- int y2;
- int x2;
-#else
int x1;
int y1;
int x2;
int y2;
-#endif
} rect;
};
struct instr_storeRectF {