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

Android: Copy less configuration data

Browse Source 
Change-Id: I8f20addd45fae422f723047689d98e9d903cce6b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
hjk
2014-03-07 13:44:20 +01:00
parent d007c50045
commit 6b358cbe37
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1077,7 +1077,7 @@ QStringList AndroidDeviceInfo::adbSelector(const QString &serialNumber)
return QStringList() << QLatin1String("-s") << serialNumber; return QStringList() << QLatin1String("-s") << serialNumber;
} }
AndroidConfig AndroidConfigurations::currentConfig() const AndroidConfig &AndroidConfigurations::currentConfig()
{ {
return m_instance->m_config; // ensure that m_instance is initialized return m_instance->m_config; // ensure that m_instance is initialized
} }

2
src/plugins/android/androidconfigurations.h
View File

@@ -173,7 +173,7 @@ class AndroidConfigurations : public QObject
Q_OBJECT Q_OBJECT
public: public:
static AndroidConfig currentConfig(); static const AndroidConfig &currentConfig();
static void setConfig(const AndroidConfig &config); static void setConfig(const AndroidConfig &config);
static AndroidConfigurations *instance(); static AndroidConfigurations *instance();