Merge branch 'master' into mmfphonon

Conflicts:
	src/gui/itemviews/qitemselectionmodel.cpp
	tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp
index 7b99e2f..21c0873 100644
--- a/src/gui/painting/qprintengine_win.cpp
+++ b/src/gui/painting/qprintengine_win.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -1360,10 +1360,10 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
         Q_ASSERT(margins.size() == 4);
         int left, top, right, bottom;
         // specified in 1/100 mm
-        left = (margins.at(0).toDouble()*25.4/72.0) * 100;
-        top = (margins.at(1).toDouble()*25.4/72.0) * 100;
-        right = (margins.at(2).toDouble()*25.4/72.0) * 100;
-        bottom = (margins.at(3).toDouble()*25.4/72.0) * 100;
+        left = (margins.at(0).toReal()*25.4/72.0) * 100;
+        top = (margins.at(1).toReal()*25.4/72.0) * 100;
+        right = (margins.at(2).toReal()*25.4/72.0) * 100;
+        bottom = (margins.at(3).toReal()*25.4/72.0) * 100;
         d->setPageMargins(left, top, right, bottom);
         break;
     }