feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Move strange macro to smaller scope

Browse Source 
Change-Id: Ia53ba19eb2879d7b72677e28639e4f506581f213
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-01-24 16:19:22 +01:00
parent c93db0feb4
commit 2cbe7783de
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidconfigurations.cpp
View File

@@ -72,6 +72,12 @@ static Q_LOGGING_CATEGORY(avdConfigLog, "qtc.android.androidconfig", QtWarningMs
namespace Android { namespace Android {
using namespace Internal; 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 JsonFilePath[] = "android/sdk_definitions.json";
const char SdkToolsUrlKey[] = "sdk_tools_url"; const char SdkToolsUrlKey[] = "sdk_tools_url";
const char CommonKey[] = "common"; const char CommonKey[] = "common";

14
src/plugins/android/androidconstants.h
View File

@@ -3,19 +3,10 @@
#pragma once #pragma once
#include <QtGlobal>
#include <utils/id.h> #include <utils/id.h>
namespace Android { namespace Android::Constants {
namespace Internal {
#ifdef Q_OS_WIN32
#define ANDROID_BAT_SUFFIX ".bat"
#else
#define ANDROID_BAT_SUFFIX ""
#endif
} // namespace Internal
namespace Constants {
const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations"; const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations";
const char ANDROID_TOOLCHAIN_TYPEID[] = "Qt4ProjectManager.ToolChain.Android"; const char ANDROID_TOOLCHAIN_TYPEID[] = "Qt4ProjectManager.ToolChain.Android";
const char ANDROID_QT_TYPE[] = "Qt4ProjectManager.QtVersion.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 cmdlineToolsName[] = "cmdline-tools";
const char ndkPackageName[] = "ndk"; const char ndkPackageName[] = "ndk";
} // namespace Constants; } // Android::Constants
} // namespace Android