Merge remote-tracking branch 'origin/dev' into 5.5

Needed due to license header patch.

Change-Id: Id7e30490132a7c487687a0a376419e9f9b97ea41

25 files changed, 131 insertions, 109 deletions

diff --git a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp
index e37212b475..c311db957c 100644
--- a/src/corelib/doc/snippets/code/doc_src_qiterator.cpp
+++ b/src/corelib/doc/snippets/code/doc_src_qiterator.cpp
@@ -257,7 +257,7 @@ while (i.hasNext()) {
 QMutableListIterator<double> i(list);
 while (i.hasNext()) {
     double val = i.next();
-    i.setValue(sqrt(val));
+    i.setValue(std::sqrt(val));
 }
 //! [23]
 
@@ -266,7 +266,7 @@ while (i.hasNext()) {
 QMutableLinkedListIterator<double> i(list);
 while (i.hasNext()) {
     double val = i.next();
-    i.setValue(sqrt(val));
+    i.setValue(std::sqrt(val));
 }
 //! [24]
 
@@ -275,7 +275,7 @@ while (i.hasNext()) {
 QMutableVectorIterator<double> i(list);
 while (i.hasNext()) {
     double val = i.next();
-    i.setValue(sqrt(val));
+    i.setValue(std::sqrt(val));
 }
 //! [25]
 
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp
index 17a252cc1b..b545c2dad8 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp
@@ -105,7 +105,7 @@ MyWidget::mouseMoveEvent(QMouseEvent *event)
 
 
 //! [8]
-double trueLength = sqrt(pow(x(), 2) + pow(y(), 2));
+double trueLength = std::sqrt(std::pow(x(), 2) + std::pow(y(), 2));
 //! [8]
 
 
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index de6f2401b8..f307e98dd7 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -297,6 +297,9 @@
 #ifndef QT_NO_DESKTOPSERVICES
 #  define QT_NO_DESKTOPSERVICES
 #endif
+#ifndef QT_NO_MIMETYPE
+#  define QT_NO_MIMETYPE
+#endif
 #ifndef QT_NO_SYSTEMTRAYICON
 #  define QT_NO_SYSTEMTRAYICON
 #endif
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index 48c08e4f36..43ae101515 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -187,6 +187,9 @@
 #ifndef QT_NO_DESKTOPSERVICES
 #  define QT_NO_DESKTOPSERVICES
 #endif
+#ifndef QT_NO_MIMETYPE
+#  define QT_NO_MIMETYPE
+#endif
 #ifndef QT_NO_SYSTEMTRAYICON
 #  define QT_NO_SYSTEMTRAYICON
 #endif
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index fb6e56ec7d..dec16eaef1 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -879,6 +879,12 @@ Section: Utilities
 Requires:
 Name: QDesktopServices
 
+Feature: MIMETYPE
+Description: Describes types of file or data, represented by a MIME type string.
+Section: Utilities
+Requires:
+Name: QMimeType
+
 Feature: SYSTEMTRAYICON
 Description: Provides an icon for an application in the system tray.
 Section: Utilities
diff --git a/src/corelib/io/forkfd_qt.cpp b/src/corelib/io/forkfd_qt.cpp
index ed96f9db20..56a39f8df0 100644
--- a/src/corelib/io/forkfd_qt.cpp
+++ b/src/corelib/io/forkfd_qt.cpp
@@ -35,7 +35,7 @@
 #ifndef _POSIX_C_SOURCE
 #  define _POSIX_C_SOURCE 200809L
 #endif
-#if !defined(_XOPEN_SOURCE) && !defined(__QNXNTO__)
+#if !defined(_XOPEN_SOURCE) && !defined(__QNXNTO__) && !defined(ANDROID)
 #  define _XOPEN_SOURCE 500
 #endif
 
diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h
index 2395e9ee1c..5cc3ec586e 100644
--- a/src/corelib/kernel/qmath.h
+++ b/src/corelib/kernel/qmath.h
@@ -38,13 +38,11 @@
 #pragma qt_class(QtMath)
 #endif
 
-#include <math.h>
-
 #include <QtCore/qglobal.h>
-#include <QtCore/qcompilerdetection.h>
 
-QT_BEGIN_NAMESPACE
+#include <cmath>
 
+QT_BEGIN_NAMESPACE
 
 #define QT_SINE_TABLE_SIZE 256
 
@@ -52,139 +50,86 @@ extern Q_CORE_EXPORT const qreal qt_sine_table[QT_SINE_TABLE_SIZE];
 
 inline int qCeil(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return int(ceilf(float(v)));
-    else
-#endif
-        return int(ceil(v));
+    using std::ceil;
+    return int(ceil(v));
 }
 
 inline int qFloor(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return int(floorf(float(v)));
-    else
-#endif
-        return int(floor(v));
+    using std::floor;
+    return int(floor(v));
 }
 
 inline qreal qFabs(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if(sizeof(qreal) == sizeof(float))
-        return fabsf(float(v));
-    else
-#endif
-        return fabs(v);
+    using std::fabs;
+    return fabs(v);
 }
 
 inline qreal qSin(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return sinf(float(v));
-    else
-#endif
-        return sin(v);
+    using std::sin;
+    return sin(v);
 }
 
 inline qreal qCos(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return cosf(float(v));
-    else
-#endif
-        return cos(v);
+    using std::cos;
+    return cos(v);
 }
 
 inline qreal qTan(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return tanf(float(v));
-    else
-#endif
-        return tan(v);
+    using std::tan;
+    return tan(v);
 }
 
 inline qreal qAcos(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return acosf(float(v));
-    else
-#endif
-       return acos(v);
+    using std::acos;
+    return acos(v);
 }
 
 inline qreal qAsin(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return asinf(float(v));
-    else
-#endif
-        return asin(v);
+    using std::asin;
+    return asin(v);
 }
 
 inline qreal qAtan(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return atanf(float(v));
-    else
-#endif
-        return atan(v);
+    using std::atan;
+    return atan(v);
 }
 
 inline qreal qAtan2(qreal y, qreal x)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return atan2f(float(y), float(x));
-    else
-#endif
-        return atan2(y, x);
+    using std::atan2;
+    return atan2(y, x);
 }
 
 inline qreal qSqrt(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return sqrtf(float(v));
-    else
-#endif
-        return sqrt(v);
+    using std::sqrt;
+    return sqrt(v);
 }
 
 inline qreal qLn(qreal v)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return logf(float(v));
-    else
-#endif
-        return log(v);
+    using std::log;
+    return log(v);
 }
 
 inline qreal qExp(qreal v)
 {
-    // only one signature
-    // exists, exp(double)
+    using std::exp;
     return exp(v);
 }
 
 inline qreal qPow(qreal x, qreal y)
 {
-#ifdef QT_USE_MATH_H_FLOATS
-    if (sizeof(qreal) == sizeof(float))
-        return powf(float(x), float(y));
-    else
-#endif
-        return pow(x, y);
+    using std::pow;
+    return pow(x, y);
 }
 
 #ifndef M_E
diff --git a/src/corelib/mimetypes/mimetypes.pri b/src/corelib/mimetypes/mimetypes.pri
index 238aa837e2..1ab773fc10 100644
--- a/src/corelib/mimetypes/mimetypes.pri
+++ b/src/corelib/mimetypes/mimetypes.pri
@@ -20,6 +20,6 @@ SOURCES += \
         mimetypes/qmimeglobpattern.cpp \
         mimetypes/qmimeprovider.cpp
 
-RESOURCES += \
-        mimetypes/mimetypes.qrc
-
+!contains(DEFINES, QT_NO_MIMETYPE) {
+    RESOURCES += mimetypes/mimetypes.qrc
+}
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp
index 89560e4adf..b919e1c48a 100644
--- a/src/corelib/mimetypes/qmimedatabase.cpp
+++ b/src/corelib/mimetypes/qmimedatabase.cpp
@@ -33,8 +33,9 @@
 
 #include <qplatformdefs.h> // always first
 
-#include "qmimedatabase.h"
+#ifndef QT_NO_MIMETYPE
 
+#include "qmimedatabase.h"
 #include "qmimedatabase_p.h"
 
 #include "qmimeprovider_p.h"
@@ -597,3 +598,5 @@ QList<QMimeType> QMimeDatabase::allMimeTypes() const
 */
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h
index 4fb9308a15..912d9b8443 100644
--- a/src/corelib/mimetypes/qmimedatabase.h
+++ b/src/corelib/mimetypes/qmimedatabase.h
@@ -35,6 +35,9 @@
 #define QMIMEDATABASE_H
 
 #include <QtCore/qmimetype.h>
+
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
@@ -81,4 +84,6 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif   // QMIMEDATABASE_H
+
+#endif // QT_NO_MIMETYPE
+#endif // QMIMEDATABASE_H
diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h
index dd54c3a185..e3cfe3443f 100644
--- a/src/corelib/mimetypes/qmimedatabase_p.h
+++ b/src/corelib/mimetypes/qmimedatabase_p.h
@@ -45,13 +45,16 @@
 // We mean it.
 //
 
-#include <QtCore/qhash.h>
-#include <QtCore/qmutex.h>
-
 #include "qmimetype.h"
+
+#ifndef QT_NO_MIMETYPE
+
 #include "qmimetype_p.h"
 #include "qmimeglobpattern_p.h"
 
+#include <QtCore/qhash.h>
+#include <QtCore/qmutex.h>
+
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -90,4 +93,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif   // QMIMEDATABASE_P_H
+#endif // QT_NO_MIMETYPE
+#endif // QMIMEDATABASE_P_H
diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp
index d852a9f249..57d834ac78 100644
--- a/src/corelib/mimetypes/qmimeglobpattern.cpp
+++ b/src/corelib/mimetypes/qmimeglobpattern.cpp
@@ -33,6 +33,8 @@
 
 #include "qmimeglobpattern_p.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include <QRegExp>
 #include <QStringList>
 #include <QDebug>
@@ -234,3 +236,5 @@ void QMimeAllGlobPatterns::clear()
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h
index f2524a0d36..9ee3eb61cf 100644
--- a/src/corelib/mimetypes/qmimeglobpattern_p.h
+++ b/src/corelib/mimetypes/qmimeglobpattern_p.h
@@ -45,6 +45,10 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/qstringlist.h>
 #include <QtCore/qhash.h>
 
@@ -146,4 +150,5 @@ public:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_MIMETYPE
 #endif // QMIMEGLOBPATTERN_P_H
diff --git a/src/corelib/mimetypes/qmimemagicrule.cpp b/src/corelib/mimetypes/qmimemagicrule.cpp
index d9240a9fce..9693558a4c 100644
--- a/src/corelib/mimetypes/qmimemagicrule.cpp
+++ b/src/corelib/mimetypes/qmimemagicrule.cpp
@@ -36,6 +36,8 @@
 
 #include "qmimemagicrule_p.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/QList>
 #include <QtCore/QDebug>
 #include <qendian.h>
@@ -377,3 +379,5 @@ bool QMimeMagicRule::matches(const QByteArray &data) const
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h
index 3b2c9c1a12..03ac1d1de9 100644
--- a/src/corelib/mimetypes/qmimemagicrule_p.h
+++ b/src/corelib/mimetypes/qmimemagicrule_p.h
@@ -45,6 +45,10 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qlist.h>
@@ -89,4 +93,5 @@ Q_DECLARE_TYPEINFO(QMimeMagicRule, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_MIMETYPE
 #endif // QMIMEMAGICRULE_H
diff --git a/src/corelib/mimetypes/qmimemagicrulematcher.cpp b/src/corelib/mimetypes/qmimemagicrulematcher.cpp
index fc92a4cdcd..629e8d9d2f 100644
--- a/src/corelib/mimetypes/qmimemagicrulematcher.cpp
+++ b/src/corelib/mimetypes/qmimemagicrulematcher.cpp
@@ -35,6 +35,8 @@
 
 #include "qmimemagicrulematcher_p.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include "qmimetype_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -98,3 +100,4 @@ unsigned QMimeMagicRuleMatcher::priority() const
 }
 
 QT_END_NAMESPACE
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimemagicrulematcher_p.h b/src/corelib/mimetypes/qmimemagicrulematcher_p.h
index f600e9801a..1ea6227378 100644
--- a/src/corelib/mimetypes/qmimemagicrulematcher_p.h
+++ b/src/corelib/mimetypes/qmimemagicrulematcher_p.h
@@ -45,12 +45,14 @@
 // We mean it.
 //
 
+#include "qmimemagicrule_p.h"
+
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
 
-#include "qmimemagicrule_p.h"
-
 QT_BEGIN_NAMESPACE
 
 class QMimeMagicRuleMatcher
@@ -78,4 +80,5 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_MIMETYPE
 #endif // QMIMEMAGICRULEMATCHER_P_H
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp
index a65782de6b..7342a5cd77 100644
--- a/src/corelib/mimetypes/qmimeprovider.cpp
+++ b/src/corelib/mimetypes/qmimeprovider.cpp
@@ -33,6 +33,8 @@
 
 #include "qmimeprovider_p.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include "qmimetypeparser_p.h"
 #include <qstandardpaths.h>
 #include "qmimemagicrulematcher_p.h"
@@ -866,3 +868,5 @@ void QMimeXMLProvider::addMagicMatcher(const QMimeMagicRuleMatcher &matcher)
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h
index b438c4f076..5a89ac23c3 100644
--- a/src/corelib/mimetypes/qmimeprovider_p.h
+++ b/src/corelib/mimetypes/qmimeprovider_p.h
@@ -45,8 +45,11 @@
 // We mean it.
 //
 
-#include <QtCore/qdatetime.h>
 #include "qmimedatabase_p.h"
+
+#ifndef QT_NO_MIMETYPE
+
+#include <QtCore/qdatetime.h>
 #include <QtCore/qset.h>
 
 QT_BEGIN_NAMESPACE
@@ -168,4 +171,5 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_MIMETYPE
 #endif // QMIMEPROVIDER_P_H
diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp
index e000359980..70df9868b6 100644
--- a/src/corelib/mimetypes/qmimetype.cpp
+++ b/src/corelib/mimetypes/qmimetype.cpp
@@ -33,6 +33,8 @@
 
 #include "qmimetype.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include "qmimetype_p.h"
 #include "qmimedatabase_p.h"
 #include "qmimeprovider_p.h"
@@ -449,3 +451,5 @@ QDebug operator<<(QDebug debug, const QMimeType &mime)
 #endif
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h
index d6d12a7ec4..4ba3c53470 100644
--- a/src/corelib/mimetypes/qmimetype.h
+++ b/src/corelib/mimetypes/qmimetype.h
@@ -34,6 +34,10 @@
 #ifndef QMIMETYPE_H
 #define QMIMETYPE_H
 
+#include <QtCore/qglobal.h>
+
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
@@ -108,4 +112,6 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QMimeType &mime);
 #endif
 
 QT_END_NAMESPACE
-#endif   // QMIMETYPE_H
+
+#endif // QT_NO_MIMETYPE
+#endif // QMIMETYPE_H
diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h
index bfaf32422e..bf533bbcb0 100644
--- a/src/corelib/mimetypes/qmimetype_p.h
+++ b/src/corelib/mimetypes/qmimetype_p.h
@@ -47,6 +47,8 @@
 
 #include "qmimetype.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include <QtCore/qhash.h>
 #include <QtCore/qstringlist.h>
 
@@ -112,4 +114,5 @@ QT_END_NAMESPACE
     QT_END_NAMESPACE
 #endif
 
+#endif // QT_NO_MIMETYPE
 #endif   // QMIMETYPE_P_H
diff --git a/src/corelib/mimetypes/qmimetypeparser.cpp b/src/corelib/mimetypes/qmimetypeparser.cpp
index 1af426d7e7..9610162c4f 100644
--- a/src/corelib/mimetypes/qmimetypeparser.cpp
+++ b/src/corelib/mimetypes/qmimetypeparser.cpp
@@ -35,6 +35,8 @@
 
 #include "qmimetypeparser_p.h"
 
+#ifndef QT_NO_MIMETYPE
+
 #include "qmimetype_p.h"
 #include "qmimemagicrulematcher_p.h"
 
@@ -341,3 +343,5 @@ bool QMimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MIMETYPE
diff --git a/src/corelib/mimetypes/qmimetypeparser_p.h b/src/corelib/mimetypes/qmimetypeparser_p.h
index 292a5ab38e..2be4380cee 100644
--- a/src/corelib/mimetypes/qmimetypeparser_p.h
+++ b/src/corelib/mimetypes/qmimetypeparser_p.h
@@ -47,6 +47,9 @@
 //
 
 #include "qmimedatabase_p.h"
+
+#ifndef QT_NO_MIMETYPE
+
 #include "qmimeprovider_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -118,4 +121,5 @@ private:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_MIMETYPE
 #endif // MIMETYPEPARSER_P_H
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index c1d74b3b43..1bd9c5ebb9 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -657,7 +657,7 @@ struct BezierEase : public QEasingCurveFunction
 
     qreal static inline _acos(qreal x)
     {
-        return sqrt(1-x)*(1.5707963267948966192313216916398f + x*(-0.213300989f + x*(0.077980478f + x*-0.02164095f)));
+        return std::sqrt(1-x)*(1.5707963267948966192313216916398f + x*(-0.213300989f + x*(0.077980478f + x*-0.02164095f)));
     }
 
     qreal static inline _cos(qreal x) //super fast _cos
@@ -704,8 +704,8 @@ struct BezierEase : public QEasingCurveFunction
         //We use approximations instead
 
         const qreal x_squared = x * x;
-        const qreal x_plus_one_sqrt = sqrt(1.0 + x);
-        const qreal one_minus_x_sqrt = sqrt(1.0 - x);
+        const qreal x_plus_one_sqrt = qSqrt(1.0 + x);
+        const qreal one_minus_x_sqrt = qSqrt(1.0 - x);
 
         //cos(acos(x) / 3)
         //s1 = _cos(_acos(x) / 3);
@@ -743,7 +743,7 @@ struct BezierEase : public QEasingCurveFunction
         const qreal D = 0.25 * q_squared + p_cubic / 27.0;
 
         if (D >= 0) {
-            const qreal D_sqrt = sqrt(D);
+            const qreal D_sqrt = qSqrt(D);
             qreal u = _cbrt( -q * 0.5 + D_sqrt);
             qreal v = _cbrt( -q * 0.5 - D_sqrt);
             qreal z1 = u + v;
@@ -758,13 +758,13 @@ struct BezierEase : public QEasingCurveFunction
         }
 
         //casus irreducibilis
-        const qreal p_minus_sqrt = sqrt(-p);
+        const qreal p_minus_sqrt = qSqrt(-p);
 
         //const qreal f = sqrt(4.0 / 3.0 * -p);
-        const qreal f = sqrt(4.0 / 3.0) * p_minus_sqrt;
+        const qreal f = qSqrt(4.0 / 3.0) * p_minus_sqrt;
 
         //const qreal sqrtP = sqrt(27.0 / -p_cubic);
-        const qreal sqrtP = -3.0*sqrt(3.0) / (p_minus_sqrt * p);
+        const qreal sqrtP = -3.0*qSqrt(3.0) / (p_minus_sqrt * p);
 
 
         const qreal g = -q * 0.5 * sqrtP;