New branch patched-5 (based on patched-4 + back ported upstream + add-qt5-support)

README.md

@@ -18,7 +18,7 @@ Prerequisites
 -------------
 
 * CMake 2.8.x
-* Qt 4.6.2 or above
+* Qt 4.6.2 or above (Qt5.x also supported)
 
 Build instructions
 ------------------
@@ -36,24 +36,38 @@ make
 Additional configure options are:
 
 * `CMAKE_BUILD_TYPE`:  Debug, Release, RelWithDebInfo or MinSizeRel
+* `PythonQt_QT_VERSION`: 4, 5
 * `PythonQt_DEBUG`: Enable/Disable PythonQt debug output
 * `PythonQt_Wrap_QtAll`: Make all Qt components available in python
 * `PythonQt_Wrap_Qt<componentname>`: Build PythonQt wrapper associated with `<componentname>`. Possible `<componentname>` are `gui`, `network`, `opengl`, `sql`, `uitools`, `webkit`, `xml`, `xmlpatterns`.
+* `Qt5_CMAKE_PATH`: Path containing the Qt5* folders with inside the Qt5*Config.cmake files.
 
 Available branches
 ------------------
 
-This repository contains three branches:
-* Based on [r245](http://sourceforge.net/p/pythonqt/code/245/)
+This repository contains different branches:
+* Based on the original PythonQt source code on [sourceforge]( http://sourceforge.net/p/pythonqt/code/)
 
+### patched-5
+
+* Based on patched-4 + backported upstream: [r246](http://sourceforge.net/p/pythonqt/code/246/), [r247](http://sourceforge.net/p/pythonqt/code/247/), [r248](http://sourceforge.net/p/pythonqt/code/248/) + branch: [add-qt5-support](https://github.com/commontk/PythonQt/tree/add-qt5-support)
+* List of features
+  * Qt 5.x support:
+    * Modules QtWidgets and QtPrintSupport only wrapped if selected, but they will stay in the PythonQt.QtGui namespace for compatibily reason. 
+    * Module QtWebKitWidgets only wrapped if selected, but it stays in the PythonQt.QtWebKit namespace for compatibily reason.
+    * CMake forces the wrapping of the selected modules dependency (e.g. QtPrintSupport requires QtWidgets, QtGui and QtCore)
+  * CMake variable `PythonQt_QT_VERSION` to select the version of Qt to wrap (4 or 5)
+
 ### patched-4
+
 * Based on patched-3 + [r245](http://sourceforge.net/p/pythonqt/code/245/)
 * List of features:
  * Add BUILD_TESTING option disabled by default to keep behavior consistent with previous version.
  * Do not exclude enums from wrapping if they are QFlags.
  * Ensure enums added using only Q_FLAGS without corresponding Q_ENUMS are wrapped.
 
 ### patched-3
+
 * Backported:
  * Most of the [change specific to](https://github.com/commontk/PythonQt/compare/e2dce4b...patched-2) `patched-2` branch have been backported upstream: [r241](http://sourceforge.net/p/pythonqt/code/241/), [r242](http://sourceforge.net/p/pythonqt/code/242/), [r243](http://sourceforge.net/p/pythonqt/code/243/)
 

generated_cpp_50/PythonQt_QtBindings.cpp

@@ -0,0 +1,63 @@
+
+#include "PythonQt_QtBindings.h"
+
+#include "PythonQt.h"
+
+void PythonQt_init_QtGui(PyObject*);
+void PythonQt_init_QtSvg(PyObject*);
+void PythonQt_init_QtSql(PyObject*);
+void PythonQt_init_QtNetwork(PyObject*);
+void PythonQt_init_QtCore(PyObject*);
+void PythonQt_init_QtWebKit(PyObject*);
+void PythonQt_init_QtOpenGL(PyObject*);
+void PythonQt_init_QtXml(PyObject*);
+void PythonQt_init_QtXmlPatterns(PyObject*);
+void PythonQt_init_QtUiTools(PyObject*);
+void PythonQt_init_QtPhonon(PyObject*);
+
+PYTHONQT_EXPORT void PythonQt_init_QtBindings()
+  {
+  #ifdef PYTHONQT_WRAP_QtCore
+  PythonQt_init_QtCore(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtGui
+  PythonQt_init_QtGui(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtNetwork
+  PythonQt_init_QtNetwork(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtOpenGL
+  PythonQt_init_QtOpenGL(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtSql
+  PythonQt_init_QtSql(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtSvg
+  PythonQt_init_QtSvg(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtUiTools
+  PythonQt_init_QtUiTools(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtWebKit
+  PythonQt_init_QtWebKit(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtXml
+  PythonQt_init_QtXml(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtXmlPatterns
+  PythonQt_init_QtXmlPatterns(0);
+  #endif
+
+  #ifdef PYTHONQT_WRAP_QtPhonon
+  PythonQt_init_QtPhonon(0);
+  #endif
+  };

generated_cpp_50/PythonQt_QtBindings.h

@@ -0,0 +1,10 @@
+#ifndef _PYTHONQT_QTBINDINGS_H
+#define _PYTHONQT_QTBINDINGS_H
+
+#include "PythonQtSystem.h"
+
+/// Initialize Qt bindings enabled at configuration time
+PYTHONQT_EXPORT void PythonQt_init_QtBindings();
+
+#endif
+

generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core.pri

@@ -0,0 +1,10 @@
+HEADERS += \
+           $$PWD/com_trolltech_qt_core0.h \
+           $$PWD/com_trolltech_qt_core1.h \
+           $$PWD/com_trolltech_qt_core2.h \
+
+SOURCES += \
+           $$PWD/com_trolltech_qt_core0.cpp \
+           $$PWD/com_trolltech_qt_core1.cpp \
+           $$PWD/com_trolltech_qt_core2.cpp \
+           $$PWD/com_trolltech_qt_core_init.cpp