diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-06-06 11:16:22 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-06-06 11:38:10 (GMT) |
| commit | aad99f4fae89796f7013901344260eb50e4126bb (patch) | |
| tree | df540aa2c07952a78d93c1687e2fb65635d2958e /src/corelib | |
| parent | a825b3a9e6132842090e43fae85d2c6c61b2def6 (diff) | |
| download | Qt-aad99f4fae89796f7013901344260eb50e4126bb.zip Qt-aad99f4fae89796f7013901344260eb50e4126bb.tar.gz Qt-aad99f4fae89796f7013901344260eb50e4126bb.tar.bz2 | |
Build fix for Mac OS 10.5
The build breaks because QString defines a template function
that interferes with a system header. The easy fix is to just
make sure we include the system headers before any Qt headers.
This fix turned out to already be in for Qt5, but that change
contained other stuff as well, and were not suited for
cherry-picking.
Rev-By: msorvig
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 5c4085a..a72ad02 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -48,6 +48,11 @@ static QSystemLocale *QSystemLocale_globalSystemLocale(); QT_END_NAMESPACE #endif +#if !defined(QWS) && defined(Q_OS_MAC) +# include "private/qcore_mac_p.h" +# include <CoreFoundation/CoreFoundation.h> +#endif + #include "qplatformdefs.h" #include "qdatastream.h" @@ -65,10 +70,6 @@ QT_END_NAMESPACE # include "qt_windows.h" # include <time.h> #endif -#if !defined(QWS) && defined(Q_OS_MAC) -# include "private/qcore_mac_p.h" -# include <CoreFoundation/CoreFoundation.h> -#endif #include "private/qnumeric_p.h" #include "private/qsystemlibrary_p.h" |