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

Conflicts:
	config.tests/unix/compile.test
	src/plugins/platforms/cocoa/qcocoahelpers.mm
	src/tools/qlalr/cppgenerator.cpp

Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3

1 files changed, 15 insertions, 11 deletions

diff --git a/src/corelib/statemachine/qfinalstate.cpp b/src/corelib/statemachine/qfinalstate.cpp
index 61eca2c74d..efcb364794 100644
--- a/src/corelib/statemachine/qfinalstate.cpp
+++ b/src/corelib/statemachine/qfinalstate.cpp
@@ -37,12 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qfinalstate.h"
+#include "qfinalstate_p.h"
 
 #ifndef QT_NO_STATEMACHINE
 
-#include "qabstractstate_p.h"
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -82,19 +80,16 @@ QT_BEGIN_NAMESPACE
   \sa QState::finished()
 */
 
-class QFinalStatePrivate : public QAbstractStatePrivate
-{
-    Q_DECLARE_PUBLIC(QFinalState)
-
-public:
-    QFinalStatePrivate();
-};
-
 QFinalStatePrivate::QFinalStatePrivate()
     : QAbstractStatePrivate(FinalState)
 {
 }
 
+QFinalStatePrivate::~QFinalStatePrivate()
+{
+    // to prevent vtables being generated in every file that includes the private header
+}
+
 /*!
   Constructs a new QFinalState object with the given \a parent state.
 */
@@ -104,6 +99,15 @@ QFinalState::QFinalState(QState *parent)
 }
 
 /*!
+  \internal
+ */
+QFinalState::QFinalState(QFinalStatePrivate &dd, QState *parent)
+    : QAbstractState(dd, parent)
+{
+}
+
+
+/*!
   Destroys this final state.
 */
 QFinalState::~QFinalState()