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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
This commit is contained in:
Eike Ziller
2011-11-18 10:16:49 +01:00
parent 826354e3da a8a170a4d4
commit fbd47e25ee
93 changed files with 4807 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/src/linux-mobile/maemodev.qdoc
View File

@@ -365,11 +365,8 @@
\image qtcreator-build-settings-maemo.png "Maemo build settings"
\o In the \gui{Run Settings} section, click \gui Add to add a new
deploy configuration. The configuration is named automatically. To
give it a new name, click \gui Rename.
\o In the \gui {Device configuration} field, select the device
\o In the \gui{Run Settings} section, in the
\gui {Device configuration} field, select the device
connection or the emulator connection.
\image qtcreator-run-settings-maemo.png "Maemo run settings"

3
doc/src/linux-mobile/meegodev.qdoc
View File

@@ -383,7 +383,8 @@
\image qtcreator-screenshot-build-settings.png
\o In the \gui {Device configuration} field, select the
\o In the \gui {Run Settings} section,
\gui {Device configuration} field, select the
device connection or the emulator connection.
\image qtcreator-screenshot-run-settings.png