From cdc21e982d11ad90b30c0db5a90bd7a62b961e29 Mon Sep 17 00:00:00 2001 From: jaanttil Date: Tue, 4 Oct 2011 15:44:42 +0300 Subject: 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 Reviewed-by: Kai Koehne --- src/corelib/kernel/qfunctions_wince.h | 5 +++++ .../qmltooling/qmldbg_inspector/editor/liveselectionrectangle.cpp | 4 ++++ 2 files changed, 9 insertions(+) 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 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 +#ifdef Q_OS_WINCE +# include +#endif + namespace QmlJSDebugger { class SelectionRectShape : public QGraphicsRectItem -- cgit v0.12