feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,251 Commits 108 Branches 368 Tags
f9548e5d13f5b644f75f48aa4b0f428b9c079294
Commit Graph

46 Commits

Author SHA1 Message Date
hjk
ef806894e8 runcontrols: use ProjectExplorrer::OutputFormat for format selection 2011-01-07 16:26:56 +01:00
hjk
8fd480bd21 merge addToOutputWindow and addToOutputWindowInline 2011-01-07 16:26:55 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
hjk
a77353b414 debugger: move DebuggerMainWindow to debuggermainwindow.{h,cpp} 2010-12-02 17:43:14 +01:00
Kai Koehne
e398225cd0 QmlProject: Allow user to change process environment 
Task-number: QTCREATORBUG-2600
 2010-11-29 14:18:11 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
dt
6683b40844 ProjectExplorer + Debugger: Move Debug Action to the Debugger plugin 
Since all the debuggers are implemented in the debuggerplugin, that's a
natural place to put the action.
 2010-11-12 20:18:29 +01:00
hjk
2161e0f6d9 debugger: refactoring of the plugin interface 
There's  some 'external' and some 'internal' part now. Other plugins
are only supposed the external interface.
 2010-11-10 12:08:23 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header. 
Acked-By: dt
 2010-11-01 14:25:24 +01:00
Friedemann Kleint
f1fb0bddb1 Debugger/JS Code model: Set environment for QML tools correctly. 
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
 2010-10-26 15:39:37 +02:00
Pawel Polanski
e46a99bcc0 Small fix in a text 
Reviewed-by: Friedemann Kleint
 2010-10-11 14:47:58 +02:00
Kai Koehne
6267671858 QmlProject: Disable debug action if qmlobserver cannot be built 
QmlObserver right now requires 4.7.1 minimum. There's no gain in
telling the user that he needs qmlobserver to debug, if it can't be
build with 4.7.0 anyway.

Reviewed-by: Christiaan Janssen
 2010-10-05 12:45:10 +02:00
Kai Koehne
325af72012 QmlProject: Always use qmlobserver for debugging projects 
Also only warn about missing qmlobserver when actually trying to
debug a .qmlproject.

Reviewed-by: Christiaan Janssen
 2010-10-04 16:59:58 +02:00
Kai Koehne
c03fff0968 QmlProject: Stop program when exiting creator 
Task-number: QTCREATORBUG-2501
 2010-10-04 09:44:18 +02:00
Lasse Holmstedt
89443cfb1f QML Observer: Complain about not having it if debugging .qmlprojects 
Reviewed-by: hjk
 2010-09-29 09:39:42 +02:00
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