diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-11-30 06:52:46 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-11-30 06:52:46 (GMT) |
| commit | a93a09e3a59563421a3deb76a5b0509c4b1d1cea (patch) | |
| tree | 7191d6d24504cfc85a023aa8de4ed14ff9c4a4d1 /src/gui/painting | |
| parent | 3aabc92c72bdd9f7e7bc67dd22dae203033e958a (diff) | |
| parent | e42d95d4e9d0dc547c604939f88de95180e74fa0 (diff) | |
| download | Qt-a93a09e3a59563421a3deb76a5b0509c4b1d1cea.zip Qt-a93a09e3a59563421a3deb76a5b0509c4b1d1cea.tar.gz Qt-a93a09e3a59563421a3deb76a5b0509c4b1d1cea.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativepropertycache.cpp
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index ba5d164..bd68d2a 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -1390,7 +1390,7 @@ int QPdfBaseEngine::metric(QPaintDevice::PaintDeviceMetric metricType) const void QPdfBaseEngine::setProperty(PrintEnginePropertyKey key, const QVariant &value) { Q_D(QPdfBaseEngine); - switch (key) { + switch (int(key)) { case PPK_CollateCopies: d->collate = value.toBool(); break; @@ -1480,7 +1480,7 @@ QVariant QPdfBaseEngine::property(PrintEnginePropertyKey key) const Q_D(const QPdfBaseEngine); QVariant ret; - switch (key) { + switch (int(key)) { case PPK_CollateCopies: ret = d->collate; break; |