upgraded to PY3K

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@279 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

Author: florianlink

build/python.prf

@@ -1,8 +1,8 @@
 # profile to include and link Python
 
-# Change this variable to your python version (2.5, 2.6)
+# Change this variable to your python version (2.6, 2.7, 3.3, ...)
 win32:PYTHON_VERSION=26
-unix:PYTHON_VERSION=2.6
+unix:PYTHON_VERSION=2.6
 
 macx {
   # for macx you need to have the Python development kit installed as framework
@@ -30,9 +30,8 @@ macx {
     DEBUG_EXT = 
   }
 
-  win32:INCLUDEPATH += $(PYTHON_PATH)/PC $(PYTHON_PATH)/include
-  win32:LIBS += $(PYTHON_LIB)/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
-
+  win32:INCLUDEPATH += $$(PYTHON_PATH)/PC $$(PYTHON_PATH)/include
+  win32:LIBS += $$(PYTHON_LIB)/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
 } else:unix {
   # on linux, python-config is used to autodetect Python.
   # make sure that you have installed a matching python-dev package.

extensions/PythonQt_QtAll/PythonQt_QtAll.pro

@@ -23,18 +23,12 @@ contains(QT_MAJOR_VERSION, 5) {
   QT += widgets webkitwidgets printsupport
 }
 
-contains( QT_MAJOR_VERSION, 5 ) {
-  GENERATED_PATH = ../../generated_cpp_50
-} else {
-  GENERATED_PATH = ../../generated_cpp
-}
-
-include ($$GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_svg/com_trolltech_qt_svg.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_sql/com_trolltech_qt_sql.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_network/com_trolltech_qt_network.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
-include ($$GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_core/com_trolltech_qt_core.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_svg/com_trolltech_qt_svg.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_sql/com_trolltech_qt_sql.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_network/com_trolltech_qt_network.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
+include ($$PYTHONQT_GENERATED_PATH/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri)

generated_cpp_47/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.h

@@ -181,7 +181,7 @@ void delete_QByteArray(QByteArray* obj) { delete obj; }
 
   PyObject* data(QByteArray* b) {
     if (b->data()) {
-      return PyString_FromStringAndSize(b->data(), b->size());
+      return PyBytes_FromStringAndSize(b->data(), b->size());
     } else {
       Py_INCREF(Py_None);
       return Py_None;

generated_cpp_48/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.h

@@ -186,7 +186,7 @@ void delete_QByteArray(QByteArray* obj) { delete obj; }
 
   PyObject* data(QByteArray* b) {
     if (b->data()) {
-      return PyString_FromStringAndSize(b->data(), b->size());
+      return PyBytes_FromStringAndSize(b->data(), b->size());
     } else {
       Py_INCREF(Py_None);
       return Py_None;