whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Mac qDebug ifdefs. 

Make qDebug work again with the new logging framework.

Change-Id: Ib88a83182429636b274d6284933d5ea00db7279c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
bb10
Morten Johan Sorvig 2012-02-28 12:37:55 +01:00 committed by Qt by Nokia
parent 3a72a1c7ed
commit 0d68a5aabf
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/kernel/qcore_mac_p.h
View File

@ -57,17 +57,6 @@
# define __IMAGECAPTURE__
#endif
#undef OLD_DEBUG
#ifdef DEBUG
# define OLD_DEBUG DEBUG
# undef DEBUG
#endif
#define DEBUG 0
#ifdef qDebug
# define old_qDebug qDebug
# undef qDebug
#endif
#if defined(QT_BUILD_QMAKE) || defined(QT_BOOTSTRAPPED)
#include <ApplicationServices/ApplicationServices.h>
#else
@ -82,18 +71,6 @@
#include <Foundation/Foundation.h>
#endif
#undef DEBUG
#ifdef OLD_DEBUG
# define DEBUG OLD_DEBUG
# undef OLD_DEBUG
#endif
#ifdef old_qDebug
# undef qDebug
# define qDebug QT_NO_QDEBUG_MACRO
# undef old_qDebug
#endif
#include "qstring.h"
QT_BEGIN_NAMESPACE

11
src/plugins/platforms/cocoa/qmacdefines_mac.h
View File

@ -93,11 +93,6 @@ Yes, it is an informative comment ;-)
#include <QtCore/qglobal.h>
#ifdef qDebug
# define old_qDebug qDebug
# undef qDebug
#endif
#ifdef __LP64__
typedef signed int OSStatus;
#else
@ -149,9 +144,3 @@ typedef AERecord AppleEvent;
#ifdef check
#undef check
#endif
#ifdef old_qDebug
# undef qDebug
# define qDebug QT_NO_QDEBUG_MACRO
# undef old_qDebug
#endif