[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/komo/kdelibs/kdecore/io
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2010-12-20 17:39:26
Message-ID: 20101220173926.4A996AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208107 by aheinecke:

Do not respect disabled debug output settings for Windows CE
since we need release build optimizations but still need
debug output. Debug modes are also ignored for now.


 M  +9 -0      kdebug.cpp  
 M  +6 -1      kdebug.h  


--- branches/work/komo/kdelibs/kdecore/io/kdebug.cpp #1208106:1208107
@@ -44,10 +44,13 @@
 #include <stdio.h>
 #endif
 
+#ifndef Q_OS_WINCE
+// Do not respect disabled debug output on Windows CE
 #ifdef NDEBUG
 #undef kDebug
 #undef kBacktrace
 #endif
+#endif
 
 #include <config.h>
 
@@ -617,6 +620,12 @@
         bool colored=false;
 
         QDebug s(&devnull);
+#ifdef Q_OS_WINCE
+        // Debug areas and modes are not resolved correctly on Windows CE
+        // until this can be fixed just print everything.
+        s = qDebug();
+        return printHeader(s, areaName, debugFile, line, funcinfo, type, colored);
+#endif
         switch (mode) {
         case FileOutput:
             s = setupFileWriter(file);
--- branches/work/komo/kdelibs/kdecore/io/kdebug.h #1208106:1208107
@@ -35,7 +35,9 @@
  * messages are not printed by default but can still be enabled by runtime
  * configuration, e.g. via kdebugdialog or by editing kdebugrc.
  */
-
+#ifdef Q_OS_WINCE
+// Since on Windows CE the only way to test is with release builds
+// we ignore the release compile options for Debug output
 #if !defined(KDE_NO_DEBUG_OUTPUT)
 # if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
 #  define KDE_NO_DEBUG_OUTPUT
@@ -53,6 +55,9 @@
 #else
 # define KDE_DEBUG_ENABLED_BY_DEFAULT true
 #endif
+#else
+# define KDE_DEBUG_ENABLED_BY_DEFAULT true
+#endif
 
 /**
  * An indicator of where you are in a source file, to be used in
[prev in list] [next in list] [prev in thread] [next in thread]