summaryrefslogtreecommitdiffstats
path: root/util/s60pixelmetrics/pixel_metrics.h
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-03-31 12:00:03 (GMT)
committeraavit <qt-info@nokia.com>2010-03-31 12:00:03 (GMT)
commit85313fec454f77322deb7041726573e14f6a262a (patch)
treee0151a738a3acc91e16411869e160042e63bbc9a /util/s60pixelmetrics/pixel_metrics.h
parent2fe059c863377befdcf65084a07a7f4841beef0d (diff)
parent93ae014d7ee06a6ebb701420fffef5895cd731c4 (diff)
downloadQt-85313fec454f77322deb7041726573e14f6a262a.zip
Qt-85313fec454f77322deb7041726573e14f6a262a.tar.gz
Qt-85313fec454f77322deb7041726573e14f6a262a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'util/s60pixelmetrics/pixel_metrics.h')
-rw-r--r--util/s60pixelmetrics/pixel_metrics.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/s60pixelmetrics/pixel_metrics.h b/util/s60pixelmetrics/pixel_metrics.h
index 3536c0e..4b0f57e 100644
--- a/util/s60pixelmetrics/pixel_metrics.h
+++ b/util/s60pixelmetrics/pixel_metrics.h
@@ -185,7 +185,9 @@ NONSHARABLE_CLASS( QStyle )
// Bold line width
PM_Custom_BoldLineWidth,
// Thin line width
- PM_Custom_ThinLineWidth
+ PM_Custom_ThinLineWidth,
+ // Height of a popup info messagebox
+ PM_Custom_MessageBoxHeight
};
};