aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Tismer <ctismer@gmail.com>2015-11-10 12:07:42 +0100
committerChristian Tismer <ctismer@gmail.com>2015-11-10 12:07:42 +0100
commit9b4a0c4b9bd6284084ac2100180ec865fbffb8ef (patch)
treeb396ae884567d41160f1933aa34939315108964e
parentc0273d25720e1363e1e9d57ae23ac00e9e27783d (diff)
Fix pysidetest. We are at 74% good tests.
As Romain correctly told me, QtCore is needed to be included. The other small bug with huge effects was a forgotten rename of pyside2_global.h. The tests now run without segfaults!
-rw-r--r--tests/pysidetest/CMakeLists.txt1
-rw-r--r--tests/pysidetest/pysidetest_global.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/pysidetest/CMakeLists.txt b/tests/pysidetest/CMakeLists.txt
index 0d9f4811f..5126198cf 100644
--- a/tests/pysidetest/CMakeLists.txt
+++ b/tests/pysidetest/CMakeLists.txt
@@ -38,6 +38,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testbinding_module_wrapper.cpp
make_path(testbinding_include_dirs ${pyside2_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDE_DIR}
+ ${QT_INCLUDE_DIR}/QtCore
)
make_path(testbinding_typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/tests/pysidetest/pysidetest_global.h b/tests/pysidetest/pysidetest_global.h
index bad6e8e2a..b089bdc26 100644
--- a/tests/pysidetest/pysidetest_global.h
+++ b/tests/pysidetest/pysidetest_global.h
@@ -1,5 +1,5 @@
// PySide global.h file
-#include "pyside_global.h"
+#include "pyside2_global.h"
#include "testobject.h"
#include "testview.h"
#define PYSIDE_API