Commit Graph

66 Commits

Author SHA1 Message Date
hjk
83e573f2ec use new id comparison operators to reduce line noise and save cycles
Change-Id: I2e7d81a4efb75877901d29964df4f71314e951b4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-06 10:37:43 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Daniel Teske
1ee7205a82 Cleanup more TODOs in ProjectExplorer
Those are just comments on the code, nothing to do.

Change-Id: I1daaa26eafd3d5f4da1d4be3eede9996ea87248f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-03 17:32:43 +02:00
Daniel Teske
f3d49692eb Sanitize environment for buildsteps
Remove the paths that qtcreator.sh adds to LD_LIBRARY_PATH.
The linker uses LD_LIBRARY_PATH as a fall-back to find libraries,
leading to confussing error messages.

Task-number: QTCREATORBUG-7285
Change-Id: I1a2ba86e39f4c417b192d4faea4714165fdb4aac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-02 12:21:01 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Tobias Hunger
52b47364de Use QUuids to identify tool chains
Save/Restore has been updated to reflect this:

We now save manual as well as auto-detected tool chains into the user
toolChains.xml file.

When loading we load the SDK as well as the user toolChains.xml files.
We then do a autodetection run. All the tool chains restored that are
marked up as auto-detected are then checked again:
 * the tool chain was autodetected again: Throw away the newly auto-
   detected tool chain and reuse the saved one. This makes sure we
   keep the QUuid that is now part of the tool chains id.
 * the tool chain was not autodetected again: Throw away the saved
   tool chain.
 * the tool chain was newly autodetected: Add the new tool chain

We keep the old id around in the legacyId() method. It is used when
loading old .user files only. So there is no need to implement this
method for new tool chains.

Task-number: QTCREATORBUG-6702

Change-Id: Ifc0a216e5351a8a57db03615ba329e355e7d5f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 12:25:40 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
443e77a47d Use QByteArray for variable names.
Less conversions, tighter code, less to type.

Change-Id: I38eb27ca17e6f1d98cdbc41fa003cbedf0f0bb34
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-10 23:55:48 +01:00
Jarek Kobus
f6e166e504 Make "Clean" and "Build" translated in "Add %1 Step"
Do the same as in case of "Deploy" string: after
restoring overwrite it with proper translated string.
Side note: tr("Build") and tr("Clean") have already
been used inside buildconfiguration.cpp so it will
not produce a new record in .ts file, i.e. this
change is not introducing a new message in string freeze
period.

Task-number: QTCREATORBUG-6595
Change-Id: I05040bba5066cbe0b55085cb2acbe43df34becd7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-11-22 14:56:23 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 13:47:33 +02:00
dt_
a078f71872 Add BuildConfiguration::disabledReason()
Not yet used.

Change-Id: I1f8763163e5f19e41d8e98517cf13d9bbb1e6ff8
Reviewed-on: http://codereview.qt.nokia.com/189
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-05-27 15:16:21 +02:00
dt
8e171e0be0 Qt Version refactoring
Split up target specific code into subclasses. Also change
Qt4BuildConfiguration to allow a null qtversion.

Remove code that relied on always having a qt version.
Also make it possible to remove all qt versions.

Completly change the qt in path autodetection to be only
a fall back if no configuration was found.

Note: For now the old settings are not removed, as such 2.2 and master
can coexist.

Reviewed-By: hunger
2011-05-12 12:23:06 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Tobias Hunger
bd14905953 ToolChain: Update build environment when changing tool chains 2011-04-19 11:43:28 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Tobias Hunger
ee4700d934 Handle tool chain configuration changes
Reviewed-by: dt
2011-03-24 15:45:31 +01:00
Tobias Hunger
3664d20507 Crash: Fix crash when removing a tool chain
Fix crash on trying to debug an application after the last
tool chain for the Qt version used was removed.

Task-number: QTCREATORBUG-4197
Reviewed-by: dt
2011-03-24 15:44:38 +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
dt
e505604b92 ProjectExplore: Introduce dis/enabling of buildconfigurations
The build actions are disabled if the buildconfiguration is disabled.
The deploy and run actions are disabled if deploying or running invokes
building automatically.

Qt4BuildConfigurations are disabled while parsing.

Task-Nr: QTCREATORBUG-2576
2011-01-19 15:47:00 +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
Oswald Buddenhagen
79be54ed8c replace env variable injection with pervasive expando support
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
2010-11-17 13:19:08 +01:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00
Tobias Hunger
747f750370 Set BUILDDIR and SOURCEDIR environment variables
Set BUILDDIR and SOURCEDIR in the build environment.

Reviewed-by: dt
2010-09-23 13:40:25 +02:00
Tobias Hunger
bfad59df64 Make cloning of BuildConfigurations work again
Task-number: QTCREATORBUG-2207
2010-08-30 12:26:27 +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
Tobias Hunger
b06d4017ca Build fix for mac 2010-08-02 14:29:32 +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
Tobias Hunger
1062c0ad8c Improve save/restore of buildsteps
* Inspect the BuildStep::Type enum for key names in fromMap/toMap

Reviewed-by: dt
2010-07-06 18:36:31 +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
dt
551114de27 Prevent removing buildsteps if the buildsteps are queued for building.
Task-Nr: QTCREATORBUG-1044
2010-04-13 16:38:11 +02: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
Thorbjørn Lindeijer
2a93b5401d Move build environment customization down to BuildConfiguration
The functionality was duplicated between the Qt4 and CMake build
configurations and their configuration widgets. This change moves it
down to BuildConfiguration, in addition also making it available for the
Generic Project.

Also provides an upgrade path for the configuration.

Task-number: QTCREATOR-24
Reviewed-by: dt
Reviewed-by: Tobias Hunger
2010-03-12 13:01:04 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thorbjørn Lindeijer
5c715fa11f Some small code style fixes 2010-02-25 16:49:43 +01:00
Tobias Hunger
8fe0cb2be9 Warn when failing to restore .user-file settings 2010-02-18 18:40:46 +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
Tobias Hunger
d2235489e8 Add accessor for (versioned) .user-file
* Add version number to .user-file.
 * Upgrade it from old versions.

Reviewed-by: dt
2010-02-01 12:23:15 +01:00
Tobias Hunger
16a7d5daa2 Make use of ProjectConfiguration in the BuildConfigurations
* Make use of the ProjectConfiguration base class in the
   BuildConfigurations and update the factories accordingly.

Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Tobias Hunger
1726688434 Make use of ProjectConfiguration class in BuildSteps
* Use new BuildSteps interface (as seen in ProjectConfiguration).
 * Use new factory to construct/clone/restore them.

Reviewed-by: dt
2010-02-01 12:23:12 +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
dt
14eb1f66e9 Remove BuildConfiguration::setValue/value 2009-12-08 17:59:21 +01:00
dt
9119853283 Make setDisplayName easier and break displayName signals
Fix for that will come later
2009-11-30 15:24:32 +01:00
dt
a312206306 Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things.
This compiles, more work is coming.
2009-11-30 15:24:31 +01:00
dt
7904544b84 Remove BuildConfiguration::name()
The pointers can be used to distinguish BuildConfigurations
2009-11-30 15:24:31 +01:00
dt
20214787d1 Add BuildConfiguration::restore and BuildConfiguration::project()
More API work.
2009-11-30 15:24:31 +01:00