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

Change-Id: Id40dab17b02800199f70072115d7473041f683d8

1 files changed, 41 insertions, 0 deletions

diff --git a/sources/pyside2/tests/QtLocation/location.py b/sources/pyside2/tests/QtLocation/location.py
new file mode 100644
index 000000000..ca964c46c
--- /dev/null
+++ b/sources/pyside2/tests/QtLocation/location.py
@@ -0,0 +1,41 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+'''Unit test for Location'''
+
+from PySide2.QtLocation import QGeoServiceProvider
+import unittest
+
+class QLocationTestCase(unittest.TestCase):
+    def test(self):
+        geoServiceProvider = QGeoServiceProvider("none")
+        self.assertEqual(geoServiceProvider.errorString(),
+                         'The geoservices provider none is not supported.')
+
+if __name__ == "__main__":
+    unittest.main()