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

 Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_mouse.mm
	src/testlib/testlib.pro

Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2

1 files changed, 75 insertions, 0 deletions

diff --git a/src/testlib/qttestglobal.h b/src/testlib/qttestglobal.h
new file mode 100644
index 0000000000..9561e56ba3
--- /dev/null
+++ b/src/testlib/qttestglobal.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtTest module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTTESTGLOBAL_H
+#define QTTESTGLOBAL_H
+
+#include <QtCore/qglobal.h>
+#include <QtTest/qttestlib-config.h>
+
+QT_BEGIN_NAMESPACE
+
+#if defined(QT_STATIC)
+# define Q_TESTLIB_EXPORT
+#else
+# ifdef QT_BUILD_TESTLIB_LIB
+#  define Q_TESTLIB_EXPORT Q_DECL_EXPORT
+# else
+#  define Q_TESTLIB_EXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#if (defined Q_CC_HPACC) && (defined __ia64)
+# ifdef Q_TESTLIB_EXPORT
+#  undef Q_TESTLIB_EXPORT
+# endif
+# define Q_TESTLIB_EXPORT
+#endif
+
+#define QTEST_VERSION     QT_VERSION
+#define QTEST_VERSION_STR QT_VERSION_STR
+
+namespace QTest
+{
+    enum TestFailMode { Abort = 1, Continue = 2 };
+}
+
+QT_END_NAMESPACE
+
+#endif