Commit Graph

94 Commits

Author SHA1 Message Date
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
dt
f1dfb3c6ce Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-07-22 19:18:09 +02:00
con
3378b18f6f Corrected field growth policies. 2009-07-22 18:18:13 +02:00
dt
406d853e2b Move the qmake config settign into qt4project.
One less need for qmakestep.
2009-07-21 14:50:54 +02:00
dt
c18d1b3153 Add missing save and restore calls.
Task-Nr: 257765
2009-07-21 13:27:33 +02:00
dt
e76e439215 Some tweaks to make the build settings page look better on windows 2009-07-20 16:50:05 +02:00
dt
abeb450467 Show a summary widget instead of the full blown environment model.
Hides the gory details, and in most cases the user doesn't care anyway.
2009-07-20 15:46:11 +02:00
dt
269fe7f182 New build and run settings ui.
Not finished 100%
2009-07-17 17:25:43 +02:00
dt
54bbcc4a7c Mention possible locations of the debugging helper in the error dialog
Requires a lot of trivial forwarding.
2009-07-15 17:41:45 +02:00
Michael Karcher
a39d7e8d12 Fix test for debug_and_release_target
This is a fix for a446491ae8.
The option debug_and_release determines whether the debug/ and release/
subdirectories are used to put *object* files there. The option
debug_and_release_target is used to put the final taget into debug/
and release/ directories.

Merge-request: 745
Reviewed-by: dt <qtc-committer@nokia.com>
2009-06-30 14:56:26 +02:00
con
936ba4c070 Make target information update also for non-Qt4RunConfigurations
Transform the method in Qt4Project into a signal that is handled
by the run configurations themselves.
2009-06-24 13:41:49 +02:00
con
07187e0a80 Custom signature support.
Not able to give it an additional passphrase yet, though.
2009-06-24 13:41:48 +02:00
con
a9bb3a03df Separate active run config setting in project mode.
And add a sort of isEnabled functionality for run configs.
This doesn't do much yet though, and is not updated correctly either.
2009-06-24 13:41:44 +02:00
con
a3a7c27d5d Make QtVersion's toolchain variable.
QtVersion provides possible toolchains that can be used by the
Qt version, e.g. winscw, gcce and armv5 for symbian-abld.
2009-06-24 13:41:39 +02:00
dt
2d65dec3e9 Add a toolChainType() method to the ApplicationRunConfiguration.
Best effort only though. This can make detection in the debugger which
engine should be used easier.

Task-Nr: 256161
2009-06-17 19:06:17 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
dt
a446491ae8 Fixes identifing the right WD for .pro chaning debug_and_release
CONFIG+=debug_and_release not working on linux and
CONFIG-=debug_and_release not working on windows.
The logic should be now correct. That is the profile reader reads the
values that are set for the qt build, gets qmake arguments which we
might pass on the command line and reads the .pro files, and in the end
we are interested what CONFIG contains. Patch from Michael Karcher

Task-number: 254925
2009-06-16 14:14:21 +02:00