diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 13:24:11 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 13:24:11 (GMT) |
| commit | b78012c855a8b00fa0d100cd0cf6c8de024dfa69 (patch) | |
| tree | 75cd20ff9e068c04996daf0d4aed4e15b49b5992 /mkspecs/common | |
| parent | 5e9382c018e231c5e2ef49dd8a38eaff535b9837 (diff) | |
| parent | 7ca00ed67cb18fb858e1e89cec21b3db696fa923 (diff) | |
| download | Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.zip Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.gz Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.bz2 | |
Merge branch '4.6'
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 509c975..5230513 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -115,6 +115,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded load(qt_config) load(symbian/platform_paths) +load(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 |