Commit Graph

51 Commits

Author SHA1 Message Date
Friedemann Kleint
fcdc8177b1 Documentation: Add ProjectExplorer plugin..
Reformat existing documentation to qdoc.
2011-04-14 12:58:14 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christian Kandeler
2407f4258f ProjectExplorer: Adapt output window clients to fixed newline handling.
Reviewed-by: dt
2011-03-31 18:33:27 +02:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +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
Oswald Buddenhagen
79be54ed8c replace env variable injection with pervasive expando support
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
2010-11-17 13:19:08 +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
Oswald Buddenhagen
d94b161e59 less code duplicattion 2010-11-11 20:55:24 +01:00
Friedemann Kleint
22f03cbde6 ProjectExplor/Debugger: Header cleanup 2010-11-02 16:14:00 +01:00
Oswald Buddenhagen
c9a8dc990a expand working directory before looking for a command in it
Reviewed-by: hunger
2010-10-21 14:21:13 +02:00
Tobias Hunger
ad008b9b57 Environment: Disable escaping when expanding variables
This breaks too much on windows.

Reviewed-by: dt
2010-10-08 14:30:26 +02:00
Tobias Hunger
e9f412c3ed Handle environment variables in customprocessstep
Reviewed-by: dt
2010-09-24 16:35:06 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00
Tobias Hunger
3dc4bd6dc9 Fix building with ABLD on symbian
* Output parser was deleted to early, resulting in creator assuming
   that the build had failed.
2010-09-07 15:53:26 +02:00
Tobias Hunger
2c24bee040 Delete parsers after parsing is done.
This way we have a chance to flush out any state the parsers
might have.
2010-09-03 16:45:39 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
2010-08-02 14:21:05 +02:00
dt
615cda8430 Fix compile output to be readeable with dark themes
This changes the colors to be a mix of red/blue and the foreground
color. If the regular text color is either of those, well...
2010-07-15 11:11:21 +02:00
Tobias Hunger
773d580604 Use native separators
* Force use of native separators when reporting process
   start/stop information in the compile output window
2010-07-07 14:40:13 +02:00
dt
3fa6aa3008 Fix wrong output in compile output
Reviewed-By: ossi
2010-06-15 14:58:18 +02:00
dt
9d7a054c6b Fix escaped output in the compile output window 2010-06-10 18:05:59 +02:00
dt
181cecbb32 Port the compile output window away from HTML to QTextCharFormat
Is more then twice as fast
2010-06-08 15:23:58 +02:00
Tobias Hunger
8cf30e86df Allow overriding the return value of abstractprocessstep::run
This is needed to enable additional checks on the result.

Reviewed-by: dt
2010-04-09 18:04:22 +02:00
dt
fbb82097b6 Don't trim lines before pushing them to the parsers
Reviewed-By: hunger
2010-03-23 16:25:46 +01:00
dt
3976d16458 Add <b> to make the tags balanced 2010-03-23 16:25:46 +01:00
dt
7c11c4d8b0 Move TaskWindow::Task out of the nesting to ProjectExplorer::
Since otherwise we can't forward declare it.
2010-03-12 15:00:15 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Tobias Hunger
1726688434 Make use of ProjectConfiguration class in BuildSteps
* Use new BuildSteps interface (as seen in ProjectConfiguration).
 * Use new factory to construct/clone/restore them.

Reviewed-by: dt
2010-02-01 12:23:12 +01:00
Tobias Hunger
d612c534d5 Actually display output to stderr again
* Forgot to remove one else which made stderr output pass either
   through the OutputParsers or to the output window. I did not notice that
   since on window the error messages go to stdOut... sorry.

Reviewed-by: con
2009-12-18 11:38:17 +01:00
Tobias Hunger
ec025c6dbf Rework Build Parser handling
* Rework IBuildParser:
    * Remove name() method.
    * Remove enterDirectory and leaveDirectory signals.
    * Allow chaining of parsers.
 * Rename IBuildParser to IOutputParser.
 * Implement GnuMakeParser.
    * Remove entering/leaving directory related code from all other parsers
    * Move filename fixup heuristic based on entering/leaving directory
      massages from gnumake here from AbstractMakeStep.
 * Add outputParser method to ToolChain: This removes the need to map
   toolchains to BuildParser names in the BuildSteps.
 * Enhance AbstractProcessStep to accept a IOutputParser to parse its output.
 * Remove AbstractMakeStep.
 * Set the appropriate Parsers in all classes deriving from AbstractProcessStep
   and append the ToolChain's parser to the parser chain.
 * Remove BuildParserFactories: There is no more need for them.
 * Remove constants used to identify the BuildParsers.
 * Clean up some names:
    * Replace stdOut with stdOutput.
    * Replace addToTaskWindow with addTask and addToOutputWindow with
      addOutput. Do this wherever it is not yet clear that this will end up
      in the Task/Output window.

Reviewed-by: dt
2009-12-09 18:39:03 +01:00
dt
60a1ee12ba Remove project() from BuildStep
The project() should in most cases not matter, instead the
BuildConfiguration should. This shows all the information that needs to
move into the BuildConfiguration classes.
2009-11-30 15:24:31 +01:00
dt
ce26dd25b1 Fix for Custom build steps 2009-11-24 14:05:09 +01:00
dt
0d162be22f Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
2009-11-19 16:36:48 +01:00
dt
72fe54db77 Remove value(name) and setValue(name, value) from BuildStep 2009-11-19 16:35:19 +01:00
dt
e58ff77bd3 Take the build environment into account for searching what to execute.
Fixes a bug where the cmake plugin wasn't finding make, if the make
commands directory was added to path in the build environment.
2009-09-08 13:53:50 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
daaf652fcd Add a way to configure what cleaning does.
Task-Nr: 235965
2009-06-23 11:16:43 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Thorbjørn Lindeijer
1a775dd8ca A bit of cleanup/unduplication 2009-03-18 11:54:26 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
342caa2141 some more whitespace changes 2008-12-09 11:07:24 +01:00
Oswald Buddenhagen
eefb35a899 html-escape text appended to the log windows. 2008-12-03 22:03:07 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00