diff options
Diffstat (limited to 'src/corelib/global/qlogging.cpp')
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 9669572ce3..31783ee68b 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -625,7 +625,6 @@ Q_CORE_EXPORT QString qMessageFormatString(QtMsgType type, const QMessageLogCont static QtMsgHandler msgHandler = 0; // pointer to debug handler (without context) static QtMessageHandler messageHandler = 0; // pointer to debug handler (with context) -static QMessageHandler messageHandler2 = 0; // TODO: Remove before Qt5.0 beta /*! \internal @@ -669,12 +668,6 @@ void qt_message_output(QtMsgType msgType, const QMessageLogContext &context, con msgHandler = qDefaultMsgHandler; if (!messageHandler) messageHandler = qDefaultMessageHandler; - if (!messageHandler2) - messageHandler2 = qDefaultMessageHandler2; - - if (messageHandler == qDefaultMessageHandler - && messageHandler2 != qDefaultMessageHandler2) - (*messageHandler2)(msgType, context, message.toLocal8Bit().constData()); // prefer new message handler over the old one if (msgHandler == qDefaultMsgHandler @@ -875,19 +868,6 @@ QtMessageHandler qInstallMessageHandler(QtMessageHandler h) return old; } -QMessageHandler qInstallMessageHandler(QMessageHandler h) -{ - if (!messageHandler2) - messageHandler2 = qDefaultMessageHandler2; - QMessageHandler old = messageHandler2; - messageHandler2 = h; -#if defined(Q_OS_WIN) && defined(QT_BUILD_CORE_LIB) - if (!messageHandler2 && usingWinMain) - messageHandler2 = qWinMessageHandler2; -#endif - return old; -} - QtMsgHandler qInstallMsgHandler(QtMsgHandler h) { //if handler is 0, set it to the |