summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-05 16:12:31 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2009-11-05 16:12:31 (GMT)
commit149e986ce129ccc656942d79fb1c9687dbe7958c (patch)
tree106a8e3d17cf9f3d1a8bc40ca076e4c5fad11b2f
parenteda773316824cbb1aa7bdba402e568340b79b4f3 (diff)
downloadQt-149e986ce129ccc656942d79fb1c9687dbe7958c.zip
Qt-149e986ce129ccc656942d79fb1c9687dbe7958c.tar.gz
Qt-149e986ce129ccc656942d79fb1c9687dbe7958c.tar.bz2
Removed logging from Phonon MMF backend
This statement calls a function (RWindowBase::ClientHandle) which was introduced in S60 3.2. Although there is a runtime check, a build made against 3.2 or above will fail on a 3.1 device. This manifests itself by the plugin failing to load. The log statement is not really necessary anyway, because, for window-owning controls, the window handle is the same value as the CCoeControl* pointer. This means that logging RWindowBase::ClientHandle is redundant information. Task-number: QTBUG-5406 Reviewed-by: trustme
-rw-r--r--src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
index 03220a7..f836109 100644
--- a/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
+++ b/src/3rdparty/phonon/mmf/mmfphonondebug/objectdump_symbian.cpp
@@ -108,14 +108,6 @@ QList<QByteArray> QAnnotatorWindow::annotation(const QObject& object)
stream << "window: ";
- // ClientHandle() is available first in 5.0.
-#if !defined(__SERIES60_31__) && !defined(__S60_32__)
- if (QSysInfo::s60Version() > QSysInfo::SV_S60_3_2)
- // Client-side window handle
- // Cast to a void pointer so that log output is in hexadecimal format.
- stream << "cli " << reinterpret_cast<const void*>(window->ClientHandle()) << ' ';
-#endif
-
// Server-side address of CWsWindow object
// This is useful for correlation with the window tree dumped by the window
// server (see RWsSession::LogCommand).