--- a/src/corelib/global/qglobal.cpp Tue Feb 02 00:43:10 2010 +0200
+++ b/src/corelib/global/qglobal.cpp Fri Apr 16 15:50:13 2010 +0300
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -80,9 +80,9 @@
#include <f32file.h>
#include <e32math.h>
# include "private/qcore_symbian_p.h"
+
_LIT(qt_S60Filter, "Series60v?.*.sis");
_LIT(qt_S60SystemInstallDir, "z:\\system\\install\\");
-
#endif
QT_BEGIN_NAMESPACE
@@ -1227,7 +1227,7 @@
Defined on Mac OS X.
- \sa Q_WS_WIN, Q_WS_X11, Q_WS_QWS
+ \sa Q_WS_WIN, Q_WS_X11, Q_WS_QWS, Q_WS_S60
*/
/*!
@@ -1236,7 +1236,7 @@
Defined on Windows.
- \sa Q_WS_MAC, Q_WS_X11, Q_WS_QWS
+ \sa Q_WS_MAC, Q_WS_X11, Q_WS_QWS, Q_WS_S60
*/
/*!
@@ -1245,7 +1245,7 @@
Defined on X11.
- \sa Q_WS_MAC, Q_WS_WIN, Q_WS_QWS
+ \sa Q_WS_MAC, Q_WS_WIN, Q_WS_QWS, Q_WS_S60
*/
/*!
@@ -1254,7 +1254,7 @@
Defined on Qt for Embedded Linux.
- \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11
+ \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_S60
*/
/*!
@@ -1600,6 +1600,29 @@
Optimizing C++ Compilers.
*/
+/*!
+ \macro Q_OS_MAC
+ \relates <QtGlobal>
+
+ Defined on MAC OS (synonym for Darwin).
+ */
+
+/*!
+ \macro Q_OS_SYMBIAN
+ \relates <QtGlobal>
+
+ Defined on Symbian.
+ */
+
+/*!
+ \macro Q_WS_S60
+ \relates <QtGlobal>
+
+ Defined on S60.
+
+ \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_QWS
+ */
+
#if defined(QT_BUILD_QMAKE)
// needed to bootstrap qmake
static const unsigned int qt_one = 1;
@@ -1972,7 +1995,6 @@
qWarning("In file %s, line %d: Out of memory", n, l);
}
-#ifndef QT_NO_EXCEPTIONS
/* \internal
Allows you to throw an exception without including <new>
Called internally from Q_CHECK_PTR on certain OS combinations
@@ -1981,7 +2003,6 @@
{
QT_THROW(std::bad_alloc());
}
-#endif
/*
The Q_ASSERT macro calls this function when the test fails.
@@ -2190,8 +2211,6 @@
RDebug::Print(format, hbuffer);
}
delete hbuffer;
-//QTP:Prod add logging to the file
-#if defined(QT_WARNING_FILE_OUTPUT)
_LIT( KLogDir, "QT" );
_LIT( KLogFile, "QT.log" );
_LIT( KLogStarting, "Starting: %S");
@@ -2206,7 +2225,6 @@
}
RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-#endif
#else
fprintf(stderr, "%s\n", buf);
fflush(stderr);