From 2cbe7783ded5d7385400b416f42d164cf6a876a1 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 24 Jan 2023 16:19:22 +0100
Subject: [PATCH] Android: Move strange macro to smaller scope

Change-Id: Ia53ba19eb2879d7b72677e28639e4f506581f213
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/android/androidconfigurations.cpp |  6 ++++++
 src/plugins/android/androidconstants.h        | 14 ++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index c187ba7b735..38a1b092319 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -72,6 +72,12 @@ static Q_LOGGING_CATEGORY(avdConfigLog, "qtc.android.androidconfig", QtWarningMs
 namespace Android {
 using namespace Internal;
 
+#ifdef Q_OS_WIN32
+#define ANDROID_BAT_SUFFIX ".bat"
+#else
+#define ANDROID_BAT_SUFFIX ""
+#endif
+
 const char JsonFilePath[] = "android/sdk_definitions.json";
 const char SdkToolsUrlKey[] = "sdk_tools_url";
 const char CommonKey[] = "common";
diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h
index 7fde310ccfd..f1ca33e3bbe 100644
--- a/src/plugins/android/androidconstants.h
+++ b/src/plugins/android/androidconstants.h
@@ -3,19 +3,10 @@
 
 #pragma once
 
-#include <QtGlobal>
 #include <utils/id.h>
 
-namespace Android {
-namespace Internal {
-#ifdef Q_OS_WIN32
-#define ANDROID_BAT_SUFFIX ".bat"
-#else
-#define ANDROID_BAT_SUFFIX ""
-#endif
-} // namespace Internal
+namespace Android::Constants {
 
-namespace Constants {
 const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations";
 const char ANDROID_TOOLCHAIN_TYPEID[] = "Qt4ProjectManager.ToolChain.Android";
 const char ANDROID_QT_TYPE[] = "Qt4ProjectManager.QtVersion.Android";
@@ -84,5 +75,4 @@ const Utils::Id AndroidAvdPath = "AndroidAvdPath";
 const char cmdlineToolsName[] = "cmdline-tools";
 const char ndkPackageName[] = "ndk";
 
-} // namespace Constants;
-} // namespace Android
+} // Android::Constants