diff options
| author | axis <qt-info@nokia.com> | 2010-03-11 09:15:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-11 09:42:47 (GMT) |
| commit | a375537d32bc33ba1154ec132f99f5a779bce067 (patch) | |
| tree | 3c23e3b2c44fb52d7d62036fe7dd793e589841e8 /mkspecs/common/symbian/symbian-mmp.conf | |
| parent | 02f6da62a42bd1059eb0da091d1f46efbb919750 (diff) | |
| parent | 1e9552f826c05bf9884fb2893dedca265ead363b (diff) | |
| download | Qt-a375537d32bc33ba1154ec132f99f5a779bce067.zip Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.gz Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/src.pro
Diffstat (limited to 'mkspecs/common/symbian/symbian-mmp.conf')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index 3eedf4f..976040b 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -13,7 +13,7 @@ contains(QMAKE_HOST.os, "Windows") { } include(symbian.conf) -load(add_mmp_rules) +load(symbian/add_mmp_rules) symbian-abld { # Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it |