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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
This commit is contained in:
Eike Ziller
2012-10-04 12:23:39 +02:00
parent d2bf853ca1 ed86a7ca58
commit db4311d5b5
110 changed files with 2246 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/project.cpp
View File

@@ -266,7 +266,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
Kit *k = KitManager::instance()->find(id);
if (!k) {
qWarning("Warning: No profile '%s' found. Continuing.", qPrintable(id.toString()));
qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString()));
return 0;
}