summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2009-12-03 14:25:06 (GMT)
committerck <qt-info@nokia.com>2009-12-03 14:25:06 (GMT)
commit02c1e3324ad11ab7a1f1c601ab3ffdd18f1dc5f6 (patch)
tree49613b3d47d439921d558e59d49cd709329d432e /tools
parent6aee4cbee38e007fb8141de7d577aa73e5734ef5 (diff)
downloadQt-02c1e3324ad11ab7a1f1c601ab3ffdd18f1dc5f6.zip
Qt-02c1e3324ad11ab7a1f1c601ab3ffdd18f1dc5f6.tar.gz
Qt-02c1e3324ad11ab7a1f1c601ab3ffdd18f1dc5f6.tar.bz2
Assistant: Compile fix for namespaced Qt.
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/tools/assistant/xbelsupport.cpp4
-rw-r--r--tools/assistant/tools/assistant/xbelsupport.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/assistant/tools/assistant/xbelsupport.cpp b/tools/assistant/tools/assistant/xbelsupport.cpp
index 545be6c..3c545ac 100644
--- a/tools/assistant/tools/assistant/xbelsupport.cpp
+++ b/tools/assistant/tools/assistant/xbelsupport.cpp
@@ -44,6 +44,8 @@
#include <QtCore/QCoreApplication>
+QT_BEGIN_NAMESPACE
+
struct Bookmark {
QString title;
QString url;
@@ -232,3 +234,5 @@ QStandardItem *XbelReader::createChildItem(QStandardItem *item)
return childItem;
}
+
+QT_END_NAMESPACE
diff --git a/tools/assistant/tools/assistant/xbelsupport.h b/tools/assistant/tools/assistant/xbelsupport.h
index 177b04b..f3bf102 100644
--- a/tools/assistant/tools/assistant/xbelsupport.h
+++ b/tools/assistant/tools/assistant/xbelsupport.h
@@ -48,6 +48,8 @@
QT_FORWARD_DECLARE_CLASS(QIODevice)
QT_FORWARD_DECLARE_CLASS(QStandardItem)
+QT_BEGIN_NAMESPACE
+
class BookmarkModel;
class XbelWriter : public QXmlStreamWriter
@@ -84,4 +86,6 @@ private:
BookmarkModel *listModel;
};
+QT_END_NAMESPACE
+
#endif // XBELSUPPORT_H