Commit 6faede08 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/2.6'

Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
parents a299252a 14a2ff59
doc/images/qml-observer-view.png

6.71 KB | W: | H:

doc/images/qml-observer-view.png

25.8 KB | W: | H:

doc/images/qml-observer-view.png
doc/images/qml-observer-view.png
doc/images/qml-observer-view.png
doc/images/qml-observer-view.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtquick-example-stack.png

29.3 KB | W: | H:

doc/images/qtquick-example-stack.png

83.5 KB | W: | H:

doc/images/qtquick-example-stack.png
doc/images/qtquick-example-stack.png
doc/images/qtquick-example-stack.png
doc/images/qtquick-example-stack.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -68,16 +68,11 @@
\o \l{Debugging Qt Quick Projects}
When debugging a Qt Quick application, you can inspect the state
of the
application while debugging JavaScript functions. You can set
of the application while debugging JavaScript functions. You can set
breakpoints, view call stack trace, and examine locals and
expressions. When the application is interrupted by a breakpoint,
you can use the QML Script Console to execute JavaScript expressions
in the current context.
While the application is running, you can use the QML Inspector
view to explore the object structure, debug animations, and
inspect colors.
expressions. While the application is running, you can inspect QML
objects and user interfaces, as well as execute JavaScript
expressions.
\o \l{Debugging a C++ Example Application}
......
......@@ -62,8 +62,7 @@
\o When the debugger hits the breakpoint, it interrupts the
application. \QC displays the nested function calls leading to the
current position as a call stack trace. To view the stack, select
the \gui Stack tab.
current position as a call stack trace (1).
\image qtquick-example-setting-breakpoint2.png
......@@ -96,8 +95,8 @@
\o To remove a breakpoint, right-click it and select
\gui {Delete Breakpoint}.
\o Select the \gui {QML Inspector} tab to explore the object structure
at runtime:
\o Select the \gui {Locals and Expressions} tab to explore the object
structure at runtime:
\image qtquick-example-qml-inspector.png
......@@ -114,8 +113,8 @@
\image qtquick-example-property-values.png
\o In the \gui {QML Inspector} view, double-click the value of the
\c text property to change it temporarily from \gui {Quit} to
\o In the \gui {Locals and Expressions} view, double-click the value of
the \c text property to change it temporarily from \gui {Quit} to
\gui {End Game}.
When you select an element, the cursor moves to it in the code
......
......@@ -118,9 +118,7 @@
\o Change QML code and immediately see the changes at runtime
\o Inspect QML code and change it at runtime without changing the code
\o Debug animations
\o Inspect QML code and change it temporarily at runtime
\endlist
......@@ -175,28 +173,28 @@
\inlineimage qml-observer-bar-reload.png "Apply Changes on Save button"
(\gui {Apply Changes on Save}) button on the toolbar.
When you change property values in the \gui {Console} or
\gui {QML Inspector}, they are immediately updated in the running
When you change property values in the \gui {Console} or in the
\gui {Locals and Expressions} view, they are immediately updated in the running
application, but not in the source code.
\section1 Inspecting QML at Runtime
\section1 Inspecting QML Objects
While the application is running, you can use the \gui {QML Inspector} view
to explore the object structure, debug animations, and inspect colors.
To open the \gui {QML Inspector} view, choose \gui {Window > View >
QML Inspector}. The view shows the properties of the currently selected QML
element.
While the application is running, you can use the
\gui {Locals and Expressions} view to explore the QML object structure.
\image qml-observer-view.png "QML Inspector view"
\image qml-observer-view.png "QML object tree"
To keep the application visible while you interact with the inspector, click
To keep the application visible while you interact with the debugger, click
\inlineimage qml-inspector-app-on-top.png
(\gui {Show Application on Top}).
To display a QML element in the \gui {QML Inspector} view:
You can view a QML element in \gui {Locals and Expressions} in the following
ways:
\list
\o Expand the element in the object tree.
\o Select the element in the code editor.
\o Click
......@@ -204,65 +202,34 @@
(\gui Select) to activate selection mode and then click an element
in the running application.
\o Select a child element of an element in the menu in the
\gui {QML Inspector} view:
\image qtquick-example-children.png
\o Select an element in the element path in the \gui {QML Inspector}
view.
\endlist
To change property values temporarily, without editing the source,
double-click them and enter the new values. You can view the results in the
running application.
When you select an element, the cursor moves to it in the code editor, where
you can change the value permanently.
\section1 Inspecting User Interfaces
\section1 Debugging Animations
When you debug complex applications, you can use the inspection
mode to jump to the position in code where an element is defined. You are
switched to the inspection mode, when you click the \gui Select, \gui Zoom,
or \gui {Color Picker} button
on the toolbar.
\image qml-observer-buttons.png "QML Inspector toolbar"
When you debug complex applications, you can jump to the position in code
where an element is defined or you can zoom into the user interface.
When the \gui Select tool is enabled, you can click elements in the running
application to jump to their definitions in the code. The properties of the
selected element are displayed in the \gui {QML Inspector} view. The element
hierarchy is displayed as a bread crumb path.
selected element are displayed in the \gui {Locals and Expressions} view.
You can also right-click an element in the running application to view the
element hierarchy as a context menu.
\image qml-observer-context-menu.png "QML Inspector"
\image qml-observer-context-menu.png "QML element hierarchy"
To switch to the zoom mode, click the \gui Zoom button. Click in the
running application to zoom in. Right-click to open a context menu that
contains zoom controls.
To inspect colors, click the \gui {Color Picker} button. You can also click
\inlineimage qml-observer-bar-copy-color.png "Color Picker button"
(\gui {Color Picker}) to copy the color definition to the clipboard.
To switch out of the inspection mode, deselect the \gui Select, \gui Zoom,
and \gui {Color Picker} button.
To switch out of the selection or zoom mode, deselect the \gui Select or
\gui Zoom button.
To move the application running in \QQV to the front, select the
\gui {Show Application on Top} button.
To play and pause animations in the running application, select
\inlineimage qml-inspector-play.png
(\gui {Play Animations}) and
\inlineimage qml-inspector-pause.png
(\gui {Pause Animations}) on the toolbar.
To change the speed at which animations are played, click and hold down
\gui {Play/Pause Animations}
and select a value.
*/
......@@ -17,32 +17,39 @@ unix:!macx:!isEmpty(copydata):SUBDIRS += bin
OTHER_FILES += dist/copyright_template.txt \
$$files(dist/changes-*)
macx: PLATFORM = "mac"
else:win32: PLATFORM = "windows"
else:linux-*: PLATFORM = "linux-$${QT_ARCH}"
else: PLATFORM = "unknown"
PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
macx {
APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app"
BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app"
deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\"
codesign.commands = codesign -s \"$(SIGNING_IDENTITY)\" \"$${APPBUNDLE}\"
bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).7z \"$$OUT_PWD/bin/Qt Creator.app/\"
dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).dmg
dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-$${PATTERN}.dmg
dmg.depends = deployqt
QMAKE_EXTRA_TARGETS += codesign dmg
} else {
BINDIST_SOURCE = "$(INSTALL_ROOT)$$QTC_PREFIX"
deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\"
deployqt.depends = install
win32 {
bindist.commands ~= s,/,\\\\,g
deployqt.commands ~= s,/,\\\\,g
deployartifacts.depends = install
PLATFORM="windows"
deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\"&& rmdir /s /q binary-artifacts
QMAKE_EXTRA_TARGETS += deployartifacts
}
else:linux-*: PLATFORM = "linux-$${QT_ARCH}"
else:PLATFORM = "unknown"
PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
bindist.commands = 7z a -mx9 qt-creator-$${PATTERN}.7z \"$(INSTALL_ROOT)$$QTC_PREFIX\"
win32 {
bindist.commands ~= s,/,\\\\,g
}
}
bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-$${PATTERN}.7z \"$$BINDIST_SOURCE\"
win32 {
deployqt.commands ~= s,/,\\\\,g
bindist.commands ~= s,/,\\\\,g
}
bindist.depends = deployqt
QMAKE_EXTRA_TARGETS += deployqt bindist
......@@ -44,6 +44,7 @@ Project {
"src/plugins/cpptools/cpptools.qbs",
"src/plugins/cvs/cvs.qbs",
"src/plugins/debugger/debugger.qbs",
"src/plugins/debugger/ptracepreload.qbs",
"src/plugins/designer/designer.qbs",
"src/plugins/fakevim/fakevim.qbs",
"src/plugins/find/find.qbs",
......@@ -73,6 +74,7 @@ Project {
"src/plugins/tasklist/tasklist.qbs",
"src/plugins/texteditor/texteditor.qbs",
"src/plugins/todo/todo.qbs",
"src/plugins/updateinfo/updateinfo.qbs",
"src/plugins/valgrind/valgrind.qbs",
"src/plugins/vcsbase/vcsbase.qbs",
"src/plugins/welcome/welcome.qbs",
......
......@@ -33,6 +33,7 @@
#include <QMetaType>
#include <QString>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -33,6 +33,7 @@
#include <QMetaType>
#include <QVector>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -32,6 +32,7 @@
#define COMPONENTCOMPLETEDCOMMAND_H
#include <QMetaType>
#include <QVector>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -33,6 +33,7 @@
#include <QMetaType>
#include <QVector>
#include <QDataStream>
#include "instancecontainer.h"
......
......@@ -35,6 +35,7 @@
#include <QMetaType>
#include <QVector>
#include <QString>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -33,6 +33,7 @@
#include <qmetatype.h>
#include <QString>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -33,6 +33,7 @@
#include <qmetatype.h>
#include <QString>
#include <QDataStream>
namespace QmlDesigner {
......
......@@ -168,7 +168,6 @@ void NodeInstanceClientProxy::readDataStream()
QDataStream in(m_socket);
in.setVersion(QDataStream::Qt_4_8);
if (m_blockSize == 0) {
in >> m_blockSize;
}
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget { //This is a special checkBox that does color coding for states
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QExtGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QLabel {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
Item {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget { //This is a special doubleSpinBox that does color coding for states
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget { //This is a special doubleSpinBox that does color coding for states
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
GroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
AnimatedToolButton {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QScrollArea {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QFrame {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QPushButton {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
GroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QWidget {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
GroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
QGroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/
import Qt 4.7
import QtQuick 1.0
import Bauhaus 1.0
GroupBox {
......
......@@ -28,7 +28,7 @@
**
**************************************************************************/