Python qt3 upgrade

CMakeLists.txt

@@ -11,6 +11,16 @@ cmake_minimum_required(VERSION 2.8)
 project(PythonQt)
 #-----------------------------------------------------------------------------
 
+include(CTestUseLaunchers OPTIONAL)
+
+#----------------------------------------------------------------------------
+# Qt version
+
+set(PythonQt_QT_VERSION 5 CACHE STRING "Pick a version of Qt to use: 4 or 5")
+
+set(minimum_required_qt5_version "5.3.0")
+set(minimum_required_qt4_version "4.6.2")
+
 #-----------------------------------------------------------------------------
 # Python libraries
 
@@ -20,6 +30,13 @@ add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
 
 #-----------------------------------------------------------------------------
 # Build options
+option(PythonQt_Wrap_QtAll "Make all Qt components available in python" OFF)
+
+if(PythonQt_QT_VERSION MATCHES 4)
+  set(qtlibs core gui network opengl sql svg uitools webkit xml xmlpatterns locale)
+else()
+  set(qtlibs Core Network OpenGL Sql Svg Widgets WebKitWidgets Xml XmlPatterns UiTools)
+endif()
 
 if(NOT DEFINED PythonQt_INSTALL_RUNTIME_DIR)
   set(PythonQt_INSTALL_RUNTIME_DIR bin)
@@ -39,14 +56,13 @@ endif()
 
 option(PythonQt_Wrap_QtAll "Make all Qt components available in python" OFF)
 
-set(qtlibs core gui network opengl sql svg uitools webkit xml xmlpatterns)
 foreach(qtlib ${qtlibs})
   OPTION(PythonQt_Wrap_Qt${qtlib} "Make all of Qt${qtlib} available in python" OFF)
 endforeach()
 
 # Force option if it applies
 if(PythonQt_Wrap_QtAll)
-  list(REMOVE_ITEM qtlibs xmlpatterns) # xmlpatterns wrapper does *NOT* build at all :(
+  list(REMOVE_ITEM qtlibs XmlPatterns) # xmlpatterns wrapper does *NOT* build at all :(
   foreach(qtlib ${qtlibs})
     if(NOT ${PythonQt_Wrap_Qt${qtlib}})
       set(PythonQt_Wrap_Qt${qtlib} ON CACHE BOOL "Make all of Qt${qtlib} available in python" FORCE)
@@ -65,42 +81,92 @@ endif()
 #-----------------------------------------------------------------------------
 # Setup Qt
 
-set(minimum_required_qt_version "4.6.2")
+if(PythonQt_QT_VERSION MATCHES 5)
 
-find_package(Qt4)
+  if(BUILD_TESTING)
+    list(APPEND qtlibs Test)
+  endif()
 
-if(QT4_FOUND)
+  find_package(Qt5 ${minimum_required_qt5_version} COMPONENTS ${qtlibs} REQUIRED)
 
-  set(found_qt_version ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
+  if(Qt5_DIR)
+    get_filename_component(_Qt5_DIR "${Qt5_DIR}/../../../" ABSOLUTE)
+    list(FIND CMAKE_PREFIX_PATH "${_Qt5_DIR}" _result)
+    if(_result LESS 0)
+      set(CMAKE_PREFIX_PATH "${_Qt5_DIR};${CMAKE_PREFIX_PATH}" CACHE PATH "" FORCE)
+    endif()
+  endif()
 
-  if(${found_qt_version} VERSION_LESS ${minimum_required_qt_version})
-      message(FATAL_ERROR "error: PythonQt requires Qt >= ${minimum_required_qt_version} -- you cannot use Qt ${found_qt_version}.")
+  get_target_property(_qmake_exec Qt5::qmake LOCATION)
+  execute_process(COMMAND ${_qmake_exec} -query QT_INSTALL_BINS
+    RESULT_VARIABLE _result
+    OUTPUT_VARIABLE QT_BINARY_DIR
+    ERROR_VARIABLE _error
+    )
+  string(STRIP "${QT_BINARY_DIR}" QT_BINARY_DIR)
+  if(_result OR NOT EXISTS "${QT_BINARY_DIR}")
+    message(FATAL_ERROR "Could not determine Qt binary directory: ${_result} ${QT_BINARY_DIR} ${_error}")
   endif()
 
-  # Enable required qt module
-  foreach(qtlib network opengl sql svg uitools webkit xml xmlpatterns)
-    string(TOUPPER ${qtlib} qtlib_uppercase)
-    if (NOT ${QT_QT${qtlib_uppercase}_FOUND})
-      message(FATAL_ERROR "QT_QT${qtlib_uppercase} *not* FOUND - Try to disable PythonQt_Wrap_Qt${qtlib}")
-    endif()
-    set(QT_USE_QT${qtlib_uppercase} ${PythonQt_Wrap_Qt${qtlib}})
+  set(QT_LIBRARIES )
+  foreach(qtlib ${qtlibs})
+       include_directories(${Qt5${qtlib}_INCLUDE_DIRS})
+       list(APPEND QT_LIBRARIES ${Qt5${qtlib}_LIBRARIES})
+       add_definitions(${Qt5${qtlib}_DEFINITIONS})
   endforeach()
 
-  set(QT_USE_QTTEST ${BUILD_TESTING})
+  #-----------------------------------------------------------------------------
+  # The variable "generated_cpp_suffix" allows to conditionnally compile the generated wrappers
+  # associated with the Qt version being used.
+  set(generated_cpp_suffix "_${Qt5Core_VERSION_MAJOR}${Qt5Core_VERSION_MINOR}")
+
+  # Use Qt5.4 as default for higher versions like it's done in build/common.prf
+  if(${Qt5Core_VERSION_MINOR} GREATER 4)
+    set(generated_cpp_suffix "_${Qt5Core_VERSION_MAJOR}4")
+  endif()
+
 
-  include(${QT_USE_FILE})
 else()
-  message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
-endif()
+  #-----------------------------------------------------------------------------
+  # Setup Qt4
 
-#-----------------------------------------------------------------------------
-# The variable "generated_cpp_suffix" allows to conditionnally compile the generated wrappers
-# associated with the Qt version being used.
-set(generated_cpp_suffix "_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
-if("${generated_cpp_suffix}" STREQUAL "_46")
-  set(generated_cpp_suffix "_47") # Also use 4.7 wrappers for 4.6.x version
-endif()
+  find_package(Qt4)
+
+  if(QT4_FOUND)
+
+    set(found_qt_version ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
+
+    if(${found_qt_version} VERSION_LESS ${minimum_required_qt4_version})
+      message(FATAL_ERROR "error: PythonQt requires Qt >= ${minimum_required_qt4_version} -- you cannot use Qt ${found_qt_version}.")
+    endif()
+
+    # Enable required qt module
+    foreach(qtlib ${qtlibs})
+      string(TOUPPER ${qtlib} qtlib_uppercase)
+      if (NOT ${QT_QT${qtlib_uppercase}_FOUND})
+        message(FATAL_ERROR "QT_QT${${qtlib_uppercase} *not* FOUND - Try to disable PythonQt_Wrap_Qt${qtlib}")
+      endif()
+      set(QT_USE_QT${qtlib_uppercase} ${PythonQt_Wrap_Qt${qtlib}})
+    endforeach()
+
+    set(QT_USE_QTTEST ${BUILD_TESTING})
+
+    include(${QT_USE_FILE})
+  else()
+    message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
+  endif()
+
+  #-----------------------------------------------------------------------------
+  # The variable "generated_cpp_suffix" allows to conditionnally compile the generated wrappers
+  # associated with the Qt version being used.
+  set(generated_cpp_suffix "_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
 
+  # TODO: generated headers for Qt4.8 contains several locales that are not available
+  #       out of the box -> force 4.7
+  if("${generated_cpp_suffix}" STREQUAL "_46" OR "${generated_cpp_suffix}" STREQUAL "_48")
+    set(generated_cpp_suffix "_47") # Also use 4.7 wrappers for 4.6.x version
+   endif()
+endif()
 #-----------------------------------------------------------------------------
 # Sources
 
@@ -124,8 +190,6 @@ set(sources
     src/PythonQtStdOut.cpp
     src/gui/PythonQtScriptingConsole.cpp
 
-    generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.cpp
-
     generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.cpp
     generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin_init.cpp
     generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin0.cpp
@@ -157,12 +221,14 @@ set(headers
     src/PythonQtStdIn.h
     src/PythonQtStdOut.h
     src/PythonQtSystem.h
-    src/PythonQtUtils.h
     src/PythonQtVariants.h
     src/PythonQtPythonInclude.h
-    generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.h
+    src/PythonQtUtils.h
 )
-
+if(PythonQt_QT_VERSION MATCHES 4)
+  set(sources ${sources} generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.cpp)
+  set(headers ${headers} generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.h)
+endif()
 #-----------------------------------------------------------------------------
 # Headers that should run through moc
 
@@ -178,7 +244,7 @@ set(moc_sources
 
 #-----------------------------------------------------------------------------
 # Add extra sources
-foreach(qtlib core gui network opengl sql svg uitools webkit xml xmlpatterns)
+foreach(qtlib ${qtlibs})
 
   if (${PythonQt_Wrap_Qt${qtlib}})
 
@@ -215,10 +281,15 @@ set(qrc_sources )
 
 #-----------------------------------------------------------------------------
 # Do wrapping
-qt4_wrap_cpp(gen_moc_sources ${moc_sources})
-qt4_wrap_ui(gen_ui_sources ${ui_sources})
-qt4_add_resources(gen_qrc_sources ${qrc_sources})
-
+if(PythonQt_QT_VERSION MATCHES 4)
+  qt4_wrap_cpp(gen_moc_sources ${moc_sources})
+  qt4_wrap_ui(gen_ui_sources ${ui_sources})
+  qt4_add_resources(gen_qrc_sources ${qrc_sources})
+else()
+  qt5_wrap_cpp(gen_moc_sources ${moc_sources})
+  qt5_wrap_ui(gen_ui_sources ${ui_sources})
+  qt5_add_resources(gen_qrc_sources ${qrc_sources})
+endif()
 #-----------------------------------------------------------------------------
 # Build the library
 
@@ -271,19 +342,25 @@ if(BUILD_TESTING)
     tests/PythonQtTests.cpp
     tests/PythonQtTests.h
     )
-
-  QT4_WRAP_CPP(test_sources
-    tests/PythonQtTests.h
-    )
+  if(PythonQt_QT_VERSION MATCHES 4)
+    QT4_WRAP_CPP(test_sources
+      tests/PythonQtTests.h
+      )
+  else()
+    QT5_WRAP_CPP(test_sources
+      tests/PythonQtTests.h
+      )
+  endif()
 
   set_property(SOURCE tests/PythonQtTestMain.cpp PROPERTY COMPILE_DEFINITIONS "main=tests_PythonQtTestMain")
 
   add_executable(PythonQtCppTests ${test_sources})
-  target_link_libraries(PythonQtCppTests PythonQt)
+  target_link_libraries(PythonQtCppTests PythonQt ${Qt5Test_LIBRARIES})
 
   add_test(
     NAME tests_PythonQtTestMain
     COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:PythonQtCppTests> tests/PythonQtTestMain
     )
 endif()
 
+

README.md

@@ -23,7 +23,7 @@ Prerequisites
 Build instructions
 ------------------
 
-By default, the `patched-3` version will be checked out.
+By default, the `patched-5` version will be checked out.
 
 ```
 git clone git://github.com/commontk/PythonQt.git
@@ -43,8 +43,19 @@ Additional configure options are:
 Available branches
 ------------------
 
-This repository contains three branches:
-* Based on [r245](http://sourceforge.net/p/pythonqt/code/245/)
+This repository contains 5 branches:
+
+### patched-5
+* Based on patched-4 + [r403](http://sourceforge.net/p/pythonqt/code/403/) excluding commit [r397](http://sourceforge.net/p/pythonqt/code/397/)
+* List of bug fixes:
+ * Fix for memory leaks and cleanup crash
+* List of features:
+ * CMake:
+  * Fix install rules
+  * Fix "_invalid_parameter_noinfo_noreturn" link error
+ * PythonQt:
+  * Add Qt5 support
+  * Add PY3K support
 
 ### patched-4
 * Based on patched-3 + [r245](http://sourceforge.net/p/pythonqt/code/245/)

generator/abstractmetalang.cpp

@@ -696,18 +696,6 @@ QString AbstractMetaFunction::targetLangSignature(bool minimal) const
 
     // Attributes...
     if (!minimal) {
-#if 0 // jambi
-        if (isPublic()) s += "public ";
-        else if (isProtected()) s += "protected ";
-        else if (isPrivate()) s += "private ";
-
-//     if (isNative()) s += "native ";
-//     else
-        if (isFinalInTargetLang()) s += "final ";
-        else if (isAbstract()) s += "abstract ";
-
-        if (isStatic()) s += "static ";
-#endif
         // Return type
         if (type())
             s += type()->name() + " ";

generator/shellgenerator.cpp

@@ -297,6 +297,18 @@ bool ShellGenerator::functionHasNonConstReferences(const AbstractMetaFunction* f
   return false;
 }
 
+bool ShellGenerator::functionNeedsNormalWrapperSlot(const AbstractMetaFunction* func, const AbstractMetaClass* currentClass)
+{
+  if (func->isSlot()) {
+    return false;
+  }
+  else if (func->isVirtual()) {
+    return func->declaringClass() == currentClass;
+  } else {
+    return true;
+  }
+}
+
 AbstractMetaFunctionList ShellGenerator::getFunctionsToWrap(const AbstractMetaClass* meta_class)
 {
   AbstractMetaFunctionList functions = meta_class->queryFunctions( 

generator/shellgenerator.h

@@ -77,6 +77,8 @@ class ShellGenerator : public Generator
 
     bool functionHasNonConstReferences(const AbstractMetaFunction* func);
 
+    bool functionNeedsNormalWrapperSlot(const AbstractMetaFunction* func, const AbstractMetaClass* currentClass);
+
     static QString shellClassName(const AbstractMetaClass *meta_class) {
       return "PythonQtShell_" + meta_class->name();
     }