diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /src/plugins/platforms/xcb/qxcbwmsupport.cpp | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwmsupport.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwmsupport.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwmsupport.cpp b/src/plugins/platforms/xcb/qxcbwmsupport.cpp index 114049f911..c9f4ca69dd 100644 --- a/src/plugins/platforms/xcb/qxcbwmsupport.cpp +++ b/src/plugins/platforms/xcb/qxcbwmsupport.cpp @@ -89,11 +89,6 @@ void QXcbWMSupport::updateNetWMAtoms() free(reply); } while (remaining > 0); - -// qDebug() << "======== updateNetWMAtoms"; -// for (int i = 0; i < net_wm_atoms.size(); ++i) -// qDebug() << atomName(net_wm_atoms.at(i)); -// qDebug() << "======== updateNetWMAtoms"; } // update the virtual roots array @@ -130,10 +125,12 @@ void QXcbWMSupport::updateVirtualRoots() free(reply); } while (remaining > 0); +#ifdef Q_XCB_DEBUG qDebug() << "======== updateVirtualRoots"; for (int i = 0; i < net_virtual_roots.size(); ++i) qDebug() << connection()->atomName(net_virtual_roots.at(i)); qDebug() << "======== updateVirtualRoots"; +#endif } QT_END_NAMESPACE |