diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-18 14:44:21 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-08-18 14:44:21 (GMT) |
| commit | 3d6056dfe01116e34a2b47a70fb95e73753ef766 (patch) | |
| tree | ee4e1430dc9f0b06ab89091682d5a60525eac560 /demos | |
| parent | 52e469a629d32b7f7e52518874dab13fcd4bb814 (diff) | |
| parent | 69689f3527f373618a1f4adad543b60afea46c17 (diff) | |
| download | Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.zip Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.tar.gz Qt-3d6056dfe01116e34a2b47a70fb95e73753ef766.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/boxes/boxes.pro | 6 | ||||
| -rw-r--r-- | demos/browser/data/defaultbookmarks.xbel | 3 | ||||
| -rw-r--r-- | demos/macmainwindow/macmainwindow.pro | 2 |
3 files changed, 8 insertions, 3 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 } diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel index 1d20ac0..dce5297 100644 --- a/demos/browser/data/defaultbookmarks.xbel +++ b/demos/browser/data/defaultbookmarks.xbel @@ -30,6 +30,9 @@ <bookmark href="http://xkcd.com/"> <title>xkcd</title> </bookmark> + <bookmark href="http://twitter.com/qtbynokia"> + <title>Twitter</title> + </bookmark> </folder> <folder folded="yes"> <title>Bookmarks Menu</title> diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro index cab3845..f7592ed 100644 --- a/demos/macmainwindow/macmainwindow.pro +++ b/demos/macmainwindow/macmainwindow.pro @@ -12,7 +12,7 @@ build_all:!build_pass { CONFIG += release } -LIBS += -framework Cocoa +LIBS += -framework Cocoa -framework Carbon # install mac { |