summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-14 12:30:01 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-14 12:30:01 (GMT)
commit8d846a525a67f2b0b680ed836601712a5250ce57 (patch)
tree34fef9650992717f5d4274d8c578419ac0475698 /demos
parent4c31f59d45130eae8f140e6d0177a4b227454187 (diff)
parentb770651f19741907cd415ea9ad6e087cb32cc948 (diff)
downloadQt-8d846a525a67f2b0b680ed836601712a5250ce57.zip
Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.gz
Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
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
}