diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-16 11:52:56 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-16 11:52:56 (GMT) |
| commit | 181631276e1bf9a103eeb1a8dc9f195d51e3c279 (patch) | |
| tree | 382cb76aeb56ae1f7ae365a3aa9dc529655ce777 /src | |
| parent | e4d2a4bffa94bac919d2e0b0ad245b917b69b4d5 (diff) | |
| parent | 976dccd952320871e79438d518cbf63fd1832956 (diff) | |
| download | Qt-181631276e1bf9a103eeb1a8dc9f195d51e3c279.zip Qt-181631276e1bf9a103eeb1a8dc9f195d51e3c279.tar.gz Qt-181631276e1bf9a103eeb1a8dc9f195d51e3c279.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qprintengine_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qprintengine_mac.mm b/src/gui/painting/qprintengine_mac.mm index 4a96d44..ea810c5 100644 --- a/src/gui/painting/qprintengine_mac.mm +++ b/src/gui/painting/qprintengine_mac.mm @@ -789,7 +789,7 @@ QVariant QMacPrintEngine::property(PrintEnginePropertyKey key) const ret = 1; break; case PPK_CopyCount: { - uint copies = 1; + UInt32 copies = 1; PMGetCopies(d->settings, &copies); ret = copies; break; |