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

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
This commit is contained in:
Eike Ziller
2015-04-02 11:56:55 +02:00
parent 97631c25df fd0b383932
commit e56118cc1e
37 changed files with 344 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidmanager.cpp
View File

@@ -681,7 +681,8 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti
}
for (GradleProperties::const_iterator it = properties.begin(); it != properties.end(); ++it)
for (GradleProperties::const_iterator it = properties.constBegin(); it != properties.constEnd();
++it)
file.write(it.key() + '=' + it.value() + '\n');
file.close();