summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/arch/symbian/qt_heapsetup_symbian.cpp8
-rw-r--r--src/corelib/arch/symbian/qt_hybridheap_symbian_p.h2
2 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp b/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp
index b8193f1..d6b7351 100644
--- a/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp
+++ b/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp
@@ -88,14 +88,6 @@ void Panic(TCdtPanic reason)
User::Panic(KCat, reason);
}
-// disabling the BTrace components of heap checking macros
-#ifndef ENABLE_BTRACE
-int noBTrace()
-{
- return 0;
-}
-#endif
-
#else /* QT_USE_NEW_SYMBIAN_ALLOCATOR */
#include <e32std.h>
diff --git a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h
index a59f29e..5827aca 100644
--- a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h
+++ b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h
@@ -96,7 +96,7 @@
// disabling the BTrace components of heap checking macros
#ifndef ENABLE_BTRACE
-extern int noBTrace();
+inline int noBTrace() {return 0;}
#define BTraceContext12(a,b,c,d,e) noBTrace()
#endif