aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-01-17 14:27:31 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-17 05:36:36 +0100
commit8f7baf5f0c6f510d5105f0105fb9311c598f269b (patch)
tree995b54b9d4b184372aa4d840fffb43ce48a5a106
parente79eedcb1eaf56280035550f4c6bb2395a51fd16 (diff)
Match QRect change
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>
-rw-r--r--src/declarative/qml/qdeclarativeinstruction_p.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index 11f8029f94..29140d09d4 100644
--- 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 {