summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2015-07-28 23:07:19 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-07-30 11:46:12 +0000
commite92d654f376847fe14b8ebd8af65ce8fee8213d6 (patch)
treebb0127057d2fc1a8226d202778ce3ebe9066134c
parent1188dc7b9688ddc41ec77321497e36f6cd216e89 (diff)
Fix publishsubscribe module includes
Change-Id: Ie1a68c40235d8f2fa450831ffe406f19165b108c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--src/publishsubscribe/qpublishsubscribeglobal.h3
-rw-r--r--src/publishsubscribe/qvaluespace.h2
-rw-r--r--src/publishsubscribe/qvaluespacepublisher.h2
-rw-r--r--src/publishsubscribe/qvaluespacesubscriber.h2
4 files changed, 5 insertions, 4 deletions
diff --git a/src/publishsubscribe/qpublishsubscribeglobal.h b/src/publishsubscribe/qpublishsubscribeglobal.h
index d5b46d9e..07422a25 100644
--- a/src/publishsubscribe/qpublishsubscribeglobal.h
+++ b/src/publishsubscribe/qpublishsubscribeglobal.h
@@ -47,6 +47,7 @@
#include <QtCore/qglobal.h>
+QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
# if defined(QT_BUILD_PUBLISHSUBSCRIBE_LIB)
# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT
@@ -56,6 +57,6 @@
#else
# define Q_PUBLISHSUBSCRIBE_EXPORT
#endif
-
+QT_END_NAMESPACE
#endif // QPUBLISHSUBSCRIBEGLOBAL_H
diff --git a/src/publishsubscribe/qvaluespace.h b/src/publishsubscribe/qvaluespace.h
index 35b7a034..0050b708 100644
--- a/src/publishsubscribe/qvaluespace.h
+++ b/src/publishsubscribe/qvaluespace.h
@@ -34,7 +34,7 @@
#ifndef QVALUESPACE_H
#define QVALUESPACE_H
-#include <qpublishsubscribeglobal.h>
+#include <QtPublishSubscribe/qpublishsubscribeglobal.h>
#include <QtCore/qlist.h>
#include <QtCore/quuid.h>
diff --git a/src/publishsubscribe/qvaluespacepublisher.h b/src/publishsubscribe/qvaluespacepublisher.h
index da8738f0..8e5d5798 100644
--- a/src/publishsubscribe/qvaluespacepublisher.h
+++ b/src/publishsubscribe/qvaluespacepublisher.h
@@ -34,7 +34,7 @@
#ifndef QVALUESPACEPUBLISHER_H
#define QVALUESPACEPUBLISHER_H
-#include <qvaluespace.h>
+#include <QtPublishSubscribe/qvaluespace.h>
#include <QtCore/qobject.h>
#include <QtCore/qstring.h>
diff --git a/src/publishsubscribe/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h
index 2745ff30..50837502 100644
--- a/src/publishsubscribe/qvaluespacesubscriber.h
+++ b/src/publishsubscribe/qvaluespacesubscriber.h
@@ -34,7 +34,7 @@
#ifndef QVALUESPACESUBSCRIBER_H
#define QVALUESPACESUBSCRIBER_H
-#include <qvaluespace.h>
+#include <QtPublishSubscribe/qvaluespace.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qvariant.h>