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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h
index 8dcfa1f7be..845b99a4e8 100644
--- a/src/tools/qdoc/node.h
+++ b/src/tools/qdoc/node.h
@@ -404,7 +404,7 @@ public:
     void printChildren(const QString& title);
     void addChild(Node* child);
     void removeChild(Node* child);
-    virtual void setOutputSubdirectory(const QString& t);
+    void setOutputSubdirectory(const QString& t) Q_DECL_OVERRIDE;
 
 protected:
     Aggregate(NodeType type, Aggregate* parent, const QString& name);
@@ -922,6 +922,8 @@ public:
     virtual QString logicalModuleIdentifier() const Q_DECL_OVERRIDE {
         return parent()->logicalModuleIdentifier();
     }
+    bool isPrivateSignal() const { return privateSignal_; }
+    void setPrivateSignal() { privateSignal_ = true; }
 
     void debug() const;
 
@@ -940,6 +942,7 @@ private:
     bool overload_ : 1;
     bool reimplemented_: 1;
     bool attached_: 1;
+    bool privateSignal_: 1;
     QList<Parameter> parameters_;
     const FunctionNode* reimplementedFrom_;
     const PropertyNode* associatedProperty_;