diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 09:01:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 09:01:01 (GMT) |
| commit | 6165ab0203fa80d31f3488ead7e7f7c088c8668c (patch) | |
| tree | f860c58e85bf4ef5115535728319acb272326b09 /examples | |
| parent | d80c2837a41903f66159617fbd0b8b69e4a8da75 (diff) | |
| parent | 11d9e81b3b1a7f3463edb98fa2303a44f8499462 (diff) | |
| download | Qt-6165ab0203fa80d31f3488ead7e7f7c088c8668c.zip Qt-6165ab0203fa80d31f3488ead7e7f7c088c8668c.tar.gz Qt-6165ab0203fa80d31f3488ead7e7f7c088c8668c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant: Add missing license header.
Compile fixes.
S60 style: Compile fix.
A few trivial optimizations
Rewrote bookmark handling, the previous code was just plain awful.
Small style cleanup.
Fix some warnings.
Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
Designer: Support the 'windowOpacity'-property for forms.
Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
Assistant: Treat "unfiltered" filter in a apecial way.
Assistant: Give meaningful context to translations.
Fixed handling of paths containing ".." in QFileSystemModel on Windows.
QAbstractItemModel docs: Fix typo.
Assistant: Eliminate private tr contexts.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/dbus/dbus-chat/chat_adaptor.h | 3 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/car_adaptor.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/examples/dbus/dbus-chat/chat_adaptor.h b/examples/dbus/dbus-chat/chat_adaptor.h index 831c4f5..47b7f8f 100644 --- a/examples/dbus/dbus-chat/chat_adaptor.h +++ b/examples/dbus/dbus-chat/chat_adaptor.h @@ -54,12 +54,15 @@ #include <QtCore/QObject> #include <QtDBus/QtDBus> + +QT_BEGIN_NAMESPACE class QByteArray; template<class T> class QList; template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; +QT_END_NAMESPACE /* * Adaptor class for interface com.trolltech.chat diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor.h b/examples/dbus/remotecontrolledcar/car/car_adaptor.h index d109883..d16972e 100644 --- a/examples/dbus/remotecontrolledcar/car/car_adaptor.h +++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.h @@ -54,12 +54,15 @@ #include <QtCore/QObject> #include <QtDBus/QtDBus> + +QT_BEGIN_NAMESPACE class QByteArray; template<class T> class QList; template<class Key, class Value> class QMap; class QString; class QStringList; class QVariant; +QT_END_NAMESPACE /* * Adaptor class for interface com.trolltech.Examples.CarInterface |