From: Alan Alpert <alan.alpert@nokia.com>
Date: Tue, 17 Jan 2012 04:27:31 +0000 (+1000)
Subject: Match QRect change
X-Git-Tag: upstream/5.2.1~2892
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f7baf5f0c6f510d5105f0105fb9311c598f269b;p=platform%2Fupstream%2Fqtdeclarative.git

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>
---

diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index 11f8029..29140d0 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 {