diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index ac5d6c4a8e..3d3bc55d71 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -51,7 +51,7 @@ #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) #include <qt_windows.h> #endif -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN #include <locale.h> #endif @@ -2519,7 +2519,7 @@ QString QDateTime::toString(Qt::DateFormat f) const } #ifndef QT_NO_TEXTDATE else if (f == Qt::TextDate) { -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN buf = d->date.shortDayName(d->date.dayOfWeek()); buf += QLatin1Char(' '); buf += d->date.shortMonthName(d->date.month()); diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 36c4ae75a5..d2bb752c6d 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -39,6 +39,11 @@ ** ****************************************************************************/ +#if !defined(QWS) && defined(Q_OS_MAC) +# include "private/qcore_mac_p.h" +# include <CoreFoundation/CoreFoundation.h> +#endif + #include "qglobal.h" #ifndef QT_NO_SYSTEMLOCALE @@ -61,14 +66,10 @@ QT_END_NAMESPACE #include "qstringlist.h" #include "qvariant.h" #include "qstringbuilder.h" -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) # 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" |