diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 17:42:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 17:42:33 +0100 |
| commit | 733ace5a7ad5b9e9f93ac87667d7d37fa5f894d5 (patch) | |
| tree | a88031a8e1ac30986567070728e29ed1366d0962 /src/corelib/global/qglobal.cpp | |
| parent | eaff48d3622bbb0e18e79f79aac6d1ac1b7e2760 (diff) | |
| parent | 835b8213905b315645bc60ff5f2ab99340d075a2 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
configure
mkspecs/macx-ios-clang/features/default_post.prf
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index a648949d26..6644d6d101 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -556,10 +556,8 @@ Q_STATIC_ASSERT_X(UCHAR_MAX == 255, "Qt assumes that char is 8 bits"); \typedef qreal \relates <QtGlobal> - Typedef for \c double on all platforms except for those using CPUs with - ARM architectures. - On ARM-based platforms, \c qreal is a typedef for \c float for performance - reasons. + Typedef for \c double unless Qt is configured with the + \c{-qreal float} option. */ /*! \typedef uchar |