Merge remote branch 'origin/master' into bearermanagement/unit-tests

Conflicts:
	src/network/access/qnetworkaccessmanager.cpp

4 files changed, 8 insertions, 12 deletions

diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index 83ecc30..e6abf7f 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1078,8 +1078,7 @@ QColorShower::QColorShower(QColorDialog *parent)
 
 #ifdef QT_SMALL_COLORDIALOG
 #  ifdef Q_WS_S60
-    QS60Data s60Data = QS60Data();
-    const bool nonTouchUI = !s60Data.hasTouchscreen;
+    const bool nonTouchUI = !S60->hasTouchscreen;
 #  elif defined Q_WS_MAEMO_5
     const bool nonTouchUI = false;
 #  endif
@@ -1506,8 +1505,7 @@ void QColorDialogPrivate::init(const QColor &initial)
 
 #if defined(QT_SMALL_COLORDIALOG)
 #  if defined(Q_WS_S60)
-    QS60Data s60Data = QS60Data();
-    const bool nonTouchUI = !s60Data.hasTouchscreen;
+    const bool nonTouchUI = !S60->hasTouchscreen;
 #  elif defined(Q_WS_MAEMO_5)
     const bool nonTouchUI = false;
 #  endif
diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/gui/dialogs/qfiledialog_win_p.h
index 527ab3f..44b7e43 100644
--- a/src/gui/dialogs/qfiledialog_win_p.h
+++ b/src/gui/dialogs/qfiledialog_win_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/src/gui/dialogs/qprintdialog_qws.cpp b/src/gui/dialogs/qprintdialog_qws.cpp
index 6b531a2..1336c04 100644
--- a/src/gui/dialogs/qprintdialog_qws.cpp
+++ b/src/gui/dialogs/qprintdialog_qws.cpp
@@ -163,7 +163,7 @@ void QPrintDialogPrivate::_q_okClicked()
     printer->setPaperSize(pageSize);
     printer->setPageOrder(pageOrder2);
     printer->setColorMode(colorMode2);
-    printer->setNumCopies(numCopies);
+    printer->setCopyCount(numCopies);
 
     switch ((rangeCombo->itemData(rangeCombo->currentIndex())).toInt()){
     case (int)QPrintDialog::AllPages:
@@ -479,8 +479,8 @@ void QPrintDialogPrivate::setPrinter(QPrinter *p, bool pickUpSettings)
             printGray->setChecked(true);
 
         // number of copies
-        copies->setValue(p->numCopies());
-        _q_setNumCopies(p->numCopies());
+        copies->setValue(p->copyCount());
+        _q_setNumCopies(p->copyCount());
     }
 
     if (p) {
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp
index 23f5831..2d169cf 100644
--- a/src/gui/dialogs/qprintdialog_unix.cpp
+++ b/src/gui/dialogs/qprintdialog_unix.cpp
@@ -72,8 +72,6 @@
 
 QT_BEGIN_NAMESPACE
 
-extern int qt_printerRealNumCopies(QPaintEngine *);
-
 class QOptionTreeItem;
 class QPPDOptionsModel;
 
@@ -439,7 +437,7 @@ void QPrintDialogPrivate::applyPrinterProperties(QPrinter *p)
     case QPrinter::DuplexShortSide:
         options.duplexShort->setChecked(true); break;
     }
-    options.copies->setValue(qt_printerRealNumCopies(p->paintEngine()));
+    options.copies->setValue(p->copyCount());
     options.collate->setChecked(p->collateCopies());
     options.reverse->setChecked(p->pageOrder() == QPrinter::LastPageFirst);
     top->d->applyPrinterProperties(p);
@@ -510,7 +508,7 @@ void QPrintDialogPrivate::setupPrinter()
     }
 
     // copies
-    p->setNumCopies(options.copies->value());
+    p->setCopyCount(options.copies->value());
     p->setCollateCopies(options.collate->isChecked());
 
     top->d->setupPrinter();