summaryrefslogtreecommitdiffstats
path: root/examples/datavisualization
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:33:17 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:33:17 +0200
commit8427634773505f73ce030cf68761c4719eb03e5c (patch)
tree56d0e488e533778782b55c54aa3ab07f0d5e888d /examples/datavisualization
parent3fb7ce6a29ca69237c777cc65a3831768e938782 (diff)
parent364ed207af1becd2b85d93bc87d5db84624b4381 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
Diffstat (limited to 'examples/datavisualization')
-rw-r--r--examples/datavisualization/audiolevels/audiolevels.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/datavisualization/audiolevels/audiolevels.h b/examples/datavisualization/audiolevels/audiolevels.h
index b1845c9a..f9a7d9e5 100644
--- a/examples/datavisualization/audiolevels/audiolevels.h
+++ b/examples/datavisualization/audiolevels/audiolevels.h
@@ -35,7 +35,10 @@
using namespace QtDataVisualization;
class AudioLevelsIODevice;
+
+QT_BEGIN_NAMESPACE
class QAudioInput;
+QT_END_NAMESPACE
class AudioLevels : public QObject
{