23 files changed, 84 insertions, 82 deletions

diff --git a/examples/datavisualization/audiolevels/audiolevels.cpp b/examples/datavisualization/audiolevels/audiolevels.cpp
index 18c1342a..81059460 100644
--- a/examples/datavisualization/audiolevels/audiolevels.cpp
+++ b/examples/datavisualization/audiolevels/audiolevels.cpp
@@ -26,8 +26,8 @@
 #include <QtDataVisualization/qbar3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
 
-#include <QAudioDeviceInfo>
-#include <QAudioInput>
+#include <QtMultimedia/QAudioDeviceInfo>
+#include <QtMultimedia/QAudioInput>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp
index c0cd70e3..27ddce4f 100644
--- a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp
+++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "audiolevelsiodevice.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.h b/examples/datavisualization/audiolevels/audiolevelsiodevice.h
index 45f17626..7510db35 100644
--- a/examples/datavisualization/audiolevels/audiolevelsiodevice.h
+++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.h
@@ -20,7 +20,7 @@
 #define AUDIOLEVELSIODEVICE_H
 
 #include <QtDataVisualization/qbardataproxy.h>
-#include <QIODevice>
+#include <QtCore/QIODevice>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/audiolevels/main.cpp b/examples/datavisualization/audiolevels/main.cpp
index 9dd07b1b..4f9c01cb 100644
--- a/examples/datavisualization/audiolevels/main.cpp
+++ b/examples/datavisualization/audiolevels/main.cpp
@@ -18,8 +18,8 @@
 
 #include "audiolevels.h"
 
-#include <QGuiApplication>
-#include <QAudio>
+#include <QtGui/QGuiApplication>
+#include <QtMultimedia/QAudio>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp
index 55f52580..5df4066c 100644
--- a/examples/datavisualization/bars/graphmodifier.cpp
+++ b/examples/datavisualization/bars/graphmodifier.cpp
@@ -24,8 +24,8 @@
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
-#include <QTime>
-#include <QComboBox>
+#include <QtCore/QTime>
+#include <QtWidgets/QComboBox>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h
index 674c3262..cac002a1 100644
--- a/examples/datavisualization/bars/graphmodifier.h
+++ b/examples/datavisualization/bars/graphmodifier.h
@@ -23,10 +23,10 @@
 #include <QtDataVisualization/qbardataproxy.h>
 #include <QtDataVisualization/qabstract3dseries.h>
 
-#include <QFont>
-#include <QDebug>
-#include <QStringList>
-#include <QPointer>
+#include <QtGui/QFont>
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
+#include <QtCore/QPointer>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/bars/main.cpp b/examples/datavisualization/bars/main.cpp
index f04e501d..e6461202 100644
--- a/examples/datavisualization/bars/main.cpp
+++ b/examples/datavisualization/bars/main.cpp
@@ -18,17 +18,17 @@
 
 #include "graphmodifier.h"
 
-#include <QApplication>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QSlider>
-#include <QFontComboBox>
-#include <QLabel>
-#include <QScreen>
-#include <QFontDatabase>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QLabel>
+#include <QtGui/QScreen>
+#include <QtGui/QFontDatabase>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/datavisualization/custominput/main.cpp b/examples/datavisualization/custominput/main.cpp
index 069a5b0a..5dd31499 100644
--- a/examples/datavisualization/custominput/main.cpp
+++ b/examples/datavisualization/custominput/main.cpp
@@ -18,17 +18,17 @@
 
 #include "scatterdatamodifier.h"
 
-#include <QApplication>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFontComboBox>
-#include <QLabel>
-#include <QScreen>
-#include <QFontDatabase>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QLabel>
+#include <QtGui/QScreen>
+#include <QtGui/QFontDatabase>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/datavisualization/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp
index a2a5bea9..2b812ba1 100644
--- a/examples/datavisualization/custominput/scatterdatamodifier.cpp
+++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp
@@ -24,7 +24,9 @@
 #include <QtDataVisualization/Q3DCamera>
 #include <QtDataVisualization/QScatter3DSeries>
 #include <QtDataVisualization/Q3DTheme>
-#include <qmath.h>
+#include <QtCore/qmath.h>
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/custominput/scatterdatamodifier.h b/examples/datavisualization/custominput/scatterdatamodifier.h
index 9ea6a5c8..8b185711 100644
--- a/examples/datavisualization/custominput/scatterdatamodifier.h
+++ b/examples/datavisualization/custominput/scatterdatamodifier.h
@@ -24,9 +24,9 @@
 #include <QtDataVisualization/q3dscatter.h>
 #include <QtGui/QFont>
 #include <QtCore/QTimer>
-#include <QPropertyAnimation>
-#include <QSequentialAnimationGroup>
-#include <QVector3D>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QSequentialAnimationGroup>
+#include <QtGui/QVector3D>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/customproxy/main.cpp b/examples/datavisualization/customproxy/main.cpp
index dd74721e..4ec67f4b 100644
--- a/examples/datavisualization/customproxy/main.cpp
+++ b/examples/datavisualization/customproxy/main.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "rainfallgraph.h"
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/customproxy/rainfallgraph.cpp b/examples/datavisualization/customproxy/rainfallgraph.cpp
index e2f04923..024fc2a1 100644
--- a/examples/datavisualization/customproxy/rainfallgraph.cpp
+++ b/examples/datavisualization/customproxy/rainfallgraph.cpp
@@ -23,11 +23,11 @@
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qbar3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
-#include <QGuiApplication>
-#include <QFont>
-#include <QDebug>
-#include <QTextStream>
-#include <QFile>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QFont>
+#include <QtCore/QDebug>
+#include <QtCore/QTextStream>
+#include <QtCore/QFile>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/customproxy/variantbardatamapping.h b/examples/datavisualization/customproxy/variantbardatamapping.h
index 3a145d9a..2f6a0ca1 100644
--- a/examples/datavisualization/customproxy/variantbardatamapping.h
+++ b/examples/datavisualization/customproxy/variantbardatamapping.h
@@ -19,7 +19,7 @@
 #ifndef VARIANTBARDATAMAPPING_H
 #define VARIANTBARDATAMAPPING_H
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 class VariantBarDataMapping : public QObject
 {
diff --git a/examples/datavisualization/customproxy/variantbardataproxy.h b/examples/datavisualization/customproxy/variantbardataproxy.h
index b83f8a71..41aeaa3f 100644
--- a/examples/datavisualization/customproxy/variantbardataproxy.h
+++ b/examples/datavisualization/customproxy/variantbardataproxy.h
@@ -22,9 +22,9 @@
 #include "qbardataproxy.h"
 #include "variantdataset.h"
 #include "variantbardatamapping.h"
-#include <QStringList>
-#include <QMap>
-#include <QPointer>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QPointer>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/customproxy/variantdataset.h b/examples/datavisualization/customproxy/variantdataset.h
index f5eb5863..6a131d1a 100644
--- a/examples/datavisualization/customproxy/variantdataset.h
+++ b/examples/datavisualization/customproxy/variantdataset.h
@@ -19,8 +19,8 @@
 #ifndef VARIANTDATASET_H
 #define VARIANTDATASET_H
 
-#include <QScopedPointer>
-#include <QVariantList>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QVariantList>
 
 //! [1]
 typedef QVariantList VariantDataItem;
diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp
index 2fce72aa..ad9f0112 100644
--- a/examples/datavisualization/itemmodel/main.cpp
+++ b/examples/datavisualization/itemmodel/main.cpp
@@ -25,14 +25,14 @@
 #include <QtDataVisualization/qbar3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
 
-#include <QApplication>
-#include <QVBoxLayout>
-#include <QTableWidget>
-#include <QScreen>
-#include <QTimer>
-#include <QFont>
-#include <QDebug>
-#include <QHeaderView>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QTableWidget>
+#include <QtGui/QScreen>
+#include <QtCore/QTimer>
+#include <QtGui/QFont>
+#include <QtCore/QDebug>
+#include <QtWidgets/QHeaderView>
 
 #define USE_STATIC_DATA
 
diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp
index 8b10bcc7..01d7e73d 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.cpp
+++ b/examples/datavisualization/qmloscilloscope/datasource.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include "datasource.h"
-#include <qmath.h>
+#include <QtCore/qmath.h>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h
index a467b86f..ef2f7acb 100644
--- a/examples/datavisualization/qmloscilloscope/datasource.h
+++ b/examples/datavisualization/qmloscilloscope/datasource.h
@@ -21,7 +21,6 @@
 
 #include <QtDataVisualization/QSurface3DSeries>
 #include <QtDataVisualization/QValue3DAxis>
-#include <QObject>
 
 class QQuickView;
 
diff --git a/examples/datavisualization/rotations/main.cpp b/examples/datavisualization/rotations/main.cpp
index 3ddb7b55..7f477c92 100644
--- a/examples/datavisualization/rotations/main.cpp
+++ b/examples/datavisualization/rotations/main.cpp
@@ -18,14 +18,14 @@
 
 #include "scatterdatamodifier.h"
 
-#include <QApplication>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QScreen>
-#include <QSlider>
-#include <QLabel>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QLabel>
+#include <QtGui/QScreen>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/datavisualization/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp
index d916ffbd..90af63ab 100644
--- a/examples/datavisualization/rotations/scatterdatamodifier.cpp
+++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp
@@ -23,7 +23,7 @@
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qscatter3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
-#include <qmath.h>
+#include <QtCore/qmath.h>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/scatter/main.cpp b/examples/datavisualization/scatter/main.cpp
index d1dad77d..21530b82 100644
--- a/examples/datavisualization/scatter/main.cpp
+++ b/examples/datavisualization/scatter/main.cpp
@@ -18,17 +18,17 @@
 
 #include "scatterdatamodifier.h"
 
-#include <QApplication>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFontComboBox>
-#include <QLabel>
-#include <QScreen>
-#include <QFontDatabase>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QLabel>
+#include <QtGui/QScreen>
+#include <QtGui/QFontDatabase>
 
 int main(int argc, char **argv)
 {
diff --git a/examples/datavisualization/scatter/scatterdatamodifier.cpp b/examples/datavisualization/scatter/scatterdatamodifier.cpp
index fcba54be..b38c043e 100644
--- a/examples/datavisualization/scatter/scatterdatamodifier.cpp
+++ b/examples/datavisualization/scatter/scatterdatamodifier.cpp
@@ -23,8 +23,8 @@
 #include <QtDataVisualization/q3dcamera.h>
 #include <QtDataVisualization/qscatter3dseries.h>
 #include <QtDataVisualization/q3dtheme.h>
-#include <qmath.h>
-#include <QComboBox>
+#include <QtCore/qmath.h>
+#include <QtWidgets/QComboBox>
 
 using namespace QtDataVisualization;
 
diff --git a/examples/datavisualization/surface/main.cpp b/examples/datavisualization/surface/main.cpp
index 4e82eca8..4db614e6 100644
--- a/examples/datavisualization/surface/main.cpp
+++ b/examples/datavisualization/surface/main.cpp
@@ -29,6 +29,7 @@
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QLabel>
 #include <QtGui/QPainter>
+#include <QtGui/QScreen>
 
 int main(int argc, char **argv)
 {