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

 Conflicts:
	src/network/access/qnetworkaccessmanager.cpp
	src/network/access/qnetworkreplyhttpimpl.cpp

Change-Id: I059be651604623616fd31e8616be8ae61b4f8883

1 files changed, 4 insertions, 1 deletions

diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h
index d93032f3f0..0d93a0a075 100644
--- a/src/widgets/itemviews/qtablewidget.h
+++ b/src/widgets/itemviews/qtablewidget.h
@@ -49,14 +49,17 @@ QT_REQUIRE_CONFIG(tablewidget);
 
 QT_BEGIN_NAMESPACE
 
+// ### Qt6 unexport the class, remove the user-defined special 3 and make it a literal type.
 class Q_WIDGETS_EXPORT QTableWidgetSelectionRange
 {
 public:
     QTableWidgetSelectionRange();
     QTableWidgetSelectionRange(int top, int left, int bottom, int right);
-    QTableWidgetSelectionRange(const QTableWidgetSelectionRange &other);
     ~QTableWidgetSelectionRange();
 
+    QTableWidgetSelectionRange(const QTableWidgetSelectionRange &other);
+    QTableWidgetSelectionRange &operator=(const QTableWidgetSelectionRange &other);
+
     inline int topRow() const { return top; }
     inline int bottomRow() const { return bottom; }
     inline int leftColumn() const { return left; }