소스 검색

Update PythonQt to patched-5, which now includes selected updates from patched-6

This commit integrates recent fixes from the PythonQt master, like in the
patched-6 branch, but skips a commit that changes the generated Python Qt API.

The patched-6 branch includes the contents of patched-5 plus PythonQt commits up
to and including commit http://sourceforge.net/p/pythonqt/code/403/.  Commit
http://sourceforge.net/p/pythonqt/code/397/ effectively changes the generated
Python Qt API by removing the singleShot attribute on QTimer to avoid a name
conflict with the static method of the same name. For example, code like this
would need to be rewritten to use the setSingleShot() method instead of setting
the singleShot attribute:

myTimer = qt.QTimer()
myTimer.singleShot = True

The process for updating to patched-6 while maintaining backwards compatibility
is planned to be addressed separately.
Max Smolens 9 년 전
부모
커밋
ad5531063c
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      CMakeExternals/PythonQt.cmake

+ 1 - 1
CMakeExternals/PythonQt.cmake

@@ -66,7 +66,7 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     message(FATAL_ERROR "error: Python is required to build ${PROJECT_NAME}")
   endif()
 
-  set(revision_tag f9c7e6a8e7c9ca7953b7128e820a81c93ed2cc56)
+  set(revision_tag b0194d0ce4a98a21c76344685c6bf7d77f870c7e)
   if(${proj}_REVISION_TAG)
     set(revision_tag ${${proj}_REVISION_TAG})
   endif()