diff options
| author | Christian Tismer <ctismer@gmail.com> | 2015-06-13 23:07:44 +0200 |
|---|---|---|
| committer | Christian Tismer <ctismer@gmail.com> | 2015-06-13 23:07:44 +0200 |
| commit | c868b58611e99d5428f012780053a18856f4fa64 (patch) | |
| tree | e415548bd7e30ffbf0055c52b4f6fbc8539aae69 /libpyside | |
| parent | f891d496dbf6c8be83e15c6bb1941d1e34bfc031 (diff) | |
try to compile as much as possible, remove phonon, edit many files.
Right now, the compiling/breaking ratio on QtCore looks like 50%.
There are a couple of errors which seem to repeat all the time.
This is still work in progress, takes many hours and will hopefully result in a build, tomorrow.
Diffstat (limited to 'libpyside')
| -rw-r--r-- | libpyside/pysideconversions.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpyside/pysideconversions.h b/libpyside/pysideconversions.h index 733b8a193..d00a77a17 100644 --- a/libpyside/pysideconversions.h +++ b/libpyside/pysideconversions.h @@ -239,7 +239,8 @@ struct QFlagsConverter static inline T toCpp(PyObject* pyObj) { - long val = 0; + /* this was long. Needed int in Qt5 */ + int val = 0; if (Shiboken::Enum::check(pyObj)) { val = Shiboken::Enum::getValue(pyObj); } else if (PyObject_TypeCheck(pyObj, Shiboken::SbkType<T>())) { |