diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-05-12 19:04:22 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:21 -0300 |
| commit | c1f05a0624b1fae87f091c4c4d302ce38df4ba5a (patch) | |
| tree | a2b8d5f62709c10774a6f9a923586058f8fe8bfe /PySide | |
| parent | 2c83593868edc665c22f7453e8c6becc4e5d8a87 (diff) | |
Only add Qt4.6 classes when using Qt4.6 on QtTest and QtGui.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | PySide/QtTest/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index d026a9338..4362115d4 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -17,7 +17,7 @@ endif() if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) - set (QtGui_46_SRC ) + set(QtGui_46_SRC "") else() set(QtGui_46_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix2x2_wrapper.cpp diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt index 21dd0d82a..6ef7a42c3 100644 --- a/PySide/QtTest/CMakeLists.txt +++ b/PySide/QtTest/CMakeLists.txt @@ -1,9 +1,17 @@ project(QtTest) +if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) + set(QtTest_46_SRC "") +else() + set(QtTest_46_SRC + ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_pysideqtoucheventsequence_wrapper.cpp + ) +endif() + set(QtTest_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp -${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_pysideqtoucheventsequence_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp +${QtTest_46_SRC} ) set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}") |