Commit Graph

148 Commits

Author SHA1 Message Date
dt
60c8686ed8 Add the precompiled headers to the project info
QMake passes those headers directly to gcc, so the user doesn't need to
include themselves.
2010-01-12 13:19:15 +01:00
dt
8b3350286e Disable parts of Qt4Project::updateCodeModel that aren't used atm. 2010-01-12 13:19:14 +01:00
dt
661314742e Simplfy code for finding the right target/executable
Reviewed-By: con
2010-01-11 15:35:14 +01:00
Tobias Hunger
592e494d1a Fix typos
Reviewed-by: thorbjorn
2010-01-11 10:26: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
1c1394c1eb Unify the common part for extracting the Qt project target info.
This code was (more or less) duplicated in 4 places.
2009-12-22 15:58:55 +01:00
dt
6cdb58aac2 Fix bug introduced by refactoring of BuildSteps
setClean(true) doens't imply a clean argument anymore. (To make it user
configurable.)

Reviewed-By: owolff
2009-12-14 14:53:46 +01:00
dt
14eb1f66e9 Remove BuildConfiguration::setValue/value 2009-12-08 17:59:21 +01:00
Oswald Buddenhagen
f9d955eb6c cache parsed pri & prf files
no point in re-parsing them over and over during the scan of a bigger
project ...

shaves off another 20% of the loading time of Qt 4.6.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
ef660880ad make ProFileOption persist during the scan of an entire project
there is no point in throwing away and re-recreating invariant data over
and over ...

shaves off ~15% of the load time of Qt 4.6.
2009-12-08 17:36: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
Friedemann Kleint
087e72499e Designer: Prepare re-implementation of "Goto Slot".
...making use of the new code model features. Move code to
separate file. Make it possible to obtain path to generated
header file from project manager.
2009-12-03 16:23:15 +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
a741261f10 Fist set the display name then addBuildConfiguration on clone 2009-11-30 15:24:33 +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
60a1ee12ba Remove project() from BuildStep
The project() should in most cases not matter, instead the
BuildConfiguration should. This shows all the information that needs to
move into the BuildConfiguration classes.
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
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
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
dt
0fa60aa3d8 Use QFlags<> for QmakeBuildConfig that removes a few casts. 2009-11-19 16:35:19 +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
dt
5c14507506 Remove Debugging output 2009-11-11 18:48:53 +01:00
dt
aa9329e738 More fixes for windows 2009-11-11 15:59:25 +01:00
dt
75e23cc58f Fix -spec handling 2009-11-10 13:29:13 +01:00
con
c8bb7e174b Merge commit 'origin/1.3'
Conflicts:
	src/plugins/qt4projectmanager/qt4project.cpp
2009-11-04 19:15:14 +01:00
Roberto Raggi
093a309dab Revert "This ordering for include directories is more correct"
This reverts commit 9891267a92.
2009-11-04 12:51:02 +01:00
con
fa34847571 Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
2009-11-03 18:08:01 +01:00
dt
9891267a92 This ordering for include directories is more correct
Though likely to be still wrong.
2009-11-02 16:57:44 +01:00
con
3e81572b8a Merge commit 'origin/1.3' 2009-10-30 17:22:01 +01:00
dt
4798ec5529 On qt version change updat qmakestep config widget
That is the effective qmake command and summary label.
2009-10-29 19:42:56 +01:00
con
be3fafc311 Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5'
Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2009-10-29 18:54:17 +01:00
con
f0f213263e Pre-fill build configuration name when adding one. 2009-10-29 16:02:23 +01:00
con
6039c31133 Show a dialog in case of mismatching build/run configurations. 2009-10-29 16:02:22 +01:00
dt
7fc6a0ecc8 Update the makesteps the summary on build directory changes
Also ensure that Qt4ProjectConfigWidget does not emit any signals from
it's init method.
2009-10-29 12:38:50 +01:00
con
bac9c64f93 Merge commit 'origin/1.3' 2009-10-26 15:48:26 +01:00
Thorbjørn Lindeijer
cd3435a983 Don't needlessly call updateProjectInfo()
Should not be necessary when nothing changed in the project info. This
also fixes a problem where include file scanning happened twice after
saving a pro file.

Reviewed-by: Roberto Raggi
2009-10-26 15:34:12 +01:00
dt
8a9d4315e6 Fix crash by sharing ownership of the toolchains in qtversion 2009-10-22 17:09:28 +02:00
dt
cfc7040ede The qtversions's toolchain now depends on the actual compiler not mkspec
That is we actually parse the mkspec and evaluate QMAKE_CXX (and a few
other variables) to figure out the correct mkspec. This makes using
custom mkspecs easier and is also cleaner. I also changed mkspec() and
mkspecPath() to behave a little diffrent, essentialy mkspec() will
return only the name (the actual dir name) of the mkspec. That is in
general not sufficient for passing on to qmake. mkspecPath() only
returns the correct path to mkspecs/default.
Hopefully I haven't broken WinCE/Maemo/MinGW.
2009-10-22 14:39:00 +02:00
dt
20767b79a4 This variable is only used on mac, so move it into the #ifdef block 2009-10-21 13:50:31 +02:00
con
d500ceacf2 Add both "debug" and "release" build configurations, not only "release".
Reviewed-by: dt
2009-10-09 18:15:45 +02:00
dt
ee92e82cb8 Fix bug with importanting a build with an not yet existing qt. 2009-10-06 17:16:18 +02:00
con
4252836b4d Fix windows build. 2009-10-01 10:05:06 +02:00
con
92b905a6f2 Build configuration factory now adds configurations directly.
It's easier this way for the unique naming.
2009-10-01 10:05:06 +02:00