diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 10:34:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 10:34:04 (GMT) |
| commit | d09a9e38a3af2da22ee5555060a59906322c5437 (patch) | |
| tree | 9696e5a9cf51a2e50fab18ccaa91bee5b4450884 | |
| parent | 6396e7a15079cb157caef319348a0bcd0b95a6a7 (diff) | |
| parent | f33ee0c7883cc525b4fbb81c6128bde51cd5e233 (diff) | |
| download | Qt-d09a9e38a3af2da22ee5555060a59906322c5437.zip Qt-d09a9e38a3af2da22ee5555060a59906322c5437.tar.gz Qt-d09a9e38a3af2da22ee5555060a59906322c5437.tar.bz2 | |
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 5230513..48a28b7 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -115,7 +115,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded load(qt_config) load(symbian/platform_paths) -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 |