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

Conflicts:
	src/gui/kernel/qguiapplication.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/testlib/qtestsystem.h

Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5

4 files changed, 160 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/qmacautoreleasepool.pro b/tests/auto/corelib/tools/qmacautoreleasepool/qmacautoreleasepool.pro
new file mode 100644
index 0000000000..26b3a47472
--- /dev/null
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/qmacautoreleasepool.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qmacautoreleasepool
+QT = core testlib
+SOURCES = tst_qmacautoreleasepool.mm
diff --git a/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
new file mode 100644
index 0000000000..8f1069f419
--- /dev/null
+++ b/tests/auto/corelib/tools/qmacautoreleasepool/tst_qmacautoreleasepool.mm
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+#include <Foundation/Foundation.h>
+
+class tst_QMacAutoreleasePool : public QObject
+{
+    Q_OBJECT
+private slots:
+    void noPool();
+    void rootLevelPool();
+    void stackAllocatedPool();
+    void heapAllocatedPool();
+};
+
+static id lastDeallocedObject = nil;
+
+@interface DeallocTracker : NSObject @end
+@implementation DeallocTracker
+-(void)dealloc
+{
+    lastDeallocedObject = self;
+    [super dealloc];
+}
+@end
+
+void tst_QMacAutoreleasePool::noPool()
+{
+    // No pool, will not be released, but should not crash
+
+    [[[DeallocTracker alloc] init] autorelease];
+}
+
+void tst_QMacAutoreleasePool::rootLevelPool()
+{
+    // The root level case, no NSAutoreleasePool since we're not in the main
+    // runloop, and objects autoreleased as part of main.
+
+    NSObject *allocedObject = nil;
+    {
+        QMacAutoReleasePool qtPool;
+        allocedObject = [[[DeallocTracker alloc] init] autorelease];
+    }
+    QCOMPARE(lastDeallocedObject, allocedObject);
+}
+
+void tst_QMacAutoreleasePool::stackAllocatedPool()
+{
+    // The normal case, other pools surrounding our pool, draining
+    // our pool before any other pool.
+
+    NSObject *allocedObject = nil;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    {
+        QMacAutoReleasePool qtPool;
+        allocedObject = [[[DeallocTracker alloc] init] autorelease];
+    }
+    QCOMPARE(lastDeallocedObject, allocedObject);
+    [pool drain];
+}
+
+void tst_QMacAutoreleasePool::heapAllocatedPool()
+{
+    // The special case, a pool allocated on the heap, or as a member of a
+    // heap allocated object. This is not a supported use of QMacAutoReleasePool,
+    // and will result in warnings if the pool is prematurely drained.
+
+    NSObject *allocedObject = nil;
+    {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        QMacAutoReleasePool *qtPool = nullptr;
+        {
+            qtPool = new QMacAutoReleasePool;
+            allocedObject = [[[DeallocTracker alloc] init] autorelease];
+        }
+        [pool drain];
+        delete qtPool;
+    }
+    QCOMPARE(lastDeallocedObject, allocedObject);
+}
+
+QTEST_APPLESS_MAIN(tst_QMacAutoreleasePool)
+
+#include "tst_qmacautoreleasepool.moc"
diff --git a/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp b/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp
index 9617afb651..48ea5a794c 100644
--- a/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp
+++ b/tests/auto/corelib/tools/qstringview/tst_qstringview.cpp
@@ -136,6 +136,7 @@ class tst_QStringView : public QObject
 private Q_SLOTS:
     void constExpr() const;
     void basics() const;
+    void literals() const;
     void at() const;
 
     void fromQString() const;
@@ -305,6 +306,12 @@ void tst_QStringView::constExpr() const
         Q_STATIC_ASSERT(!sv2.isNull());
         Q_STATIC_ASSERT(!sv2.empty());
         Q_STATIC_ASSERT(sv2.size() == 5);
+
+        constexpr char16_t *null = nullptr;
+        constexpr QStringView sv3(null);
+        Q_STATIC_ASSERT(sv3.isNull());
+        Q_STATIC_ASSERT(sv3.isEmpty());
+        Q_STATIC_ASSERT(sv3.size() == 0);
     }
 #else // storage_type is wchar_t
     {
@@ -328,6 +335,12 @@ void tst_QStringView::constExpr() const
         Q_STATIC_ASSERT(!sv2.isNull());
         Q_STATIC_ASSERT(!sv2.empty());
         Q_STATIC_ASSERT(sv2.size() == 5);
+
+        constexpr wchar_t *null = nullptr;
+        constexpr QStringView sv3(null);
+        Q_STATIC_ASSERT(sv3.isNull());
+        Q_STATIC_ASSERT(sv3.isEmpty());
+        Q_STATIC_ASSERT(sv3.size() == 0);
     }
 #endif
 #endif
@@ -348,6 +361,37 @@ void tst_QStringView::basics() const
     QVERIFY(!(sv2 != sv1));
 }
 
+void tst_QStringView::literals() const
+{
+#if !defined(Q_OS_WIN) || defined(Q_COMPILER_UNICODE_STRINGS)
+    // the + ensures it's a pointer, not an array
+    QCOMPARE(QStringView(+u"Hello").size(), 5);
+    QStringView sv = u"Hello";
+#else // storage_type is wchar_t
+    // the + ensures it's a pointer, not an array
+    QCOMPARE(QStringView(+L"Hello").size(), 5);
+    QStringView sv = L"Hello";
+#endif
+    QCOMPARE(sv.size(), 5);
+    QVERIFY(!sv.empty());
+    QVERIFY(!sv.isEmpty());
+    QVERIFY(!sv.isNull());
+    QCOMPARE(*sv.utf16(), 'H');
+    QCOMPARE(sv[0],      QLatin1Char('H'));
+    QCOMPARE(sv.at(0),   QLatin1Char('H'));
+    QCOMPARE(sv.front(), QLatin1Char('H'));
+    QCOMPARE(sv.first(), QLatin1Char('H'));
+    QCOMPARE(sv[4],      QLatin1Char('o'));
+    QCOMPARE(sv.at(4),   QLatin1Char('o'));
+    QCOMPARE(sv.back(),  QLatin1Char('o'));
+    QCOMPARE(sv.last(),  QLatin1Char('o'));
+
+    QStringView sv2(sv.utf16(), sv.utf16() + sv.size());
+    QVERIFY(!sv2.isNull());
+    QVERIFY(!sv2.empty());
+    QCOMPARE(sv2.size(), 5);
+}
+
 void tst_QStringView::at() const
 {
     QString hello("Hello");
diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro
index 6720307d59..f35ed026ac 100644
--- a/tests/auto/corelib/tools/tools.pro
+++ b/tests/auto/corelib/tools/tools.pro
@@ -67,3 +67,4 @@ SUBDIRS=\
     qvector_strictiterators \
     qversionnumber
 
+darwin: SUBDIRS += qmacautoreleasepool