Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Add header guards to audio example headers.

Author: Qt Continuous Integration System

examples/multimedia/audiodevices/audiodevices.h

@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#ifndef AUDIODEVICES_H
+#define AUDIODEVICES_H
 
 #include <QObject>
 #include <QMainWindow>
@@ -78,3 +80,5 @@ private slots:
 
 };
 
+#endif
+

examples/multimedia/audioinput/audioinput.h

@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#ifndef AUDIOINPUT_H
+#define AUDIOINPUT_H
+
 #include <QPixmap>
 #include <QWidget>
 #include <QObject>
@@ -133,3 +136,5 @@ private slots:
     static const QString ResumeLabel;
 };
 
+#endif
+

examples/multimedia/audiooutput/audiooutput.h

@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#ifndef AUDIOOUTPUT_H
+#define AUDIOOUTPUT_H
+
 #include <math.h>
 
 #include <QObject>
@@ -116,3 +119,5 @@ private slots:
     void deviceChanged(int index);
 };
 
+#endif
+