summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorWater-Team <water@pad.test.qt.nokia.com>2011-11-27 00:00:12 (GMT)
committerWater-Team <water@pad.test.qt.nokia.com>2011-11-27 00:00:12 (GMT)
commit5e68676ae4955fe03d9b8da5a33567abde0b91c3 (patch)
tree8e615fadf749ba15486962d28655bef51c5e9ee4 /util
parent4466ac29e9a9bd0cc9a0e49c9064a9eb208c04a4 (diff)
parentf48870f8efbcf7ca4e344e48e4f61334f35b9c6c (diff)
downloadQt-5e68676ae4955fe03d9b8da5a33567abde0b91c3.zip
Qt-5e68676ae4955fe03d9b8da5a33567abde0b91c3.tar.gz
Qt-5e68676ae4955fe03d9b8da5a33567abde0b91c3.tar.bz2
Merge branch '4.8-upstream' into master-water
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