From 453e6e134510bdae8fe68519a4d42120ae21a53b Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 25 Jun 2012 14:12:49 +1000 Subject: 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 --- src/declarative/util/qdeclarativestateoperations_p.h | 8 ++++++++ 1 file changed, 8 insertions(+) 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 { -- cgit v0.12