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
Pawel Polanski
f78058beda
Symbian: Fixed crash related to the not responding TRK
...
Task-number: QTCREATORBUG-3349
2010-12-17 10:35:36 +01:00
Pawel Polanski
c39d7cf1cf
If no Symbian device is connected a Build Issue is generated
2010-12-02 11:48:00 +01:00
Pawel Polanski
bc466562ec
If no Symbian device is connected the deployment process will be skipped instead of aborting the whole build.
2010-12-01 14:06:55 +01:00
Friedemann Kleint
a82d57de8a
Qt4ProjectManager/Symbian: Header cleanup.
2010-11-03 10:03:48 +01:00
Pawel Polanski
7d8a5423a2
Improved deployment information for Symbian
2010-09-09 14:04:54 +02:00
Tobias Hunger
616a9b13f0
Enable restoring the default names of project configuration items
...
* Enable support for this in all ProjectConfiguration items
(Targets, projects, BCs, DCs, RCs, etc.). This is nicer
than having custom code in individual configuraiton items.
Reviewed-by: dt
2010-08-24 16:04:51 +02:00
Pawel Polanski
6e90b51937
Removed unnecessary launch process from S60DeviceDebugRunControl for Symbian
...
Bug QTCREATORBUG-2088 has been fixed
Task-number: QTCREATORBUG-2088
Reviewed-by: Friedemann Kleint
2010-08-20 10:49:44 +02:00
Pawel Polanski
ace96f3fc3
Deploy related data has been moved from Run-Configuration into Deploy-Configuration. Symbian OS
...
Reviewed-by: Tobias Hunger
2010-08-16 17:16:20 +02:00
Pawel Polanski
053cf85569
Cannot connect to the TRK in some specyfic cases - fixed
2010-08-05 15:44:23 +02:00
Pawel Polanski
8e2c274d53
Application is not launched if an error occurred during deployment for Symbian OS
...
Reviewed-by: Tobias Hunger
2010-08-05 15:44:22 +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
Pawel Polanski
dc613c013d
Fixed: Creator crashes when trying to deploy to a non existing device
2010-07-30 08:25:12 +02:00
Pawel Polanski
1162b09af7
Creation od "Copy Destanation" path for sis package has been fixed
2010-07-27 09:11:58 +02:00
dt
05ae17eadd
Fix subdir project deployment for symbian
...
We create a .sis package per leaf project now, deploy all of them and
start the executable for the runconfiguration that was selected. This
does not cover all use cases, but works for development.
2010-07-26 19:44:07 +02:00
Pawel Polanski
1a820256b1
User installation has is launched if silent one fails. For Symbian OS
2010-07-26 15:16:56 +02:00
Pawel Polanski
c7278acda0
Installing on a drive other than C: for Symbian OS
...
Silent installation added to Sumbian's Run Configuration UI
Reviewed-by: Tobias Hunger
2010-07-26 13:32:03 +02:00
Pawel Polanski
d1870e215b
Creator crashes while Carbide has ownership over serial connection and Creator wants to use it as well
...
Reviewed-by: Tobias Hunger
2010-07-23 15:50:00 +02:00
Pawel Polanski
3114c47c6e
Fixed warnings
2010-07-23 11:31:00 +02:00
Tobias Hunger
0340d6ad8b
Another build fix for linux
2010-07-22 13:08:25 +02:00
Tobias Hunger
345c0c941d
Build fix for linux
2010-07-22 13:07:13 +02:00
Pawel Polanski
647b91c78f
Refactor deployment for Symbian OS
...
* Add buildstep to handle the deployment
* Remove deployment code from the runconfiguration
* Update .user files to add new deployment step into existing setups
Reviewed-by: Tobias Hunger
2010-07-22 11:07:58 +02:00
