diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-01 18:41:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-01 18:41:14 +0200 |
| commit | e6a94778d0c26b59e367e9f9fe4f401725fc9c4e (patch) | |
| tree | c7597213d7eac14863bc3cfd7bccd247c8950710 /src/plugins/platforms/android/qandroidplatformmenu.h | |
| parent | 605ba2c2268b2dce3d0b06899101d03a67e7f251 (diff) | |
| parent | a09a8d509a69ed16d8afbe15296b8332cacd6c66 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformmenu.h')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformmenu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformmenu.h b/src/plugins/platforms/android/qandroidplatformmenu.h index 305b64168a..7858ca36ae 100644 --- a/src/plugins/platforms/android/qandroidplatformmenu.h +++ b/src/plugins/platforms/android/qandroidplatformmenu.h @@ -46,6 +46,8 @@ #include <qvector.h> #include <qmutex.h> +QT_BEGIN_NAMESPACE + class QAndroidPlatformMenuItem; class QAndroidPlatformMenu: public QPlatformMenu { @@ -89,4 +91,6 @@ private: QMutex m_menuItemsMutex; }; +QT_END_NAMESPACE + #endif // QANDROIDPLATFORMMENU_H |