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
dt
b2610f874f
Qt4ProjectManager: Hide Run qmake for non qt projects
2011-02-23 15:52:56 +01:00
hjk
f576ad9f2c
texteditor: merge ITextEditable into ITextEditor
...
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
Alessandro Portale
38edea5019
Renaming: QmlStandaloneApp* -> QtQuickApp*
2011-02-06 16:23:02 +01:00
Alessandro Portale
7870769a30
Html5 app wizard. First steps.
...
Task-Number: QTCREATORBUG-3284
2011-02-06 14:08:52 +01:00
dt
063c4ff670
Add "Run" to projectexplorer context menu
...
Task-Nr: QTCREATORBUG-2166
2011-01-21 13:35:23 +01:00
dt
67cfb7e078
Qt4projectManager: Refactor Qt4Target, split up in per target classes
...
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.
(*) Noteable missing is the qtversion, which needs to be split up
per target too.
Also fixes
Task-Nr: QTCREATORBUG-2440
Reviewed-By: hunger
Reviewed-By: ck
2011-01-17 14:13:40 +01: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
dt
53c7871099
Qt4ProjectManager: Actually add the qt4targetfactory to the object pool
...
Makes Creator useable again :)
2010-12-07 13:27:52 +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
Jarek Kobus
371665446f
Support completion in profile editor
...
Task-number: QTCREATORBUG-2110
2010-11-08 14:03:49 +01:00
Friedemann Kleint
f3cb1f0bf3
Profile editor: Fix ambiguous shortcut F2.
...
Caused by b6da2d4537 .
2010-10-18 12:59:24 +02: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
Alessandro Portale
5d0177ac40
Merged 'New Qt quick App' and 'Import Qml App' Wizards
...
The only difference between these wizards was that in the
Import Wizard, the user was able to chose a .qml file.
So, why not merge them. Also, this commit is a nice code
reduction.
The module deployment feature was killed by popular demand.
Apparently, nobody writes or deploys Qml modules, these days.
Let's see when they want to have it back ;)
Task-Number: QTCREATORBUG-2505
Reviewed-by: ck
2010-10-04 10:54:25 +02:00
Christian Kandeler
e83ba4d4ec
Mobile wizard: Model after QML wizard.
...
Nodded-at-by: dt
2010-09-13 11:22:38 +02:00
Alessandro Portale
46c7d8f1d2
Moving the "Qml standalone" wizards from qmlpm to qt4pm
2010-08-25 14:25:35 +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
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
hjk
c7e8b51d37
core: use a class derived from QList<int> instead of a QList<int> for Core::Context
...
A mostly mechanical change.
Reviewed-By: con
2010-06-25 12:58:07 +02:00
Oswald Buddenhagen
14fb0d0129
don't forget to initialize the parser statics outside threading context
2010-06-21 15:21:23 +02:00
Jarek Kobus
f09d74271c
Implement (un)commenting selection of .pro files
...
Reviewed-by: Leandro Melo <leandro.melo@nokia.com >
Task-number: QTCREATORBUG-119
2010-05-25 16:18:16 +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
c30d18b51a
Add mobile Qt gui wizard
2010-03-30 16:55:30 +02:00
Tobias Hunger
64bba7eda0
Add simple unit tests for abld parser
2010-03-29 19:42:13 +02:00
Alessandro Portale
15cc297052
Fix a broken user visible path on Windows.
...
Use native directory delimiters when showing a path to the user.
Reviewed-by: TrustMe
2010-03-28 22:02:28 +02:00
Thorbjørn Lindeijer
5e68c2afb8
Don't create Welcome mode pages when there is no Welcome mode
...
Fixes creating these pages unnecessarily when the Welcome plugin is not
loaded, as well as "leaking" them in that case.
Reviewed-by: con
2010-03-22 13:13:33 +01:00
Friedemann Kleint
bbcacaf59f
Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4.
2010-03-18 10:59:06 +01:00
Friedemann Kleint
f66df7b9a6
Header cleanup in ProjectExplorer and Qt4ProjectManager
2010-03-17 17:45:33 +01:00
Friedemann Kleint
1606cf1b33
Wizards/Custom Wizards: Add code.
...
Task-number: QTCREATORBUG-423
2010-03-12 11:20:32 +01:00
hjk
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
kh1
69ebf668ba
Return a reference to the object, changed from pointer.
...
Since we use addAutoReleasedObject we would rather unclean call the
class destructor.
2010-02-23 18:16:14 +01:00
ck
a40a3d84d5
Maemo: Enable compilation unconditionally.
2010-02-08 17:52:56 +01:00
Oswald Buddenhagen
1f088a70ba
make profile evaluator re-entrant
...
the last step was moving the statics to a common class which is
initialized at startup.
2010-02-08 17:24:18 +01:00
Oswald Buddenhagen
75b42f18d8
Merge remote branch 'origin/1.3'
...
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636
remove trailing whitespace
...
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +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
a6ad773722
Make method naming more consistent.
...
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
2010-01-07 18:17:24 +01:00
con
a54205c3a0
Mostly remove the special define for Symbian support.
...
The only part that is not done if not on Windows (or explicitly
specified) is the adding of the preference pane.
2009-12-17 18:01:41 +01:00
Friedemann Kleint
b9927f9998
Wizards: Add a simple wizard for unit tests.
2009-12-16 14:19:34 +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
Oswald Buddenhagen
f9d955eb6c
cache parsed pri & prf files
...
no point in re-parsing them over and over during the scan of a bigger
project ...
shaves off another 20% of the loading time of Qt 4.6.
2009-12-08 17:36:41 +01:00