diff options
| author | zhihaoadsk <zhihao.li@autodesk.com> | 2016-04-14 22:32:28 +0800 |
|---|---|---|
| committer | zhihaoadsk <zhihao.li@autodesk.com> | 2016-04-14 22:32:28 +0800 |
| commit | 09ae775444bbf5a2ebe613fb8633ddcee8c911f8 (patch) | |
| tree | 4ec75bc3769f749dc7e0c36873a56f05b912caed /PySide2/QtWebKit | |
| parent | 7006f35459fb41db6f5087217c1cdc0354a38568 (diff) | |
1. These 2 new functions could be suppressed by editing PySide2/QtTest/typesystem_test.xml
2. Also fixed typo: Qt5Webkit -> Qt5WebKit
3. fixed global.h.in (@Qt5WebEngine_FOUND@ should be @Qt5WebEngineWidgets_FOUND@)
4. And fixed a couple of crash (more condition check).
`Scanning dependencies of target QtTest
[ 82%] Building CXX object PySide2/QtTest/CMakeFiles/QtTest.dir/PySide2/QtTest/qtest_pysideqtoucheventsequence_wrapper.cpp.o
[ 82%] Building CXX object PySide2/QtTest/CMakeFiles/QtTest.dir/PySide2/QtTest/qtest_wrapper.cpp.o
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:3836:40: error: expected ';' after top
level declarator
static PyObject* Sbk_QTestFunc_toString(PyObject* self, PyObject* pyArg)
^
;
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4120:7: error: unexpected namespace name
'QTest': expected expression
::QTest* cppSelf = 0;
^
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4120:14: error: use of undeclared
identifier 'cppSelf'
::QTest* cppSelf = 0;
^
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4121:16: error: use of undeclared
identifier 'cppSelf'
SBK_UNUSED(cppSelf)
^
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_install/py2.7-qt5.6.0-64bit-release/include/shiboken2/helper.h:31:31: note: expanded from macro 'SBK_UNUSED'
#define SBK_UNUSED(x) (void)x;
^
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4124:5: error: use of undeclared
identifier 'cppSelf'
cppSelf = ;
^
/Volumes/data2/mayadev/pyside/2.0qt56/pyside2-setup/pyside_build/py2.7-qt5.6.0-64bit-release/pyside2/PySide2/QtTest/PySide2/QtTest/qtest_wrapper.cpp:4124:15: error: expected expression
cppSelf = ;
`
The toString and toString errors are caused by changes in QtTest/qtestcase.h
#define QTEST_COMPARE_DECL(KLASS)\
template<> Q_TESTLIB_EXPORT char *toString(const KLASS &);
Qt 5.6 has the following new lines in qtestcase.h:
QTEST_COMPARE_DECL(signed char)
QTEST_COMPARE_DECL(unsigned char)
shiboken picked up the new functions in Qt 5.6
These 2 new functions could be suppressed by editing PySide2/QtTest/typesystem_test.xml
Diffstat (limited to 'PySide2/QtWebKit')
| -rw-r--r-- | PySide2/QtWebKit/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/PySide2/QtWebKit/CMakeLists.txt b/PySide2/QtWebKit/CMakeLists.txt index b5bbd42f3..6bbcbfd43 100644 --- a/PySide2/QtWebKit/CMakeLists.txt +++ b/PySide2/QtWebKit/CMakeLists.txt @@ -27,7 +27,7 @@ set(QtWebKit_include_dirs ${QtWebKit_SOURCE_DIR} set(QtWebKit_libraries pyside2 ${SHIBOKEN_PYTHON_LIBRARIES} ${SHIBOKEN_LIBRARY} - ${Qt5Webkit_LIBRARIES} + ${Qt5WebKit_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES} |