diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-02 14:37:17 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-02 14:37:21 +0200 |
| commit | 1e05405a9826c4fcc98ab44814abca44741ff01f (patch) | |
| tree | dc37df810b411c54719c3ccac7ddc936d10e876e /sources/pyside2/tests/pysidetest | |
| parent | 0e956797b544645c00f7b7b3564b2ba0cb069079 (diff) | |
| parent | 8dd21fcb2c9f0366b3d298781c8a852363a4df22 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ia6485d1b1caa93c4ecdd02b0544f19d197a43fb0
Diffstat (limited to 'sources/pyside2/tests/pysidetest')
4 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt index 05b0b86b4..73644a057 100644 --- a/sources/pyside2/tests/pysidetest/CMakeLists.txt +++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt @@ -117,7 +117,7 @@ target_link_libraries(testbinding ${Qt5Widgets_LIBRARIES} ${SBK_PYTHON_LIBRARIES}) -add_dependencies(testbinding pyside2 QtCore libpyside pysidetest) +add_dependencies(testbinding pyside2 QtCore QtGui QtWidgets libpyside pysidetest) PYSIDE_TEST(decoratedslot_test.py) PYSIDE_TEST(delegatecreateseditor_test.py) diff --git a/sources/pyside2/tests/pysidetest/hiddenobject.h b/sources/pyside2/tests/pysidetest/hiddenobject.h index ba96cec9c..b5e3c8e0b 100644 --- a/sources/pyside2/tests/pysidetest/hiddenobject.h +++ b/sources/pyside2/tests/pysidetest/hiddenobject.h @@ -42,7 +42,7 @@ class HiddenObject : public QObject public: HiddenObject() : m_called(false) {} Q_INVOKABLE void callMe(); -public slots: +public Q_SLOTS: bool wasCalled(); private: bool m_called; diff --git a/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py b/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py index bd5db7661..b09a7fb42 100644 --- a/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py +++ b/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py @@ -11,8 +11,8 @@ ## 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(). +## 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 @@ -20,7 +20,7 @@ ## 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. +## be met: https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml b/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml index 4053b7b77..7895e7147 100644 --- a/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml +++ b/sources/pyside2/tests/pysidetest/typesystem_pysidetest.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <typesystem package="testbinding"> - <load-typesystem name="typesystem_core.xml" generate="no" /> + <load-typesystem name="typesystem_widgets.xml" generate="no"/> <value-type name="IntValue"/> <primitive-type name="TypedefValue"> <!-- |