Commit Graph

55 Commits

Author SHA1 Message Date
dt
0609b5b85d Qt4Projectmanager: Do not crash on importing projects without builds 2011-02-22 20:02:02 +01:00
dt
d5e89ceab3 Qt4TargetSetupPage: On adding a import dir, disable default builds
The user probably wants to have just his builds.
2011-02-22 15:35:24 +01:00
dt
06ee3aee7f Qt4ProjectManager: New TargetSetupPage
Rewrite the target setup page to look and baheve better.
Noteable better at:
- Disabling shadow building
- Deselecting whole targets
- Adding import directories

Api-wise, Targets derived from Qt4BaseTarget have two ways to customize
the targetsetuppage.

a) Reimplement availableBuildConfigurations
b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget)
   in their default implementation. (Or only slightly customize like
   the desktop target does.)

Or:
a) Make a dummy implementation for availableBuildConfiguration
b) Replace createTargetSetupWidget and return your own widget
   (It should match the look and feel from the other widgets.)
   It needs to be derived from Qt4TargetSetupWidget
c) Also replace the create create(... Qt4TargetSetupWidget) function
   and set up the target anyway you want.
2011-02-22 15:35:24 +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
Friedemann Kleint
7bd3bba6ee L10n: Tr-fixes for build configurations.
Remove duplicate code, proper messages, linguist comments.

Task-number: QTCREATORBUG-3821
2011-02-18 09:59: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
Pawel Polanski
051011bc37 Symbian: Adjust Creator to work with CODA
Reviewed-by: hjk
2011-01-14 14:21:06 +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
c0efa295af Qt4ProjectManager: set the displayname and icon on creating new projects
This code is still needed.
2010-12-07 15:41:35 +01:00
dt
95d7639bb7 Qt4: Move Qt4Target and Qt4BC out of the Internal namespace
Reviewed-By: hunger
2010-12-07 13:16:07 +01:00
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target
Reviewed-By: hunger
2010-12-06 14:15:06 +01:00
dt
f8073770ca Adding Target::supportsTargetId()
Reviwed-By: hunger
2010-12-06 14:15:06 +01:00
dt
7d926b475c Fix Qt4TargetFactory to claim the correct target ids.
Reviewed-By: hunger
2010-12-06 14:15:06 +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
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
Tobias Hunger
3d5ec35704 Make sure a display name is set for targets
* Make sure we have a display name set for targets when restoring
   from Qt creator 1.3.1 .user files.
2010-09-02 10:41:08 +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
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
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
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +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
ck
ce5e473438 Maemo: Move deploying to dedicated deploy step.
Reviewed-by: kh1
2010-07-13 16:27:50 +02:00
ck
6fc00ddca8 Maemo: Introduce deploy step infrastructure.
Doesn't do anything yet.
2010-07-13 10:35:16 +02:00
Tobias Hunger
54584044ca Add Deploy steps
* Add "Deploy" to BuildSteps::Type
 * Update UIs to handle deploy steps
 * Turn existing package creation steps from build type to deploy type
 * Move packaging steps into deploy steps when loading projects

Reviewed-by: dt
2010-07-06 18:36:32 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
2010-07-06 18:36:30 +02:00
Tobias Hunger
1d8e176067 Fix targetsetuppage's shadowbuild dirs
* Fix displayed shadow build location
 * Fix shadow build location used by newly set up shadow builds

Task-number: QTCREATORBUG-1599
Reviewed-by: dt
2010-06-08 17:01:18 +02:00
Tobias Hunger
69100c353c Add a special target for Qt simulator 2010-04-30 14:27:50 +02:00
dt
0bd06f1064 Work around to deep build directory.
Reviewed-By: hunger
Task-Nr: QTCREATORBUG-1036
2010-04-13 12:30:01 +02:00
ck
29e8e70b1c Add skeleton for Maemo package creation build step.
(No actual functionality yet.)

Reviewed-by: kh1
2010-04-06 16:57:29 +02:00
Tobias Hunger
745dc1c8a0 Fix logic to handle symbian special case
Reviewed-by: Roberto Raggi
2010-04-01 11:34:44 +02:00
Tobias Hunger
3c1f3f0b2c Add a customexecutablerunconfiguration if no others are available
This fixes a crash when creating a new target and then directly
switch into the run settings view.
2010-03-30 18:46:22 +02:00
Tobias Hunger
6c45e45488 Fix Release being displayed as Debug
* Simplify code a bit, too.
2010-03-29 17:12:48 +02:00
Tobias Hunger
d8f8ef68a0 Rework buildconfiguration setup in targets
* Allow for a more controlled setup of buildconfigurations inside
   the targets.

Reviewed-by: dt
2010-03-26 13:56:29 +01:00
con
8b2c18a762 Auto-add signing step for new symbian build configurations. 2010-03-25 16:35:50 +01:00
Tobias Hunger
092fd7c255 Enable shadow building by default for Qt4 projects
Reviewed-by: dt
2010-03-25 16:11:25 +01:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
dt
0d4fdd291a Use a type enum instead of duplicating functions between build and clean
That is e.g. buildSteps() and cleanSteps() --> steps(type)
2010-03-16 17:45:08 +01:00
dt
ab8fc52d0b Use exact and aysnc .pro file evaluate
This is a big change touching almost all of our .pro file parsing.
With this patch we only evaluate once exact for all needs and once
greedy for the filelist. That is the qt runconfigurations don't have own
evaluaters but reuse the project wide exact evaluation.

We reevaluate if the user changes the build directory, the qmake
buildconfiguration or the qmake arguments. That is if you open src.pro
(or projects.pro) of qt with a shadow build you still don't get all the
files, but after correcting the build directory, we reevaluate the .pro
files and find all files. So for a suitable definition of fixed, that
bug is now fixed.

We now get the exact defines of all .pro files instead of all defines for all
buildconfigurations. We still don't distinguish in which
.pro file a DEFINE is set. So the code model now knows about all the
defines set for the given configuration but not for which files it is
actually set. Also that includes all DEFINES set in .qmake.cache or the
mkspecs. This means all defines from .pro files should now work.

The intial loading is still synchronous. I haven't looked into it to
deeply, but it seems possible to make it also async.There are probably a
few issues which need to be solved fist.

Also due to the asynchronous nature of the code, the executable is
updated a few seconds after actually changing the build configuration
2010-03-10 17:02:24 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
07d025603c Remove Maemo emulator
* kh1 says there is no such thing as there is no technical
   destinction between Maemo devices and the Maemo emulator.

Reviewed-by: kh1
2010-02-26 14:16:42 +01:00
con
61d3c75a6b Add icons for the different targets. 2010-02-23 17:02:11 +01:00
con
04d90d9563 Show target overlay icon only in the active target button. 2010-02-23 16:52:44 +01:00
dt
c5cac92757 Simpler 2010-02-19 17:00:51 +01:00
Tobias Hunger
1ff0a7e03a Add target selection wizard to Qt4 projects 2010-02-17 17:13:23 +01:00
Tobias Hunger
bb20672a63 Actually propagate targetinformationchanged signal
* Fixes RunConfigurations not updating when changing something
   in the BuildConfiguration.

Reviewed-by: dt
2010-02-16 13:18:26 +01:00
Tobias Hunger
261966dbb7 Have qmakestep trigger the import label
* Do not use the BuildManager but have the qmakestep trigger
   the update via the target and project.

Reviewed-by: dt
2010-02-16 13:18:25 +01:00
Friedemann Kleint
dc006860c4 Symbian: Let SymbianDeviceManager handle TrkDevice leases.
...making use of a shared device by all clients. Detect device removal by
delaying the WM_DEVICE event handling. Introduce Acquire/Release mechanism
to SymbianDeviceManager and let acquire() fail if the device is in use, thus
preventing starting 'run' while debugging is active, etc.
Handle "Device removed" (unplugging of cable) signal by closing the device and adding
handlers to the clients, stabilize TrkDevice against it.
Remove communication type from the run configuration parameters (now handled by
SymbianDeviceManager).

Working towards keeping the Trk-connection always open and a giving the target pane
a meaningful tooltip.
For the moment, pass on tooltips from device manager additional information
(Trk version and such as determined by the launcher).
2010-02-11 12:31:59 +01:00