slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a few QT_BEGIN/END_HEADER pairs.

Browse Source 
Change-Id: Ie723af34680222b939aeb0179df21d63cec3cf3b
Reviewed-on: http://codereview.qt-project.org/5514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-09-26 17:07:49 +10:00
committed by Qt by Nokia
parent 136adad652
commit a24b8d3a61
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/multimediakit/qmediaenumdebug.h
View File

@@ -55,6 +55,8 @@
#include <QtCore/qmetaobject.h> #include <QtCore/qmetaobject.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
QT_BEGIN_HEADER
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
#define Q_MEDIA_ENUM_DEBUG(Class,Enum) \ #define Q_MEDIA_ENUM_DEBUG(Class,Enum) \
@@ -71,6 +73,7 @@ inline QDebug operator<<(QDebug dbg, Class::Enum value) \
#endif //QT_NO_DEBUG_STREAM #endif //QT_NO_DEBUG_STREAM
QT_END_HEADER
#endif #endif

2
src/multimediakit/qmediaplayer.h
View File

@@ -52,8 +52,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia) QT_MODULE(Multimedia)

5
src/multimediakit/qtmultimediakitdefs.h
View File

@@ -55,6 +55,8 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
QT_BEGIN_HEADER
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# if defined(QT_NODLL) # if defined(QT_NODLL)
# undef QT_MAKEDLL # undef QT_MAKEDLL
@@ -81,5 +83,8 @@
# endif # endif
#endif #endif
QT_END_HEADER
#endif // QMULTIMEDIAKIT_P_H #endif // QMULTIMEDIAKIT_P_H

4
src/multimediakitwidgets/qtmultimediakitwidgetdefs.h
View File

@@ -55,6 +55,8 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
QT_BEGIN_HEADER
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# if defined(QT_NODLL) # if defined(QT_NODLL)
# undef QT_MAKEDLL # undef QT_MAKEDLL
@@ -81,5 +83,7 @@
# endif # endif
#endif #endif
QT_END_HEADER
#endif // QMULTIMEDIAKITWIDGETS_P_H #endif // QMULTIMEDIAKITWIDGETS_P_H