diff options
| author | Martin Jones <martin.jones@nokia.com> | 2012-06-25 04:12:49 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 04:20:25 (GMT) |
| commit | 453e6e134510bdae8fe68519a4d42120ae21a53b (patch) | |
| tree | 8b616b685b0e18a8dd61668ab94396f6fefd9f2b /src/declarative/util | |
| parent | 20e5b74bd94bfae9cf783b0c67dd03ab270e347e (diff) | |
| download | Qt-453e6e134510bdae8fe68519a4d42120ae21a53b.zip Qt-453e6e134510bdae8fe68519a4d42120ae21a53b.tar.gz Qt-453e6e134510bdae8fe68519a4d42120ae21a53b.tar.bz2 | |
rewind macro in WinCE wrongly substituted.
qdeclarativestateoperations_p.h gets wrong macro substitution by
rewind(fp) macro when compiling for Windows CE
Task-number: QTBUG-26227
Change-Id: I228ab17ee0be0e228d0c782bfb48ad5c8b12169f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index 6848b8a..bc85dd8 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -54,6 +54,14 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +#ifdef Q_OS_WINCE +// qgraphicsitem.h includes qfunctions_wince.h. +// qfunctions_wince.h defines a missing posix rewind for WinCE, +// but this conflicts with rewind method defined in this class. +// As a workaround we undefine WinCE posix replacement for rewind here. +# undef rewind +#endif + class QDeclarativeParentChangePrivate; class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeParentChange : public QDeclarativeStateOperation, public QDeclarativeActionEvent { |