Commit Graph

171 Commits

Author SHA1 Message Date
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
2011-02-21 18:33:23 +01:00
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +01:00
Kai Koehne
b94d100ebd QmlProject: Fix issue where qmlviewer is launched with directory as argument
This happened when 'Current File' was set in the settings, but no .user.settings
existed.
2011-01-17 17:42:02 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Kai Koehne
8b6dfab90a QmlProject: Whitespace 2011-01-05 15:38:28 +01:00
Kai Koehne
2c4ae8c1b8 QmlProject: Fix compilation on cygwin
Move use of windows API to winutils.
2011-01-05 14:49:39 +01:00
Kai Koehne
e414335f26 Fix capitalization problems with qmlviewer
qmlviewer is picky about file path capitalization, and will bail out with
'File name case mismatch' if e.g. the working directory is wrongly
capitalized. Prevent this by computing the canonical path of
the qml file + working directory in advance.

Reviewed-by: Alessandro Portale
Task-number: QTCREATORBUG-3417
2010-12-21 13:13:16 +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
Kai Koehne
979e81005e QmlProject: Store 'run current file' in settings
Store the artifical 'CurrentFile' in the settings as the mainFile, cause
leaving it empty translates to 'use file from project'.
2010-12-10 13:25:26 +01:00
Kai Koehne
c4e4913870 QmlProject: Add mainFile property
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
2010-12-08 15:08:49 +01:00
Kai Koehne
ef074dad0c QmlProject: Fix crash for invalid Qt version
Regression introduced by dcd1876d5b.
2010-11-30 07:49:38 +01:00
Kai Koehne
dcd1876d5b QmlProject: Restrict UI to using the System Environment
There are probably very little use cases where you want to start
from a clean environment, and there is no such thing as a Build
Environment (although we magically add some toolchain settings to
the environment).
2010-11-29 14:18:11 +01:00
Kai Koehne
e398225cd0 QmlProject: Allow user to change process environment
Task-number: QTCREATORBUG-2600
2010-11-29 14:18:11 +01:00
Kai Koehne
b1ce0af3f5 QmlProject: Split RunConfiguration, ..Widget into two classes 2010-11-29 14:18:10 +01:00
Kai Koehne
4474ab4e69 QmlProject: Code cleanup 2010-11-29 14:18:10 +01:00
Christiaan Janssen
a2362a4bde RunControl actions updated when project settings change
Reviewed-by: Kai Koehne
2010-11-25 17:31:13 +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
Christian Kamm
8f85202fb1 QmlProject and Observer: Work with Simulator Qt targets.
This allows using the qmlviewer of a Simulator Qt version. It also
builds and uses the qmlobserver when debugging.

Reviewed-by: Kai Koehne
2010-11-12 13:37:54 +01:00
Erik Verbruggen
50ab71bbdc QML: use Qt4 output formatter to get links in errors to work.
Reviewed-by: Tobias Hunger
2010-10-18 12:40:34 +02:00
Christian Kamm
9ad73fc93b QmlProject: Refresh the project when the Qt version changes.
Reviewed-by: Thomas Hartmann
2010-10-13 13:31:30 +02:00
Kai Koehne
f5716f05b7 QmlDump: Get right Qt version for .qmlproject
We're using a QObject property to get the Qt Version Id: QmlDumpTool
is in Qt4ProjectManager, which shouldn't have a dependency to QmlProjectManager.

Reviewed-by: Christian Kamm
2010-10-06 10:15:13 +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
0c054bed77 QmlProject: Let user select Qt version to use
Allow the user to choose which Qt version to use for running
a .qmlproject.

Reviewed-by: dt
2010-10-04 16:59:58 +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
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
Kai Koehne
51d51d0228 Fix style issues in QmlProject runtime configuration pane
Reviewed-by: Christiaan Janssen
2010-09-28 15:17:54 +02:00
Tobias Hunger
f06512d5f7 Use ExistingCommand in PathChooser where it makes sense 2010-09-24 16:35:09 +02:00
Leena Miettinen
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +02:00
Lasse Holmstedt
dca859601f Fix misaligned debugger label in run configuration widgets
It was badly positioned esp. in OS X and Windows.
2010-09-10 17:27:08 +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
8c39471081 Debugger languages are now runconfiguration dependent
There's a UI in qml/customexec/cmake/qmake run configs for choosing the
debugger languages (C++ and QML). The default for all except .qmlproject
is only C++, so default debugging behavior is the same. However, if the
user wants to do simultaneous debugging with two languages, or only
debug QML, they can select the languages from Run Settings and it will
be remembered.

Reviewed-by: hunger
2010-09-01 11:35:36 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
2010-08-23 16:00:24 +02:00
Kai Koehne
3b4c322d59 QmlProject: Show effective qmlviewer call in separate row
Don't misuse the input field for a custom qmlviewer path with displaying
the effective qmlviewer used. Previously the effective qmlviewer was
only calculated when the project pane is shown first, and then never
updated.

Reviewed-by: holmstedt
2010-08-20 12:27:12 +02:00
Kai Koehne
2febf2718c QmlProject: Remove debug info from runtime configuration
QmlInspector has been disabled

Reviewed-by: holmstedt
2010-08-20 12:27:01 +02:00
Kai Koehne
5bbb4c6129 QmlProject: Fix memory leak
Remove unneeded widget (has been added unintendedly in 60fffd
2010-08-20 10:50:30 +02:00
Kai Koehne
60fffda9eb QmlProject: Search for qmlviewer in configured Qt versions (if not found in $PATH)
If no 'qmlviewer' executable is found in the PATH, iterate through the
list of configured Qt versions and try to find a qmlviewer there. This
should help users configuring creator such to play with Qml.

Right now the first qmlviewer found in a Qt version is selected. A UI
to let the user select one explicitly was not possible any more (string
freeze).

This requires a dependency from QmlProjectManager to
Qt4ProjectManager.

Reviewed-by: dt
2010-08-19 17:22:13 +02:00
Roberto Raggi
4a9ba8d082 Removed useless test. 2010-07-16 16:50:54 +02:00
Lasse Holmstedt
dad99969ab Fixed OS X qml observer name 2010-07-15 10:13:06 +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
763d5bdd86 rename qmlviewer to qmlobserver 2010-07-14 15:31:24 +02:00
Lasse Holmstedt
66a008e9de modified qml run config title 2010-07-14 15:30:53 +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
bb08fb6528 added custom qmlviewer to creator
This qmlviewer will be also the default one when opening qmlproject files
as the runconfiguration was changed too.
2010-07-08 14:00:33 +02:00
Kai Koehne
ef48306ba7 QmlProject: Consistently enable/disable debug & run buttons
The heuristics to find the file to run and the logic that decides
whether the show / debug button is shown weren't in sync. Also, don't
try to run .qmlproject files if open in the editor.

Reviewed-by: Lasse Holmstedt
2010-06-10 10:26:32 +02:00
Kai Koehne
adad842bbe Rename QML Runtime to QML Viewer again in the UI
Latest qt renamed qml executable back to qmlviewer, and also named
the executable again QML Viewer instead of Runtime/Launcher.
2010-05-20 12:00:35 +02:00
Lasse Holmstedt
9c2eb9fe2e QmlInspector: Modifiable properties from inspector property table 2010-04-21 10:32:26 +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
Lasse Holmstedt
6538ca63bc Fixed clone constructor for qml run configuration 2010-04-16 15:56:25 +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