Commit Graph

126 Commits

Author SHA1 Message Date
Kai Koehne
6f11765dae Qml: Allow user to configure port used (all project types)
Reviewed-by: dt
2010-09-03 12:29:41 +02:00
Lasse Holmstedt
8c39471081 Debugger languages are now runconfiguration dependent
There's a UI in qml/customexec/cmake/qmake run configs for choosing the
debugger languages (C++ and QML). The default for all except .qmlproject
is only C++, so default debugging behavior is the same. However, if the
user wants to do simultaneous debugging with two languages, or only
debug QML, they can select the languages from Run Settings and it will
be remembered.

Reviewed-by: hunger
2010-09-01 11:35:36 +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
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
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +02:00
dt
7862e31256 Refactor OutputFormatter
Move link handling code to outputwindow from OutputFormatter

Move createOutputFormatter to the RunConfiguration

That makes it easier for Qt4RunConfiguration et all.
This also fixes that each time a runcontrol was rerun a new
OutputFormatter was created without deleting the old one, thus
increasing the memory usage.
2010-07-14 13:01:43 +02:00
ck
ad02e86e7a Qt4Projectmanager: Constify some member functions.
Reviewed-by: dt
2010-07-07 10:57:08 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.
Reviewed-by: ossi
2010-05-14 15:53:56 +02:00
Thorbjørn Lindeijer
2ab7d2eafc Some documentation comment formatting and a rename
Renamed RunConfiguration::configurationWidget to
createConfigurationWidget.

Reviewed-by: dt
2010-04-16 13:31:22 +02:00
dt
3de0668894 Linux icc parser
Reviewed-By: hunger
2010-04-12 15:05:11 +02:00
dt
9ddd7a59d7 Revert "Progress so far"
This reverts commit b1a121c54f.

Accidentally pushed the linux icc parser before it was ready.

Conflicts:

	src/plugins/qt4projectmanager/qtversionmanager.cpp
2010-04-08 10:49:20 +02:00
dt
b1a121c54f Progress so far 2010-04-07 13:51:07 +02:00
dt
a67e88993b Add LIBS-paths to PATH before running on windows.
On windows when linking to a library via -L/some/path, the library is
found in /some/path while linking. But running that app fails, since it
can't find the library. We now adjust PATH to include all paths from
LIBS and thus the library is found.
2010-03-29 15:17:19 +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
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +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
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