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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
This commit is contained in:
con
2010-05-17 17:40:40 +02:00
parent d8318a9502 b52f3cb274
commit 38f6379f39
106 changed files with 1205 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/completionsettingspage.ui
View File

@@ -65,7 +65,7 @@
</item>
<item>
<property name="text">
<string>First letter</string>
<string>First Letter</string>
</property>
</item>
</widget>

2
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -272,7 +272,7 @@ void CppFileSettingsWidget::slotEdit()
return;
}
// Pick a file name and write new template, edit with C++
path = QFileDialog::getSaveFileName(this, tr("Choose a location for the new license template file"));
path = QFileDialog::getSaveFileName(this, tr("Choose Location for New License Template File"));
if (path.isEmpty())
return;
QFile file(path);