Commit Graph

110 Commits

Author SHA1 Message Date
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
f6cd2493be Set parents on objects
... otherwise we might leak memory
2010-02-23 14:34:15 +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
Tobias Hunger
b58297fe25 Use the ProjectConfiguration's displayNameChanged signal
Reviewed-by: dt
2010-02-16 13:18:25 +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
ck
a40a3d84d5 Maemo: Enable compilation unconditionally. 2010-02-08 17:52:56 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues.
QString: Use QChar/char where appropriate, do not use QString::null
2010-02-02 17:09:41 +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
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations
Reviewed-by: dt
2010-02-01 12:23:13 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +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
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
dt
a755717649 In the EnvironmentWidget show which environment is the base.
Task-Nr: QTCREATORBUG-277
2009-12-14 13:40:17 +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
Oswald Buddenhagen
3657acac5f move various functions from Qt4PriFileNode to Qt4ProFileNode
findProFileFor(), buildDir() and createProFileReader() make sense only
in relation with an actual pro file anyway, so move them there.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
9ba6f06af7 don't call setQtVersion() - createProFileReader() already does it 2009-12-08 17:36:40 +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
con
f3bdeb8c9a Share the code for determining used qmake arguments.
Move the code that compares the Qt version's debug|release property
with the build configuration's debug|release property
to the new build configuration class.

Reviewed-by: dt
2009-12-02 18:16:34 +01:00
dt
675e0b2e52 Disable connects that currently don't work 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
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
con
43bccb41ed Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
2009-11-11 16:14:29 +01:00
mae
a0bb57f27a remove run action in the scripteditor
the action is not needed and conflicts with Ctrl+R of the project
manager.
2009-11-09 17:36:17 +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
6039c31133 Show a dialog in case of mismatching build/run configurations. 2009-10-29 16:02:22 +01:00
ck
6a49395e33 Add experimental Maemo support.
Includes Maemo tool chain, run configuration, run control,
manager, etc.

Adds the DebuggerManager to the object pool. This is ugly, but
nobody came up with anything better on short notice. To be
refactored.

Co-Authored-By: kh1
2009-10-16 18:01:07 +02:00
ck
6f5158fa8f Refactor conditional for clarity ...
... and diff-reduction to Maemo branch. :)

Real-Author: ossi
2009-10-16 18:01:07 +02:00
Friedemann Kleint
b2924aa66b I18n: Tr()-fixes 2009-10-12 12:33:12 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
dt
a97dcb53d1 Tweaks to the project page. 2009-10-01 14:25:27 +02:00
con
acbd4513e3 Changing string based api to BuildConfiguration based api.
Builds, but I'm pretty sure it doesn't *work* :)
2009-10-01 10:05:05 +02:00
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII
.. and purge unneeded includes.
2009-09-29 11:39:55 +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
dt
a46c18ba41 Set margin to zero everywhere on the project pane.
Makes the project pane look nicer.
2009-09-23 17:16:09 +02:00
dt
a86fc8aa23 Remove unused member variable, potentially saving up to 120 bytes. 2009-09-23 17:06:23 +02:00
con
97df3b6cca Build fix for Mac OS X. 2009-09-17 15:12:09 +02:00
dt
65648ee17a The project pane rewrite version 2.
This splits up the edit and active settings. Let people try it and
report usability problems. I'm not 100% convinced of the layout either.
2009-09-17 13:59:10 +02:00
dt
f4c10deeb3 Fix parsing of .qmake.cache Fixes DESTDIR for debug_and_release_targets
Closer again to qmake, ossi won't like it, but this is exactly what
qmake does, even it it looks a little bit strange. He can come up with
a better fix after he is back from vacation.
2009-09-01 15:59:12 +02:00
dt
f862a034c0 Do some more checks, maybe one of them is the reason for a crash. 2009-08-28 17:20:37 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
39913b3216 Fix "TARGET=" in .pro files
Default to the baseName() of the .pro file.
2009-08-13 17:18:42 +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
45d2fd0797 Make the show/hide environment details buttons stay at same place. 2009-07-23 17:23:26 +02:00
con
bf64a1aeb4 Fix more margins. 2009-07-23 17:23:26 +02:00