diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-10-27 15:01:19 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:15 -0300 |
| commit | f57d4d4dbc212bb13a28f10932197fc0548c842f (patch) | |
| tree | 4a37c185a868455faf2c8c0ce0c2fbc2d90b1ff7 /PySide | |
| parent | 5c076e1c5304fc31f981f9a4e80ce5a6602bbb9c (diff) | |
Fix bug 1011 - "PySide cygwin patch"
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtCore/qstring_conversions.h | 2 | ||||
| -rw-r--r-- | PySide/QtUiTools/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h index 975a5717a..33c393b1f 100644 --- a/PySide/QtCore/qstring_conversions.h +++ b/PySide/QtCore/qstring_conversions.h @@ -23,7 +23,7 @@ struct Converter<QString> { if (PyUnicode_Check(pyObj)) { Py_UNICODE* unicode = PyUnicode_AS_UNICODE(pyObj); - #if defined(Py_UNICODE_WIDE) + #if defined(Py_UNICODE_WIDE) || defined(__CYGWIN__) // cast as Py_UNICODE can be a different type return QString::fromUcs4(reinterpret_cast<const uint*>(unicode)); #else diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt index 195cb8163..85e33c507 100644 --- a/PySide/QtUiTools/CMakeLists.txt +++ b/PySide/QtUiTools/CMakeLists.txt @@ -23,10 +23,10 @@ set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} set(QtUiTools_libraries pyside uiplugin ${SHIBOKEN_PYTHON_LIBRARIES} - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} + ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} - ${QT_QTUITOOLS_LIBRARY}) + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY}) set(QtUiTools_deps QtGui QtXml) create_pyside_module(QtUiTools QtUiTools_include_dirs |