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

Change-Id: I0bebba45aa05c2eb02c35bf76b63bb7eaa67b562

3 files changed, 87 insertions, 3 deletions

diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt
index 4a0f27933..3a08cb45b 100644
--- a/sources/pyside2/tests/QtCore/CMakeLists.txt
+++ b/sources/pyside2/tests/QtCore/CMakeLists.txt
@@ -61,6 +61,7 @@ PYSIDE_TEST(qenum_test.py)
 PYSIDE_TEST(qevent_test.py)
 PYSIDE_TEST(qfileinfo_test.py)
 PYSIDE_TEST(qfile_test.py)
+PYSIDE_TEST(qfileread_test.py)
 PYSIDE_TEST(qflags_test.py)
 PYSIDE_TEST(qinstallmsghandler_test.py)
 PYSIDE_TEST(qlinef_test.py)
diff --git a/sources/pyside2/tests/QtCore/qfileread_test.py b/sources/pyside2/tests/QtCore/qfileread_test.py
new file mode 100644
index 000000000..3912fe7e6
--- /dev/null
+++ b/sources/pyside2/tests/QtCore/qfileread_test.py
@@ -0,0 +1,82 @@
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of PySide2.
+##
+## $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$
+##
+#############################################################################
+
+import unittest
+
+import os
+
+from PySide2.QtCore import QIODevice, QTemporaryFile
+
+class FileChild1(QTemporaryFile):
+    pass
+
+class FileChild2(QTemporaryFile):
+    def readData(self, maxlen):
+        return super(FileChild2, self).readData(maxlen)
+    def readLineData(self, maxlen):
+        return super(FileChild2, self).readLineData(maxlen)
+
+class readDataTest(unittest.TestCase):
+    '''Test case for readData and readLineData'''
+
+    def setUp(self):
+        '''Acquire resources'''
+        self.filename1 = FileChild1()
+        self.assertTrue(self.filename1.open())
+        self.filename1.write('Test text for testing')
+
+        self.filename2 = FileChild2()
+        self.assertTrue(self.filename2.open())
+        self.filename2.write('Test text for testing')
+
+    def tearDown(self):
+        '''release resources'''
+        pass
+
+    def testBasic(self):
+        '''QTemporaryFile.read'''
+        self.filename1.seek(0)
+        s1 = self.filename1.read(50)
+        self.assertEqual(s1, 'Test text for testing')
+
+
+    def testBug40(self):
+        self.filename2.seek(0)
+        s2 = self.filename2.read(50)
+        self.assertEqual(s2, 'Test text for testing')
+
+        self.filename2.seek(0)
+        s2 = self.filename2.readLine(22)
+        self.assertEqual(s2, 'Test text for testing')
+
+        self.filename1.seek(0)
+        s1 = self.filename1.read(50)
+        self.assertEqual(s1, s2)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/sources/pyside2/tests/QtCore/qinstallmsghandler_test.py b/sources/pyside2/tests/QtCore/qinstallmsghandler_test.py
index d8f7bb3a5..08580823e 100644
--- a/sources/pyside2/tests/QtCore/qinstallmsghandler_test.py
+++ b/sources/pyside2/tests/QtCore/qinstallmsghandler_test.py
@@ -65,9 +65,10 @@ class QInstallMsgHandlerTest(unittest.TestCase):
 
     def testHandler(self):
         rethandler = qInstallMessageHandler(handler)
-        qDebug("Test Debug")
-        self.assertEqual(param[0], QtDebugMsg)
-        self.assertEqual(param[2], "Test Debug")
+        if QLibraryInfo.isDebugBuild():
+            qDebug("Test Debug")
+            self.assertEqual(param[0], QtDebugMsg)
+            self.assertEqual(param[2], "Test Debug")
         qWarning("Test Warning")
         self.assertEqual(param[0], QtWarningMsg)
         self.assertEqual(param[2], "Test Warning")