diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 22:48:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 22:48:55 (GMT) |
| commit | c5adadc72c3d1759143988760c8375008d58ba92 (patch) | |
| tree | 4a39ae324867068f0c159ab123ae581a2672d9c6 | |
| parent | 615b4b5fba61daf4884f7e2c04fc71a4ab9e0a30 (diff) | |
| parent | d09a9e38a3af2da22ee5555060a59906322c5437 (diff) | |
| download | Qt-c5adadc72c3d1759143988760c8375008d58ba92.zip Qt-c5adadc72c3d1759143988760c8375008d58ba92.tar.gz Qt-c5adadc72c3d1759143988760c8375008d58ba92.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 |