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
Jarek Kobus
d34c81a2a6
Add "Add Library" action to project explorer's context menu
...
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
Task-number: QTCREATORBUG-4127
2011-04-13 13:56:27 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
hjk
1738d08ffc
projectexplorer: move project{Context,Language} from IProjectManager to Project
...
Reviewed-by: dt
2011-04-12 12:46:26 +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
Jarek Kobus
faad3fcef4
Fixes: Add new subdirs project wizard
...
Task: QTCREATORBUG-1297
RevBy: dt <qtc-committer@nokia.com >
2010-11-24 15:25:41 +01:00
Pawel Polanski
a6e1c200dd
qmake error/warning parser has been improved
2010-11-08 13:53:52 +01:00
Jarek Kobus
b6da2d4537
Implement "Jump To File Under Cursor" in profile editor
...
Reviewed-by: dt <qtc-committer@nokia.com >
Reviewed-by: ossi <oswald.buddenhagen@nokia.com >
Task-number: QTCREATORBUG-688
2010-10-14 11:58:34 +02:00
Tobias Hunger
7ef2d81aad
Symbian: Add unit tests for RVCT parser
...
* Add unit tests for RVCT parser
* Make the unit tests pass.
2010-10-06 12:35:02 +02:00
Jarek Kobus
573006f370
Add "Add library wizard" to the pro file editor
...
Reviewed-by: dt <qtc-committer@nokia.com >
Task-number: QTCREATORBUG-125
2010-08-16 18:25:38 +02:00
Tobias Hunger
6311f0f99f
Add parser for sbsv2 (new Symbian build system)
...
* Add parser
* Use it
* Improve parser setup in Qt4 makestep
* Add tests for the sbsv2parser
2010-08-11 15:41:54 +02:00
Tobias Hunger
221cc38788
Add output parser for Qt-specific utilities
...
* Handle moc warnings there
* Add unit tests
* Use new parser in Qt's makestep
Task-number: QTCREATORBUG-1908
2010-08-03 17:26:07 +02:00
dt
0801047287
Make project context a Core::Context
...
Also properly initialize m_projectContext in Qt4Manager, fixing the
disabled "Run QMake" action
2010-07-02 14:01:24 +02:00
hjk
2f5f358ff4
Core::Context: compile hot fix for Windows.
2010-06-25 17:38:25 +02:00
kh1
745345e347
There is no dependency, so make the runtime manager an real singelton.
...
Reviewed-by: ck
2010-05-25 14:55:53 +02:00
kh1
c6fef3ef63
Long overdue changes and refactoring for qemu handling.
...
Fixes: - react on build/ run configuration changes
- now notices environment changes, like switching Qt versions
- start button is now only shown if we have a valid qemu runtime
- enabled/ disabled state works properly when loading a project
Task-number: QTCREATOR-210, QTCREATORBUG-1252, QTCREATORBUG-1082
Reviewed-by: ck
2010-05-20 16:05:23 +02:00
dt
ff61f2295d
Add Clean and rebuild sub dir
...
Also change the strings slightly.
Task-Nr: QTCREATORBUG-1295
Task-Nr: QTCREATORBUG-1296
2010-04-30 11:55:04 +02:00
Tobias Hunger
64bba7eda0
Add simple unit tests for abld parser
2010-03-29 19:42:13 +02:00
Friedemann Kleint
f66df7b9a6
Header cleanup in ProjectExplorer and Qt4ProjectManager
2010-03-17 17:45:33 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
dt
fb3ae97df3
Add Build to the right click menu of sub projects for Qt4 Projects
...
They do what you expect them to do, that is build only a subtree.
The implementation is a little bit strange. We temporarly set the sub
node to be built on the BuildConfiguration, enqueue that
BuildConfiguration (which calls BuildStep::init()), and then reset that
temporary value.
A more general way would be to have the ability to extend
BuildConfiguration::buildProject() in a way that additional data can be
passed to the BuildSteps.
Task-Nr: QTCREATOR-5
Task-Nr: QTCREATORBUG-44
2010-01-13 18:02:22 +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
hjk
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
Daniel Molkentin
5633de2ac9
Make the welcome screen into plugins.
...
This removes the all hard dependencies to and from welcome screen,
except the one to the core plugin. More in detail:
- Add IWelcomePage to add a tab to the welcome screen
- Move tabs in the modules where they belong
- Enables QHelpManager to open help fullscreen and contextually
- "Getting Started" moves to Qt4ProjectManager
- Projects & Sessions (aka "Develop") moves to ProjectExplorer
- "Community" remains in the welcome plugin for simplicity
2009-07-28 16:11:55 +02:00
Jason McDonald
884b7af769
Update license headers and sales contact details.
...
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Alessandro Portale
8c8e9753f2
EmptyProjectWizard allows us to create an empty project.
2009-05-07 20:31:12 +02:00
dt
2b302332b8
Move QtVersionManager, QtVersion and QtOptionsPage back
...
After all I don't need all that stuff in the cmakeplugin, all i needed
is now bundled in debugginghelper.h/cpp
2009-04-28 12:45:04 +02:00
dt
b6c05a334c
Refactoring: Move QtVersionManager instance() into the ProjectExplorer
...
And add a instance() method to it.
2009-04-22 16:51:38 +02:00
dt
8f22417244
Refactoring: Move QtVersionManager to ProjectExplorer.
...
The Debugger, cmake and Qt4 plugin all need it. More refactoring to it
coming.
2009-04-22 14:52:35 +02:00
dt
10482c81a4
Refactoring for (Q)MakeBuildStepFactory
...
Rename (Q)MakeBuildStepFactory to (Q)MakeStepFacotry
Move the factories to the same files as (Q)MakeStep
Delete the old qmakebuildstepfactory.(h|cpp)
2009-04-20 17:59:40 +02:00
hjk
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
hjk
113b81e9db
replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance()
2009-01-20 11:52:04 +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
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
con
05c35356ab
Initial import
2008-12-02 12:01:29 +01:00