aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2017-04-24 11:22:59 +0200
committerChristian Tismer <tismer@stackless.com>2017-04-25 08:54:35 +0000
commit4091470af05caaf43b3e5b019b32d2e8eb1cf876 (patch)
tree7963f9e32fe5cf9ee7756a508acdfe05050c7bda
parent1b0ba0e96666e66d16ee5c83062a118605aaeadc (diff)
Make QtConcurrent work at least
For some reason, nobody checked if QtConcurrent really works. I added the missing class and added a test. Change-Id: I134697a9357424986c4a1e615f4038f9a61678ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--PySide2/QtConcurrent/CMakeLists.txt1
-rw-r--r--tests/QtConcurrent/CMakeLists.txt1
-rw-r--r--tests/QtConcurrent/this_module_loads_test.py39
3 files changed, 41 insertions, 0 deletions
diff --git a/PySide2/QtConcurrent/CMakeLists.txt b/PySide2/QtConcurrent/CMakeLists.txt
index f1ccf88b..4a7fd53f 100644
--- a/PySide2/QtConcurrent/CMakeLists.txt
+++ b/PySide2/QtConcurrent/CMakeLists.txt
@@ -1,6 +1,7 @@
project(QtConcurrent)
set(QtConcurrent_SRC
+${QtConcurrent_GEN_DIR}/qtconcurrent_wrapper.cpp
# module is always needed
${QtConcurrent_GEN_DIR}/qtconcurrent_module_wrapper.cpp
)
diff --git a/tests/QtConcurrent/CMakeLists.txt b/tests/QtConcurrent/CMakeLists.txt
new file mode 100644
index 00000000..79c5c83a
--- /dev/null
+++ b/tests/QtConcurrent/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(this_module_loads_test.py)
diff --git a/tests/QtConcurrent/this_module_loads_test.py b/tests/QtConcurrent/this_module_loads_test.py
new file mode 100644
index 00000000..0bf67354
--- /dev/null
+++ b/tests/QtConcurrent/this_module_loads_test.py
@@ -0,0 +1,39 @@
+#############################################################################
+##
+## Copyright (C) 2017 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$
+##
+#############################################################################
+
+from __future__ import print_function
+
+import os
+
+modname = os.path.basename(os.path.dirname(__file__))
+try:
+ exec("from PySide2 import {}".format(modname))
+ print("The module {} loads. That is the minimum test, folks :-)".format(modname))
+except ImportError:
+ print("The module {} did not load! Did you include all classes in CMake?".format(modname))
+ raise