diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-10-05 09:56:11 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 14:59:20 +0100 |
| commit | ace551f12e905bec6be53ec3941bbde0f5ecad15 (patch) | |
| tree | c8f121c9fc0a90761a8ca05b345f8a679babbff1 /src/declarative/util | |
| parent | fc0a203ba7595a67c632e121a3039f424ddc8348 (diff) | |
Build fix for QtDeclarative in WindowsCE
qdeclarativestateoperations.cpp in declarative module needs to include
qgraphicsitem.h. In windows CE, the qgraphicsitem.h further needs to
include qfunctions_wince.h. qfunctions_wince.h is used to implement
posix functions missing from WinCE. One of reimplemented functions in
qfunctions_wince.h is posix rewind. Now qdeclarativestateoperations.cpp
also implements method called rewind with different prototype. Two
incompatible prototypes of rewind break the QtDeclarative build
for WinCE.
As a workaround the POSIX rewind reimplemented by qfunctions_wince.h
is now undefined in this class, because it is not needed here.
Task-number: QTBUG-22511
Change-Id: I9e569fa753e70b386068f54d95c3aae0a2dbe55d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 30c5730d0c..6684030242 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -56,6 +56,13 @@ #include <QtCore/qdebug.h> #include <QtGui/qgraphicsitem.h> +#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 #include <QtCore/qmath.h> #include <private/qobject_p.h> |