summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-25 23:25:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-25 23:25:20 (GMT)
commit58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (patch)
treeeab7894549f07b308463c918cebfa2f0a7ffb904 /util
parent6e2cb0d34085dc4767c11e796ad5e2dd32a72e51 (diff)
parent08d88bb2180010348ee060b24f6b773f5f50d156 (diff)
downloadQt-58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc.zip
Qt-58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc.tar.gz
Qt-58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian-linux crosscompilation case changes Symbian-linux crosscompilation debug-release align
Diffstat (limited to 'util')
-rw-r--r--util/s60pixelmetrics/pm_mapper.mmp6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/s60pixelmetrics/pm_mapper.mmp b/util/s60pixelmetrics/pm_mapper.mmp
index 79b7af6..e2c5d37 100644
--- a/util/s60pixelmetrics/pm_mapper.mmp
+++ b/util/s60pixelmetrics/pm_mapper.mmp
@@ -82,10 +82,10 @@ LIBRARY fbscli.lib
LIBRARY eikdlg.lib
LIBRARY aknskins.lib
LIBRARY gdi.lib
-LIBRARY CentralRepository.lib
+LIBRARY centralrepository.lib
LIBRARY efsrv.lib
LIBRARY cdlengine.lib
-LIBRARY AknLayout2.lib
-LIBRARY AknLayout2Scalable.lib
+LIBRARY aknlayout2.lib
+LIBRARY aknlayout2scalable.lib
// End of File