Commit Graph

58 Commits

Author SHA1 Message Date
Pawel Polanski
803add0e61 Symbian: Platform returned by the S60Manager::platform is now valid 2011-02-28 11:26:17 +01:00
Friedemann Kleint
75f4b9cf25 Debugger: Add toolchain combos to start dialogs, refactor detection.
Add combo box listing toolchains with debuggers to start external,
attach and core.
Another attempt at streamlining engine detection:
Split in detection functions that first collect a list of
available engines by preference, then remove disabled and
wrongly configured engines and use the remaining best.
matching. checkconfiguration is now the central place where
engine detection and config check takes place.

Rubber-stamped-by: hjk
2011-02-24 16:50:15 +01:00
hjk
a8ae618d75 toolchain: fix enum naming style
Reviewed-By: Tobias Hunger
2011-02-23 17:56:33 +01:00
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
Pawel Polanski
e48f520999 Symbian: Separating CODA's and TRK's RunControl
Reviewed-by: Tobias Hunger
2011-01-21 11:14:49 +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
Friedemann Kleint
a7eccce733 Debugger: Header cleanup 2011-01-10 10:14:23 +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
Tobias Hunger
7169bfff39 Symbian: Introduce RVCT 4 toolchain
Task-number: 2481
2010-11-26 15:07:39 +01:00
dt
6683b40844 ProjectExplorer + Debugger: Move Debug Action to the Debugger plugin
Since all the debuggers are implemented in the debuggerplugin, that's a
natural place to put the action.
2010-11-12 20:18:29 +01:00
hjk
2161e0f6d9 debugger: refactoring of the plugin interface
There's  some 'external' and some 'internal' part now. Other plugins
are only supposed the external interface.
2010-11-10 12:08:23 +01:00
Friedemann Kleint
a82d57de8a Qt4ProjectManager/Symbian: Header cleanup. 2010-11-03 10:03:48 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01: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
hjk
6a6cba5518 debugger: The DebuggerEngine refactoring.
This replaces the (de facto) singleton engines and data handlers by classes
that are instantiated per run. The DebuggerRunControl will now create an
object of (a class derived from) DebuggerEngine that contains all the relevant
"dynamic" data.

DebuggerManager is no more. The "singleton" bits are merged into DebuggerPlugin,
whereas the data bits went to DebuggerEngine.

There is no formal notion of a "current" DebuggerEngine. However, as there's
only one DebuggerEngine at a time that has its data models connected to the
view, there's still some "de facto" notion of a "current" engine. Calling
SomeModel::setData(int role, QVariant data) with custom role is used as the
primary dispatch mechanism from the views to the "current" data models
(and the engine, as all data models know their engine).
2010-06-22 10:59:57 +02:00
dt
f4ea0d79b9 Add a runMode method to the RunControl
And use it to implement changing the run icon in the application output.
That implementation does only support the two run modes run and debug
for now. Further abstraction for more run modes to be done once needed.

Task-Nr:   QTCREATORBUG-1232
2010-05-03 11:25:09 +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
Friedemann Kleint
fbfa825535 Symbian/Linux: Remove GnuPoc autodetection code
and make it possible to configure it in the settings.
Split up S60Devices up into a class hierarchy and implement
the Autodetected Windows case and the manually configured
Linux case separately for code clarity. Same with the settings
widgets.
Reviewed-by: con
2010-04-14 15:53:35 +02:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
cd53a562e8 Symbian: Check for /dev/ttyUSB, fix GCCE toolchain.
Move code to locate gcce from S60Manager to CCE toolchain and make it
handle empty GCCE-root's correctly (locate compiler in path and
warn if none found). Set up environment correctly.
2010-02-18 10:22:50 +01:00
Friedemann Kleint
7c9c99dcf0 Symbian/Linux: Enable building with makefile-based system.
- Autodetect SDK by environment variable EPOCROOT and qt directory
below.
- Environment::appendOrSet/prependOrSet: Avoid duplicate entries
- Rename toolchain enumeration value
- Adapt S60ToolChainMixin to new GnuPoc setup, provide routines for
  all required variables.
- RVCTToolChain: Make RVCT detection smarter (Check for RVCT<v1><v2>BIN
  variable). Set all required variables in case of RVCTToolChain/GnuPoc
- QtVersionManager: Detect toolchain and Qt version properly, make S60
  device run config accept toolchain.
- Modify S60DeviceRunControl to execute 'make sis'
- Modify S60Devices::detectQt...() to check for Qt installed into SDK
  first and symlink as fallback.
2010-02-17 17:38:48 +01:00
con
e5d3e04c60 Also handle EPOCROOT and default device settings for Symbian devs. 2010-02-12 11:57:30 +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
76872c6ed8 S60: Move serialdevicelister.cpp to symbianutils/symbiandevicemanager.cpp 2010-02-05 17:34:02 +01:00
Friedemann Kleint
a8ce2ce037 S60: Rework SerialDeviceListener.
Change it into a singleton that listens for device changes
and emits signals when devices are added or removed.
2010-02-05 17:21:29 +01:00
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations
Reviewed-by: dt
2010-02-01 12:23:13 +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
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
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
Friedemann Kleint
e35a754dc9 S60: Work towards new toolchains
Factor out the initialization setting up the environment and headers in
the RVCT/GCCE toolchains.
Modify the RunControl to be able to support different package
building/signing processes.
2009-11-13 15:47:35 +01:00
Tobias Hunger
e0b27ef72e Add build parsers for S60.
This is a initial version including
 * ABLD error parsing
 * RVCT compiler output parsing.

Reviewed-By: con
2009-11-09 14:57:45 +01:00
Friedemann Kleint
f4943f3c2e Debugger/various plugins: Fix memory leaks.
Reviewed-by: hjk <qtc-committer@nokia.com>
Reviewed-by: dt <qtc-committer@nokia.com>
2009-11-04 17:11:35 +01:00
con
4fc6a17d94 Add setting for GCCE tool chain path. 2009-10-29 16:02:20 +01:00
Friedemann Kleint
d749c1dc71 S60: Provide a message box prompting to start TRK
... with cancel, similar to the Bluetooth connect box.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2009-10-29 12:48:12 +01:00
con
7c12dad4a0 Make it possible to use non-autodetected Qt for Symbian.
Users can specify a S60 SDK root for Qt for Symbian versions
now.
2009-10-27 18:01:21 +01:00
hjk
5523c77eac fix a few license headers 2009-10-12 18:32:08 +02:00
con
8a0739813e Fix bug when detecting S60 SDKs the first time. 2009-10-09 20:11:54 +02:00
Friedemann Kleint
5cd639747a S60: Split run configurations
creating a debug run configuration. Import the debugger
into Qt4ProjectManager.
2009-09-28 17:17:11 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
Daniel Molkentin
5476bcf560 Find Qt installation by specification of qmake rather than a "Qt dir".
Rationale: The concept of a "Qt Dir" is dead ever since Qt can be
installed. Specifying the qmake location otoh makes it possible to
unambigously detect all parts of a Qt installation.
2009-09-03 19:16:40 +02:00
dt
ead627ed81 Remove dependency of rvct toolchain and gcce toolchain on qt4project.
Also makes the code a lot smaller.
2009-09-03 16:07:14 +02:00
Friedemann Kleint
37055c0457 S60: Compile on Linux 2009-08-17 11:47:17 +02:00
con
fe92b40f45 Start on rvct support.
It works, except that the code model doesn't get the rvct include
directories and defines yet. And you need to have everything for
rvct set up in your environment.
2009-08-05 17:08:15 +02:00
con
a61d3f90e4 A bit refactoring and make S60 Qt detection more flexible. 2009-08-04 10:11:11 +02:00
con
036e220700 Find out when devices get connected / disconnected.
And adapt the device selection list.
2009-07-31 17:05:39 +02:00