diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 08:11:10 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-25 08:11:25 (GMT) |
| commit | 1d509901d185745df74f2aae04783e9be9bb7cd0 (patch) | |
| tree | 16df2ab7f33734eb91328d3e6760edd54ce92961 /examples | |
| parent | 890c1110ec5e39bb6e63e99fe09c296c1ea824be (diff) | |
| parent | e5ef6f580e1b601898a2fea095ed5be9823bab25 (diff) | |
| download | Qt-1d509901d185745df74f2aae04783e9be9bb7cd0.zip Qt-1d509901d185745df74f2aae04783e9be9bb7cd0.tar.gz Qt-1d509901d185745df74f2aae04783e9be9bb7cd0.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/corelib/tools/qcryptographichash.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/audiodevices/audiodevices.h | 4 | ||||
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.h | 5 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.h | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h index 3b8f074..4a0f74c 100644 --- a/examples/multimedia/audiodevices/audiodevices.h +++ b/examples/multimedia/audiodevices/audiodevices.h @@ -38,6 +38,8 @@ ** ****************************************************************************/ +#ifndef AUDIODEVICES_H +#define AUDIODEVICES_H #include <QObject> #include <QMainWindow> @@ -77,3 +79,5 @@ private slots: }; +#endif + diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h index 2f4b206..c198304 100644 --- a/examples/multimedia/audioinput/audioinput.h +++ b/examples/multimedia/audioinput/audioinput.h @@ -38,6 +38,9 @@ ** ****************************************************************************/ +#ifndef AUDIOINPUT_H +#define AUDIOINPUT_H + #include <QPixmap> #include <QWidget> #include <QObject> @@ -132,3 +135,5 @@ private: static const QString ResumeLabel; }; +#endif + diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h index 004ca49..2f4aa64 100644 --- a/examples/multimedia/audiooutput/audiooutput.h +++ b/examples/multimedia/audiooutput/audiooutput.h @@ -38,6 +38,9 @@ ** ****************************************************************************/ +#ifndef AUDIOOUTPUT_H +#define AUDIOOUTPUT_H + #include <math.h> #include <QObject> @@ -115,3 +118,5 @@ private slots: void deviceChanged(int index); }; +#endif + |