Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62

1 files changed, 0 insertions, 28 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
index b92ec31a11..4d319e149b 100644
--- a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
+++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
@@ -96,24 +96,6 @@ QCocoaPrintDevice::QCocoaPrintDevice(const QString &id)
     }
 }
 
-QCocoaPrintDevice::QCocoaPrintDevice(const QCocoaPrintDevice &other)
-    : QPlatformPrintDevice(other),
-      m_printer(0),
-      m_session(0),
-      m_ppd(0)
-{
-    m_printer = other.m_printer;
-    PMRetain(m_printer);
-    m_session = other.m_session;
-    PMRetain(m_session);
-    m_macPapers = other.m_macPapers;
-    foreach (PMPaper paper, m_macPapers.values())
-        PMRetain(paper);
-    openPpdFile();
-    m_customMargins = other.m_customMargins;
-    m_printableMargins = other.m_printableMargins;
-}
-
 QCocoaPrintDevice::~QCocoaPrintDevice()
 {
     if (m_ppd)
@@ -127,16 +109,6 @@ QCocoaPrintDevice::~QCocoaPrintDevice()
         PMRelease(m_printer);
 }
 
-QCocoaPrintDevice *QCocoaPrintDevice::clone()
-{
-    return new QCocoaPrintDevice(*this);
-}
-
-bool QCocoaPrintDevice::operator==(const QCocoaPrintDevice &other) const
-{
-    return (m_id == other.m_id);
-}
-
 bool QCocoaPrintDevice::isValid() const
 {
     return m_printer ? true : false;