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

2
doc/src/debugger/creator-debugger.qdoc
View File

@@ -27,7 +27,7 @@
/*!
\contentspage index.html
\previouspage creator-build-dependencies.html
\previouspage creator-running-targets.html
\page creator-debugging.html
\nextpage creator-debugging-example.html

39
doc/src/debugger/qtquick-debugging.qdoc
View File

@@ -44,7 +44,7 @@
\section1 Setting Up QML Debugging
The process of setting up debugging for Qt Quick projects depends on the
type of the project: Qt Quick UI or Qt Quick Application.
type of the project: Qt Quick UI or Qt Quick Application, and the Qt version used.
To debug Qt Quick UI projects:
@@ -53,7 +53,7 @@
\o Select \gui Projects, and then select the \gui QML check box in the
\gui {Run Settings}, to enable QML debugging.
\o Compile the QML Inspector debugging helper. For more information,
\o For Qt 4.7, compile the QML Inspector debugging helper. For more information,
see \l{Debugging Helpers for QML}.
\endlist
@@ -62,8 +62,9 @@
\list 1
\o Select \gui Projects, and then select the \gui {Link QML debugging
library} check box in \gui {Build Steps}.
\o Select \gui Projects, and then select the
\gui {Enable QML debugging} check box in the \gui qmake section
in \gui {Build Steps}.
You might have to compile the library first, by selecting the
\gui Compile link.
@@ -91,9 +92,7 @@
\section1 Mixed C++/QML Debugging
To debug both the C++ and QML parts of your application at the same time,
select the checkboxes for both languages in the \gui{Run Settings}. However,
C++ breakpoints are be ignored until the debugger attaches also to the
QML engine.
select the checkboxes for both languages in the \gui{Run Settings}.
\section1 Starting QML Debugging
@@ -144,11 +143,8 @@
\section1 Applying QML Changes at Runtime
If you change property values or add properties in the code editor, the
changes are updated in the running application when you save them. If live
preview is not supported for an element, a message appears. Click
\gui Reload to preview the changes.
Reloading is enabled by default. To disable it, click
debugger can update the properties in the running application when you save
the file. This is enabled by default. To disable it, click
\inlineimage qml-observer-bar-reload.png "Apply Changes on Save button"
on the toolbar.
@@ -196,15 +192,16 @@
\section1 Debugging Animations
\image qml-observer.png
To play and pause animations in the running application, select
\inlineimage qml-inspector-play.png
and
\inlineimage qml-inspector-pause.png
on the toolbar.
To play and pause animations in the running application, select the
\gui {Play/Pause Animations} button on the toolbar or \gui {Debugging >
Animations > Pause}, or press
\key {Ctrl+.}.
To change the speed at which animations are played, select a value in
\gui {Debugging > Animations} or click and hold down the
\gui {Play/Pause Animations} button to select a value.
To change the speed at which animations are played, click and hold down
\inlineimage qml-inspector-play.png
or
\inlineimage qml-inspector-pause.png
and select a value.
*/