summaryrefslogtreecommitdiffstats
path: root/PySide
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-05-12 19:04:22 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2011-05-12 19:04:22 -0300
commit63c4cb9f9efb24b18b9eb56a63a0c12c71dd720d (patch)
tree6a74ca6191dad57f98cc6ce964480b451607c2f4 /PySide
parent70a776c6ffec7d5e067be38844814dfd3733c818 (diff)
downloadpyside-63c4cb9f9efb24b18b9eb56a63a0c12c71dd720d.tar.gz
pyside-63c4cb9f9efb24b18b9eb56a63a0c12c71dd720d.tar.xz
pyside-63c4cb9f9efb24b18b9eb56a63a0c12c71dd720d.zip
Only add Qt4.6 classes when using Qt4.6 on QtTest and QtGui.
Diffstat (limited to 'PySide')
-rw-r--r--PySide/QtGui/CMakeLists.txt2
-rw-r--r--PySide/QtTest/CMakeLists.txt10
2 files changed, 10 insertions, 2 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index d026a93..4362115 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 21dd0d8..6ef7a42 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}")