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

Conflicts:
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/gui/painting/qdrawhelper.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/plugins/platforms/xcb/qxcbwindow.h
	src/testlib/qtestblacklist.cpp
	src/tools/qdoc/node.cpp
	src/tools/qdoc/node.h
	tests/auto/gui/painting/qcolor/tst_qcolor.cpp

Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684

2 files changed, 15 insertions, 75 deletions

diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index c4f705e858..5ca7bd0123 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -246,82 +246,26 @@ Q_SIGNALS:
     void layoutChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
     void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
 
-    void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void rowsInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void rowsInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void rowsRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void rowsRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void columnsInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void columnsInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void columnsRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void columnsRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void modelAboutToBeReset(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void modelReset(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void modelAboutToBeReset(QPrivateSignal);
+    void modelReset(QPrivateSignal);
 
-    void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow, QPrivateSignal);
+    void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row, QPrivateSignal);
 
-    void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn, QPrivateSignal);
+    void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column, QPrivateSignal);
 
 public Q_SLOTS:
     virtual bool submit();
diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h
index afd5a1f616..dc8d2d4dc8 100644
--- a/src/corelib/itemmodels/qabstractproxymodel.h
+++ b/src/corelib/itemmodels/qabstractproxymodel.h
@@ -92,11 +92,7 @@ public:
     Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
-    void sourceModelChanged(
-#if !defined(qdoc)
-        QPrivateSignal
-#endif
-    );
+    void sourceModelChanged(QPrivateSignal);
 
 protected Q_SLOTS:
     void resetInternalData();