diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
| commit | dbafabb019eac6ab21b43279b3a348e4afbd065e (patch) | |
| tree | 24245148e3f0b948df06823d879f9158d1b81d2f /src/corelib/global | |
| parent | 00b96399e6d3bcd7a1081721cafeb15da3ab9781 (diff) | |
| parent | 9de2853a942529f88815ed29375ff4efc44d168c (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 0396fbc0c7..b2f9e29b44 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1060,6 +1060,7 @@ QT_END_NAMESPACE #include <QtCore/qatomic.h> #include <QtCore/qglobalstatic.h> +#include <QtCore/qnumeric.h> #endif /* __cplusplus */ |