Commit Graph

148 Commits

Author SHA1 Message Date
dt
aa8e2e8e0f Allow relative paths in Build directories, Working Directories
Relative to the project's directory.
2010-09-17 15:32:41 +02:00
Tobias Hunger
d1c23f58a5 Preserve invalid Qt versions when loading a project
Now that we have 2.0 out we can be less strict when checking
project consistency when loading .user files.  The strictness
was necessary due to upgrading non-target projects to target
projects.

 * Allow for invalid Qt versions when loading a .user file that was not
   updated from the pre-target era.
 * Update the UI to show invalid Qt versions as invalid. Remove
   the Invalid version as soon as a valid one is imported.

This does preserve the buildsteps, too.
2010-09-13 18:17:51 +02:00
Friedemann Kleint
66ad76de4f I18n: tr-fixes. 2010-09-13 16:51:43 +02:00
dt
b68a57b23e Don't import QMLINSPECTOR_PATH qmake settings.
Task-Nr: QTCREATORBUG-2209
2010-08-30 16:47:34 +02:00
Tobias Hunger
b6f1dbeeb0 Remove obsolete ways to set the display name
* Now that there is a generic way to rename configurations:
   Remove individual renaming methods from all over the codebase

Reviewed-by: dt
2010-08-24 16:04:51 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
2010-08-23 16:00:24 +02:00
Tobias Hunger
ab494a07ad Fix warning about unhandled enum value in switch statement 2010-08-19 16:47:00 +02:00
Tobias Hunger
423686c0a9 Report project issues in the Project Mode window
* Add test for build- and sourcedirectories being at different levels

Reviewed-by: dt
2010-08-19 15:09:26 +02:00
Tobias Hunger
088e5fd5dc Fix lineedit becomming enabled at the wrong time
Task-number: QTCREATORBUG-2073
2010-08-17 17:47:46 +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
dt
d3ba80bfad Fix crash on importing
I can't fully explain the backtrace, but connecting to
qtVersionsChanged() in ::init() and not the ctor is the correct thing to
do.

Task-Nr: QTCREATORBUG-1653
Reviewed-By: hunger
2010-06-22 15:28:54 +02:00
Tobias Hunger
a269232df9 Update Qt version combobox
* Update the Qt version combobox whenever the buildconfig signals
   that its Qt version changed.

Task-number: QTCREATORBUG-1692
Reviewed-by: dt
2010-06-22 14:29:45 +02:00
dt
48d93e2f67 Correctly dis and enable shadow build line edit 2010-05-19 15:30:44 +02:00
dt
61e5ce374c Make Q4ProjecConfigWidget more robust
Task-Nr: QTCREATORBUG-1108
Task-Nr: TOOLS-339
2010-04-14 14:38:10 +02:00
Tobias Hunger
c7dcb72455 Only enable shadowbuilding widgets in the UI when that is supported 2010-04-13 16:37:50 +02:00
Tobias Hunger
1ca8cb2397 Introduce method to access the project directory
... use it.

Reviewed-by: dt
2010-03-25 14:21:43 +01:00
dt
f8db7aca18 Warn the user against building in a subdirectory of the source directory
Reviewed-By: hunger
Task-Nr: QTCREATORBUG-670
2010-03-23 16:35:58 +01:00
dt
2d5f60d6de Sanitize input for shadow build path chooser
Reviewed-By: hunger
2010-03-23 16:35:58 +01:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +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
Friedemann Kleint
f87f421011 tr()-Fixes 2010-02-25 17:15:30 +01:00
Tobias Hunger
9087e2ff86 Fix display of import label
* If the qmake path does match then the target does match, too.
2010-02-24 14:45:04 +01:00
Tobias Hunger
a3432b437b Fix shadowbuild changing state in project mode 2010-02-17 17:13:24 +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
Tobias Hunger
1aa3ec58a9 Fix initialization of toolchain combobox in Qt4project
* Initialize it to the toolchain used, not the preferred one
2010-02-16 11:16:48 +01:00
Tobias Hunger
29e60baf8e Update import label when rebuilding
* Update the import label (and related stuff) whenever the
   project was rebuild.
2010-02-12 13:02:56 +01:00
Tobias Hunger
0d9fb90c3c Fix a typo 2010-02-12 13:02:55 +01:00
Tobias Hunger
dbe7f66caf Change text around. 2010-02-11 18:03:58 +01:00
Tobias Hunger
5dffd4f7c4 Warn on import of a build into a wrong target 2010-02-11 11:48:41 +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
con
255348643e Remove the summary part from the most commonly used project configuration pages.
Reviewed-by: dt
2010-02-01 18:34:46 +01:00
dt
e3188417c3 Don't silently reset the qt version if it has become invalid
Instead note that it is invalid if trying to build and on the projects
mode pane.

Task-Nr: QTCREATORBUG-459
2010-01-12 15:51:11 +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
046dd5d902 Fix bugs with editing the shadow build settings
Resetting the cursor to the end of line and resetting the line edit on
changing the shadow build checkbox
2009-12-10 19:21:34 +01:00
dt
a84ebd1299 Fix show/hide of importing label 2009-12-08 14:07:15 +01:00
dt
b63e6e939d Make BuildConfiguration::setValue and ::value protected 2009-12-07 15:55:41 +01:00
dt
1e46cb424e Rework connections on the project pane for Qt4Projects.
Should fix a lot of corner cases, might introduce a few bugs.
Also rename functions/slots to be better named.

Generic Project Manager and CMake Project Manager are missing from this
patch.
2009-12-07 15:00:17 +01:00
dt
3565fe4e82 Fix always to end of line jumping cursor in MakeStepConfigWidget
Also rename some methods/signal to make clearer that those only are
relevevant for user changes not for all arguments.
2009-11-30 19:33:14 +01:00
dt
16fcb82d08 Fix signal names and also ensure that we don't reset the cursor position 2009-11-30 17:21:59 +01:00
dt
d6d48fa23c Some cleanup after BuildConfiguration refactoring 2009-11-30 15:24:32 +01:00
dt
6e01bf6070 Move extractSpec and removeSpec to Qt4BuildConfiguration 2009-11-30 15:24:32 +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
801e9948f5 Hide static cast in accessor methods 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
ae633c1956 Add BuildConfiguration classes
Each project has it's own BuildConfiguarion * classes, they'll get a
decent type safe interface and the setValue/value stuff will be removed.
2009-11-30 15:24:31 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id.
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
2009-11-27 16:12:12 +01:00
dt
0d162be22f Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
2009-11-19 16:36:48 +01:00
dt
72fe54db77 Remove value(name) and setValue(name, value) from BuildStep 2009-11-19 16:35:19 +01:00