From 6b358cbe3783a557a2f87c467bd863af4693dd7f Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Mar 2014 13:44:20 +0100 Subject: [PATCH] Android: Copy less configuration data Change-Id: I8f20addd45fae422f723047689d98e9d903cce6b Reviewed-by: Daniel Teske --- src/plugins/android/androidconfigurations.cpp | 2 +- src/plugins/android/androidconfigurations.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index a9eab1fec46..0c8efedb4bb 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1077,7 +1077,7 @@ QStringList AndroidDeviceInfo::adbSelector(const QString &serialNumber) return QStringList() << QLatin1String("-s") << serialNumber; } -AndroidConfig AndroidConfigurations::currentConfig() +const AndroidConfig &AndroidConfigurations::currentConfig() { return m_instance->m_config; // ensure that m_instance is initialized } diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 50f6fa1741f..45fea1901b6 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -173,7 +173,7 @@ class AndroidConfigurations : public QObject Q_OBJECT public: - static AndroidConfig currentConfig(); + static const AndroidConfig ¤tConfig(); static void setConfig(const AndroidConfig &config); static AndroidConfigurations *instance();