diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 11:24:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-10 11:24:58 (GMT) |
| commit | 3769a716e1e472bb1ab00d5f67268f001ab8645e (patch) | |
| tree | 3432ed53363f9b111d415c1dbd11b4e58783e7f9 /src/dbus/qdbusxmlparser.cpp | |
| parent | ac27c8ad39a9646a9e509ba7a58f75eeae10bb6e (diff) | |
| parent | cda5742493b48c53ae2255a01759a72026d2aeaf (diff) | |
| download | Qt-3769a716e1e472bb1ab00d5f67268f001ab8645e.zip Qt-3769a716e1e472bb1ab00d5f67268f001ab8645e.tar.gz Qt-3769a716e1e472bb1ab00d5f67268f001ab8645e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits)
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
QtHelp: Fix auto tests.
Fix a crash when unloading libQtCore
Introduce a qconfig feature for QtDBus
Fix build after MR 543 merged.
Compile on 10.4.
revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"
Remove expected failures after JavaScriptCore bug fix
...
Diffstat (limited to 'src/dbus/qdbusxmlparser.cpp')
| -rw-r--r-- | src/dbus/qdbusxmlparser.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp index ac8109f..05e2b11d 100644 --- a/src/dbus/qdbusxmlparser.cpp +++ b/src/dbus/qdbusxmlparser.cpp @@ -50,6 +50,8 @@ #include <QtCore/qvariant.h> #include <QtCore/qtextstream.h> +#ifndef QT_NO_DBUS + QT_BEGIN_NAMESPACE static QDBusIntrospection::Annotations @@ -367,3 +369,5 @@ QDBusXmlParser::objectTree() const } QT_END_NAMESPACE + +#endif // QT_NO_DBUS |