diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-08-27 12:12:19 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-08-27 15:24:55 -0300 |
| commit | 7b2903ad21aba22798b4ceace38c34d29bf7b8cc (patch) | |
| tree | 90f2fca308cc909ccf78970b5f522d0df2dde5d9 /PySide/QtTest | |
| parent | 2774fd8af75ad5a1f412d6e72493de438ce2b8ae (diff) | |
Fix typesystem based on auto OS detection.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Anderson Lizardo <anderson.lizardo@openbossa.org>
Diffstat (limited to 'PySide/QtTest')
| -rw-r--r-- | PySide/QtTest/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | PySide/QtTest/typesystem_test.xml | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt index 5fffb8e93..34044da90 100644 --- a/PySide/QtTest/CMakeLists.txt +++ b/PySide/QtTest/CMakeLists.txt @@ -5,7 +5,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp ) -set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") +set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}") set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/ ${QT_INCLUDE_DIR} @@ -29,4 +29,5 @@ create_pyside_module(QtTest QtTest_libraries QtTest_deps QtTest_typesystem_path - QtTest_SRC) + QtTest_SRC + "") diff --git a/PySide/QtTest/typesystem_test.xml b/PySide/QtTest/typesystem_test.xml index bc447eee0..734bbbb58 100644 --- a/PySide/QtTest/typesystem_test.xml +++ b/PySide/QtTest/typesystem_test.xml @@ -48,6 +48,7 @@ <enum-type name="QTest::MouseAction"/> <enum-type name="QTest::SkipMode"/> <enum-type name="QTest::TestFailMode"/> + <enum-type name="QTest::QBenchmarkMetric" since="4.7"/> <rejection class="QSignalSpy"/> <rejection class="QTestEventList"/> |