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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/android/androidconfigurations.cpp
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: I91ee3e771ab630ac3a54be53ac4be6d3c1c46950
This commit is contained in:
Eike Ziller
2020-04-20 08:40:54 +02:00
parent 98ce70480a 9e84724c53
commit ad9e4cd2f6
12 changed files with 108 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,6 +185,7 @@ public:
bool isConnected(const QString &serialNumber) const;
bool useNativeUiTools() const;
bool isCmdlineSdkToolsInstalled() const;
bool sdkFullyConfigured() const { return m_sdkFullyConfigured; }
void setSdkFullyConfigured(bool allEssentialsInstalled) { m_sdkFullyConfigured = allEssentialsInstalled; }