summaryrefslogtreecommitdiffstats
path: root/src/mof/qpackagemerge.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mof/qpackagemerge.h')
-rw-r--r--src/mof/qpackagemerge.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/mof/qpackagemerge.h b/src/mof/qpackagemerge.h
index 8eba62b0..e3d3cd60 100644
--- a/src/mof/qpackagemerge.h
+++ b/src/mof/qpackagemerge.h
@@ -48,7 +48,10 @@
QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE_QTMOF
+QT_BEGIN_NAMESPACE
+
+namespace QtMof
+{
QT_MODULE(QtMof)
@@ -61,8 +64,8 @@ class Q_MOF_EXPORT QPackageMerge : public QDirectedRelationship
{
Q_OBJECT
- Q_PROPERTY(QPackage * mergedPackage READ mergedPackage WRITE setMergedPackage)
- Q_PROPERTY(QPackage * receivingPackage READ receivingPackage WRITE setReceivingPackage)
+ Q_PROPERTY(QtMof::QPackage * mergedPackage READ mergedPackage WRITE setMergedPackage)
+ Q_PROPERTY(QtMof::QPackage * receivingPackage READ receivingPackage WRITE setReceivingPackage)
Q_DISABLE_COPY(QPackageMerge)
Q_DECLARE_PRIVATE(QPackageMerge)
@@ -83,7 +86,9 @@ protected:
explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
};
-QT_END_NAMESPACE_QTMOF
+}
+
+QT_END_NAMESPACE
QT_END_HEADER