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/androidjnimenu.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/androidjnimenu.h')
-rw-r--r-- | src/plugins/platforms/android/androidjnimenu.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/androidjnimenu.h b/src/plugins/platforms/android/androidjnimenu.h index 7c5422f67b..2ae406901a 100644 --- a/src/plugins/platforms/android/androidjnimenu.h +++ b/src/plugins/platforms/android/androidjnimenu.h @@ -43,6 +43,9 @@ #define ANDROIDJNIMENU_H #include <jni.h> +#include <qglobal.h> + +QT_BEGIN_NAMESPACE class QAndroidPlatformMenuBar; class QAndroidPlatformMenu; @@ -66,4 +69,6 @@ namespace QtAndroidMenu bool registerNatives(JNIEnv *env); } +QT_END_NAMESPACE + #endif // ANDROIDJNIMENU_H |