diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-10-04 12:44:42 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 16:03:39 (GMT) |
| commit | cdc21e982d11ad90b30c0db5a90bd7a62b961e29 (patch) | |
| tree | f8a77a51337146f45a4ebf1457fdf31a696ee09e /src | |
| parent | a67e03a218ec02531e9cd389ff712639fda92a5f (diff) | |
| download | Qt-cdc21e982d11ad90b30c0db5a90bd7a62b961e29.zip Qt-cdc21e982d11ad90b30c0db5a90bd7a62b961e29.tar.gz Qt-cdc21e982d11ad90b30c0db5a90bd7a62b961e29.tar.bz2 | |
Fixed qmldbg_inspector build for WEC7.
WEC7 does not have std::floor, define it in qfunctions_wince.h
and include qfunctions_wince.h to qmldbg_inspector in WinCE environments.
Task-number: QTBUG-22510
Change-Id: I801d908bf1a70203619e3af9262d7ffcb8ccb1bb
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qfunctions_wince.h | 5 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index d634cba..2ce82cf 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -80,7 +80,12 @@ QT_END_HEADER errno_t qt_wince_getenv_s(size_t*, char*, size_t, const char*); errno_t qt_wince__putenv_s(const char*, const char*); +// Std -------------------------------------------------------------- #ifdef __cplusplus // have this as tiff plugin is written in C +namespace std { + template <class T> inline T floor(const T& a) {return ::floor(a);} +} + extern "C" { #endif diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp index 91db286..7ef926d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp @@ -52,6 +52,10 @@ #include <cmath> +#ifdef Q_OS_WINCE +# include <qfunctions_wince.h> +#endif + namespace QmlJSDebugger { class SelectionRectShape : public QGraphicsRectItem |