diff options
author | David Boddie <dboddie@trolltech.com> | 2010-08-06 17:51:14 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-08-06 17:51:14 (GMT) |
commit | 86eec3f6f98b387bf6a815c1a8e916965928b317 (patch) | |
tree | eae5c5e72da6fe0c5939e6b730f1218db7c6372d /tools | |
parent | 9d15caa7f1103060f5fe1f8283e834ff51591a3f (diff) | |
parent | c45516f1f3781dcb504158f730b98897c7f2f2a1 (diff) | |
download | Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.zip Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.tar.gz Qt-86eec3f6f98b387bf6a815c1a8e916965928b317.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qml/qml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index efb82d1..d794005 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -35,7 +35,7 @@ maemo5 { symbian { TARGET.UID3 = 0x20021317 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 + TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { LIBS += -lsensrvclient -lsensrvutil |