diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-20 14:09:29 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-20 14:09:29 (GMT) |
| commit | 7871ebfc4d2adf2313c7431c9d6fa221a903b81d (patch) | |
| tree | a7574187277d5615e26ab4a9f4b1b27b8b6e5422 /src/3rdparty/phonon/mmf/objecttree.cpp | |
| parent | 4fbf19955d5c018d8f12611d39348b48be3ff006 (diff) | |
| parent | 991a5ed5a8dc0c81d56c88823bd69d986618d4e5 (diff) | |
| download | Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.zip Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.gz Qt-7871ebfc4d2adf2313c7431c9d6fa221a903b81d.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/objecttree.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/objecttree.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/mmf/objecttree.cpp b/src/3rdparty/phonon/mmf/objecttree.cpp index 750db22..06b0ced 100644 --- a/src/3rdparty/phonon/mmf/objecttree.cpp +++ b/src/3rdparty/phonon/mmf/objecttree.cpp @@ -16,8 +16,6 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef QT_NO_DEBUG - #include <QTextStream> #include <QWidget> #include "objecttree.h" @@ -100,5 +98,3 @@ AncestorConstIterator::AncestorConstIterator(const QObject& leaf) QT_END_NAMESPACE -#endif - |