summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-09-09 00:39:12 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-09-09 00:39:12 (GMT)
commit91340d865bad35bef5d4e75bcfc871171199066f (patch)
treef5359cd830fb6d0b48fa947ae36eadad9f7164a3 /demos
parentbff0ea73ea4316b915d087d1e01a3c617a769789 (diff)
parentf52dc5bf1e885c9a4d226c2484249e7d9faf0a99 (diff)
downloadQt-91340d865bad35bef5d4e75bcfc871171199066f.zip
Qt-91340d865bad35bef5d4e75bcfc871171199066f.tar.gz
Qt-91340d865bad35bef5d4e75bcfc871171199066f.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'demos')
-rw-r--r--demos/boxes/boxes.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro
index 59c9132..4963fb9 100644
--- a/demos/boxes/boxes.pro
+++ b/demos/boxes/boxes.pro
@@ -44,6 +44,6 @@ wince*: {
win32-msvc* {
QMAKE_CXXFLAGS -= -Zm200
QMAKE_CFLAGS -= -Zm200
- QMAKE_CXXFLAGS += -Zm1200
- QMAKE_CFLAGS += -Zm1200
+ QMAKE_CXXFLAGS += -Zm500
+ QMAKE_CFLAGS += -Zm500
}