Commit Graph

30 Commits

Author SHA1 Message Date
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00
Lasse Holmstedt
b580a0c357 QmlDebugging: Use -qmljsdebugger command line argument
Adapt to latest changes in qt.git (commit
a9e5329168c)

Reviewed-by: kkoehne
2010-09-20 12:18:59 +02:00
Kai Koehne
6f11765dae Qml: Allow user to configure port used (all project types)
Reviewed-by: dt
2010-09-03 12:29:41 +02:00
Lasse Holmstedt
ee8ea6dfdb removed old & invalid code for switching to debug mode 2010-09-02 17:45:28 +02:00
Lasse Holmstedt
7afef49682 Qml Debugger: Code style and cleanup
Reviewed-by: hjk
2010-08-24 17:47:20 +02:00
Lasse Holmstedt
b557c58eac Qml Debugger: Enable debugging qml+cpp standalone applications
A new debugger engine, QmlCppEngine, is introduced, which wraps gdb
and qml engines into one. Alternatively, if using Windows, Cdb is used
instead of Gdb.

Most of the debugger ui switcher is now rewritten, and it is tailored
for the QML and CPP layout case, the only one supported anyway.

Reviewed-by: hjk
2010-08-24 17:46:22 +02:00
Friedemann Kleint
6840c1d198 Debugger: Refactor run control termination.
Fix breakage introduced by the new asynchronous stop() methods
of the debugger run controls. Allow for RunControl::stop() to
be asynchronous by introducing a return enumeration indicating
that. Introduce additional method aboutToStop() asking user
to quit (tie that to the RunControl instead of having to hack
the behaviour elsewhere).
If asynchronous stop is detected, terminate the ProjectExplorer
asynchronously.
This makes the behaviour consistent across switching sessions/
closing outputwindow tabs and quitting Qt Creator.

Reviewed-by: dt
Rubber-stamped-by: hjk
2010-08-20 14:19:25 +02:00
Lasse Holmstedt
b71c3c62ba QML Debugger refactoring
Now, QmlEngine creates the connection to the inferior (debuggee), and
notifies QmlInspector when a connection is established. Before,
inspector created the debugger engin, which was wrong.

QmlEngine's responsibilities are connecting to the debuggee and basic
QML/JS debugging features like locals & watchers, breakpoints etc.
QmlInspector takes care of Live Preview and other fancy inspection
features.

Reviewed-by: hjk
2010-08-13 14:20:39 +02:00
Friedemann Kleint
517d4f630d Compile 2010-08-06 10:52:28 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
2010-08-06 10:46:50 +02:00
Lasse Holmstedt
308b462973 QML Inspector: Disable debug actions when qml inspector is disabled
Reviewed-by: Thomas Hartmann
2010-07-29 16:58:12 +02:00
Olivier Goffart
9a1d97707a Merge branch 'qmljsinspector'
Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.cpp
	src/plugins/qmljseditor/qmljseditor.h
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/tools/qml/qmlobserver/editor/resizehandleitem.h
2010-07-14 15:41:27 +02:00
Lasse Holmstedt
2f8dc2833b added mode buttons to custom qml viewer and qmljsinspector toolbar 2010-07-14 15:30:52 +02:00
dt
7862e31256 Refactor OutputFormatter
Move link handling code to outputwindow from OutputFormatter

Move createOutputFormatter to the RunConfiguration

That makes it easier for Qt4RunConfiguration et all.
This also fixes that each time a runcontrol was rerun a new
OutputFormatter was created without deleting the old one, thus
increasing the memory usage.
2010-07-14 13:01:43 +02:00
Lasse Holmstedt
9a81759101 manually applied changes from qmlinspector to qmljsinspector 2010-07-08 11:36:26 +02:00
Roberto Raggi
a88a635e3d Let's start from scratch with a new debugger for QmlJS. 2010-06-28 17:46:42 +02:00
Roberto Raggi
92e4fd9fd3 Get rid of the old the QML inspector code. 2010-06-28 17:15:45 +02:00
dt
f4ea0d79b9 Add a runMode method to the RunControl
And use it to implement changing the run icon in the application output.
That implementation does only support the two run modes run and debug
for now. Further abstraction for more run modes to be done once needed.

Task-Nr:   QTCREATORBUG-1232
2010-05-03 11:25:09 +02:00
Erik Verbruggen
24a9a22b53 Added colors to the "Application Output" panel. 2010-04-19 15:55:29 +02:00
Erik Verbruggen
e3bceff3ee Separated child-process stdout/stderr, and seperated "our" output/errors.
So now the "Applciation Output" can distinguish between these four, and
handle them appropriately.
2010-04-19 14:21:48 +02:00
Erik Verbruggen
53425816af Moved "Application Output" formatting to a specialized formatter.
By introducing the OutputFormatter, RunControls can influence the formatting
depening on the application started. A nice (and intended) side-effect is that
the QML runtime specific formatting will not interfere anymore with anything
else.
2010-04-19 14:21:48 +02:00
Thorbjørn Lindeijer
2ab7d2eafc Some documentation comment formatting and a rename
Renamed RunConfiguration::configurationWidget to
createConfigurationWidget.

Reviewed-by: dt
2010-04-16 13:31:22 +02:00
Lasse Holmstedt
990ec1be91 Added debugging mode for simultaneous QML and C++ debugging
It's not yet possible to attach to an external app running a qml
debugging server, because the server is only started on startup if an
env variable is set. Changing this requires action from Brisbane, but
even the current solution works for C++ apps with QML in them.

Task-number: BAUHAUS-585
Reviewed-by: dt
2010-04-15 15:08:32 +02:00
Lasse Holmstedt
c7049d80f2 Added FIXME and fixed qmlprojectmanager pluginspec 2010-03-18 14:48:30 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thomas Hartmann
1f940786fb Merge branch 'qml_renaming'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
2010-03-01 09:44:00 +01:00
Kai Koehne
4c59f3f2ce QmlProjectManager: Fix compilation with latest changes of QDeclarative
All files have been renamed from Qml to QDeclarative.
Registration of types is now done in an initializer method.
2010-02-26 14:46:04 +01:00
Lasse Holmstedt
df7a19de9e Design mode integration
Moved Qt Designer to open from Design Mode. Also, Design mode is now global,
and created in coreplugin. Other plugins can register themselves to it.
2010-02-26 11:17:02 +01:00
Lasse Holmstedt
c44043188c Fixed qml inspector to work when debugging qml projects 2010-02-24 11:32:21 +01:00
Kai Koehne
fdd85b7f33 QmlProjectManager refactoring
Putting every class in it's own files + avoid "using namespace"
2010-02-16 13:43:27 +01:00