summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-17 02:58:26 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-17 02:58:26 (GMT)
commit65d6e2c443ea31886de14736b21953fb8695eaf7 (patch)
tree45be09de909749ff10350fdc2377c4dbf3e815d8 /demos
parent6eab5d70003fe18ada199009d4b636765c609786 (diff)
parent72c1cb2ffdfb2742985e12025d4578aa2fe80ce7 (diff)
downloadQt-65d6e2c443ea31886de14736b21953fb8695eaf7.zip
Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.tar.gz
Qt-65d6e2c443ea31886de14736b21953fb8695eaf7.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'demos')
-rw-r--r--demos/boxes/boxes.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro
index 33f1f14..59c9132 100644
--- a/demos/boxes/boxes.pro
+++ b/demos/boxes/boxes.pro
@@ -42,6 +42,8 @@ wince*: {
}
win32-msvc* {
- QMAKE_CXXFLAGS += /Zm1200
- QMAKE_CFLAGS += /Zm1200
+ QMAKE_CXXFLAGS -= -Zm200
+ QMAKE_CFLAGS -= -Zm200
+ QMAKE_CXXFLAGS += -Zm1200
+ QMAKE_CFLAGS += -Zm1200
}