diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:21:30 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:22:03 +0100 |
| commit | 914530faf25767a9a5ae7b35423661c4438a356e (patch) | |
| tree | cf39ce5f445c9503d55209e915343efd7716c0f8 /src/assistant/help/qhelp_global.h | |
| parent | f212e46fe930ee89a8cb52beeeccc03369c015a1 (diff) | |
| parent | 8b725e3f41e244c9f3d65a701c7242369fd88e11 (diff) | |
| download | qttools-914530faf25767a9a5ae7b35423661c4438a356e.tar.gz | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
Diffstat (limited to 'src/assistant/help/qhelp_global.h')
| -rw-r--r-- | src/assistant/help/qhelp_global.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/assistant/help/qhelp_global.h b/src/assistant/help/qhelp_global.h index 409d49b9d..23adc25db 100644 --- a/src/assistant/help/qhelp_global.h +++ b/src/assistant/help/qhelp_global.h @@ -46,8 +46,6 @@ #include <QtCore/QString> #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHELP_GLOBAL_H |