summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-08-27 11:43:01 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-08-27 11:50:26 (GMT)
commit9a6977188e3711b3a0cd1b2283c182c8b8ac9c13 (patch)
treeffe1f7844c2a96223d4d08263af94a20b55c41b3
parent3192b8cec804e0c294a88e788392915e95faf435 (diff)
downloadQt-9a6977188e3711b3a0cd1b2283c182c8b8ac9c13.zip
Qt-9a6977188e3711b3a0cd1b2283c182c8b8ac9c13.tar.gz
Qt-9a6977188e3711b3a0cd1b2283c182c8b8ac9c13.tar.bz2
Make it compile on Windows CE where min and max are predefined macros.
Reviewed-by: mauricek
-rw-r--r--examples/graphicsview/anchorlayout/main.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/examples/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp
index 7fb04be..ce6e937 100644
--- a/examples/graphicsview/anchorlayout/main.cpp
+++ b/examples/graphicsview/anchorlayout/main.cpp
@@ -66,17 +66,17 @@ int main(int argc, char **argv)
QGraphicsScene scene;
scene.setSceneRect(0, 0, 800, 480);
- QSizeF min(30, 100);
- QSizeF pref(210, 100);
- QSizeF max(300, 100);
-
- QGraphicsProxyWidget *a = createItem(min, pref, max, "A");
- QGraphicsProxyWidget *b = createItem(min, pref, max, "B");
- QGraphicsProxyWidget *c = createItem(min, pref, max, "C");
- QGraphicsProxyWidget *d = createItem(min, pref, max, "D");
- QGraphicsProxyWidget *e = createItem(min, pref, max, "E");
- QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), max, "F");
- QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), max, "G");
+ QSizeF minSize(30, 100);
+ QSizeF prefSize(210, 100);
+ QSizeF maxSize(300, 100);
+
+ QGraphicsProxyWidget *a = createItem(minSize, prefSize, maxSize, "A");
+ QGraphicsProxyWidget *b = createItem(minSize, prefSize, maxSize, "B");
+ QGraphicsProxyWidget *c = createItem(minSize, prefSize, maxSize, "C");
+ QGraphicsProxyWidget *d = createItem(minSize, prefSize, maxSize, "D");
+ QGraphicsProxyWidget *e = createItem(minSize, prefSize, maxSize, "E");
+ QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), maxSize, "F");
+ QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), maxSize, "G");
QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;