summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/qandroidplatformmenu.cpp
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@digia.com>2014-04-23 16:10:33 +0200
committerChristian Stromme <christian.stromme@digia.com>2014-06-30 16:58:43 +0200
commit8f96ce37333b3034f2eef1366f9eea4a47a479ed (patch)
tree9b536c1f9639b6ad092eb99416205b7735cda6d7 /src/plugins/platforms/android/qandroidplatformmenu.cpp
parent32514298131f7e8009a7641e20ff37be91cf4582 (diff)
Android: Fix namespace usage
This change makes it possible to set a Qt namespace for Android builds. Change-Id: I79f4ae8200223f36f97e2849aae49e45b8850d23 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformmenu.cpp')
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformmenu.cpp b/src/plugins/platforms/android/qandroidplatformmenu.cpp
index 1ecabb25e2..b602f85cd9 100644
--- a/src/plugins/platforms/android/qandroidplatformmenu.cpp
+++ b/src/plugins/platforms/android/qandroidplatformmenu.cpp
@@ -43,6 +43,8 @@
#include "qandroidplatformmenuitem.h"
#include "androidjnimenu.h"
+QT_BEGIN_NAMESPACE
+
QAndroidPlatformMenu::QAndroidPlatformMenu()
{
m_tag = reinterpret_cast<quintptr>(this); // QMenu will overwrite this later, but we need a unique ID for QtQuick
@@ -175,3 +177,5 @@ QMutex *QAndroidPlatformMenu::menuItemsMutex()
{
return &m_menuItemsMutex;
}
+
+QT_END_NAMESPACE