aboutsummaryrefslogtreecommitdiffstats
path: root/src/labs/sharedimage
diff options
context:
space:
mode:
Diffstat (limited to 'src/labs/sharedimage')
-rw-r--r--src/labs/sharedimage/doc/src/qsharedimage.qdoc2
-rw-r--r--src/labs/sharedimage/qsharedimageloader.cpp2
-rw-r--r--src/labs/sharedimage/qsharedimageprovider.cpp5
-rw-r--r--src/labs/sharedimage/qsharedimageprovider_p.h5
4 files changed, 13 insertions, 1 deletions
diff --git a/src/labs/sharedimage/doc/src/qsharedimage.qdoc b/src/labs/sharedimage/doc/src/qsharedimage.qdoc
index 119f49bf91..bb3cafebfe 100644
--- a/src/labs/sharedimage/doc/src/qsharedimage.qdoc
+++ b/src/labs/sharedimage/doc/src/qsharedimage.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \qmlmodule Qt.labs.sharedimage 1
+ \qmlmodule Qt.labs.sharedimage
\title Qt Quick Shared Image Provider
\ingroup qmlmodules
\brief Adds an image provider which utilizes shared CPU memory
diff --git a/src/labs/sharedimage/qsharedimageloader.cpp b/src/labs/sharedimage/qsharedimageloader.cpp
index c9e3ef3eb3..c37c4b890e 100644
--- a/src/labs/sharedimage/qsharedimageloader.cpp
+++ b/src/labs/sharedimage/qsharedimageloader.cpp
@@ -264,3 +264,5 @@ QString QSharedImageLoader::key(const QString &path, ImageParameters *params)
QT_END_NAMESPACE
+
+#include "moc_qsharedimageloader_p.cpp"
diff --git a/src/labs/sharedimage/qsharedimageprovider.cpp b/src/labs/sharedimage/qsharedimageprovider.cpp
index 74822a4e87..402bebfd71 100644
--- a/src/labs/sharedimage/qsharedimageprovider.cpp
+++ b/src/labs/sharedimage/qsharedimageprovider.cpp
@@ -46,6 +46,7 @@
Q_DECLARE_METATYPE(QQuickImageProviderOptions)
+QT_BEGIN_NAMESPACE
QuickSharedImageLoader::QuickSharedImageLoader(QObject *parent) : QSharedImageLoader(parent) {}
@@ -137,3 +138,7 @@ QImage SharedImageProvider::requestImage(const QString &id, QSize *size, const Q
return img;
}
+
+QT_END_NAMESPACE
+
+#include "moc_qsharedimageprovider_p.cpp"
diff --git a/src/labs/sharedimage/qsharedimageprovider_p.h b/src/labs/sharedimage/qsharedimageprovider_p.h
index f8bea9e784..d590372bf4 100644
--- a/src/labs/sharedimage/qsharedimageprovider_p.h
+++ b/src/labs/sharedimage/qsharedimageprovider_p.h
@@ -59,6 +59,8 @@
#include "qsharedimageloader_p.h"
+QT_BEGIN_NAMESPACE
+
class SharedImageProvider;
class QuickSharedImageLoader : public QSharedImageLoader
@@ -90,4 +92,7 @@ public:
protected:
QScopedPointer<QuickSharedImageLoader> loader;
};
+
+QT_END_NAMESPACE
+
#endif // QSHAREDIMAGEPROVIDER_H