Commit Graph

239 Commits

Author SHA1 Message Date
dt
a1760fc84a Fix lots of QFileSystemWarnings about empty lists
Also only watch folders not files.
That also removes files that are directly listed in INSTALLS /
DEPLOYMENT, I'll readd them in a later commit.
2010-08-12 13:38:34 +02:00
dt
b02add2490 Add QML folder in project tree, show files there
Use the full path for folders to sort in the project tree.

For virtual folders ensure that the path ensures the sorting we want.

Reviewed-By: kkoehne
2010-08-11 12:10:43 +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
05ae17eadd Fix subdir project deployment for symbian
We create a .sis package per leaf project now, deploy all of them and
start the executable for the runconfiguration that was selected. This
does not cover all use cases, but works for development.
2010-07-26 19:44:07 +02:00
Tobias Hunger
e033bd6ae7 Stop warnings on using QFileInfo without proper filename
* Stop warnings about using QFileInfo without a proper filename.

   Turns out that the filename of the project can still be empty
   when calling these methods from the new project wizard (before
   the first page is done).
2010-06-30 13:31:09 +02:00
Oswald Buddenhagen
7d962189ae make ProMessageHandler connect directly to the message manager
that way the users don't have to duplicate the connect everywhere.
as a side effect, MaemoPackageContents will have error reporting now.
2010-06-18 21:23:09 +02:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
2010-06-18 16:54:37 +02:00
Oswald Buddenhagen
13bb14dd3c error message delivery threading fixes
the message manager is not thread-safe, so don't use it outside the main
thread.
2010-06-18 13:21:18 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
2010-06-11 16:30:39 +02:00
dt
cdbb7c6a85 Remove Qt4 runconfigurations again which don't work.
Task-Nr: QTCREATORBUG-1593
2010-06-10 14:50:21 +02:00
Tobias Hunger
b099596858 Fix targetsetuppage's shadowbuild dirs
* Fix displayed shadow build location
 * Fix shadow build location used by newly set up shadow builds

Task-number: QTCREATORBUG-1599
Reviewed-by: dt
(cherry picked from commit 1d8e176067)
2010-06-10 11:00:00 +02:00
Tobias Hunger
1d8e176067 Fix targetsetuppage's shadowbuild dirs
* Fix displayed shadow build location
 * Fix shadow build location used by newly set up shadow builds

Task-number: QTCREATORBUG-1599
Reviewed-by: dt
2010-06-08 17:01:18 +02:00
dt
9bc9fe73e1 File renaming
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
2010-05-12 14:14:44 +02:00
dt
f093d0806b Cancel code model indexing on project closing and full code model update
Task-Nr: QTCREATORBUG-1151
2010-04-26 12:29:50 +02:00
con
b4367cb9a0 Some naming of the progress indicators. 2010-04-14 12:59:30 +02:00
dt
e4d5d004b3 Fix creating of projects 2010-04-07 13:51:07 +02:00
Tobias Hunger
41a91ff9d2 Remove customexecutable RCs again if they are unused 2010-03-31 12:01:53 +02:00
Tobias Hunger
c01122fa89 Fix shadowbuild location 2010-03-29 16:49:57 +02:00
dt
a3f827b1b8 Remove isApplication() and simplfy startup project logic 2010-03-25 17:36:39 +01:00
Tobias Hunger
092fd7c255 Enable shadow building by default for Qt4 projects
Reviewed-by: dt
2010-03-25 16:11:25 +01:00
Tobias Hunger
1ca8cb2397 Introduce method to access the project directory
... use it.

Reviewed-by: dt
2010-03-25 14:21:43 +01:00
con
d6061a23e1 Refactor the externally modified file handling
Reviewed-by: dt
2010-03-22 16:01:55 +01:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
dt
b5f8d7af7f Remove debugging output. 2010-03-12 15:12:46 +01:00
Thorbjørn Lindeijer
2a93b5401d Move build environment customization down to BuildConfiguration
The functionality was duplicated between the Qt4 and CMake build
configurations and their configuration widgets. This change moves it
down to BuildConfiguration, in addition also making it available for the
Generic Project.

Also provides an upgrade path for the configuration.

Task-number: QTCREATOR-24
Reviewed-by: dt
Reviewed-by: Tobias Hunger
2010-03-12 13:01:04 +01:00
dt
c06fcc005b Fix crash for closing creator while evaluate is still in progress 2010-03-11 17:02:36 +01:00
Tobias Hunger
e10a35e891 Remove unused variable 2010-03-11 10:25:29 +01:00
dt
90c1c8f54d Cancel a previous update code model 2010-03-10 17:02:24 +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
a22af06223 Fail project loading when no targets could get set up
* Not good, but better than ASSERTing/crashing later on.
 * Use a qWarning to provide some hint on what is going on.
2010-02-19 11:07:15 +01:00
Tobias Hunger
8fe0cb2be9 Warn when failing to restore .user-file settings 2010-02-18 18:40:46 +01:00
Tobias Hunger
1ff0a7e03a Add target selection wizard to Qt4 projects 2010-02-17 17:13:23 +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
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
Friedemann Kleint
f672bff338 Fix some code scanning issues.
foreach()-Loops.
2010-02-01 14:00:07 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Tobias Hunger
788b294a30 Make project use toMap/fromMap to save state
* That is what everybody else is using now.

Reviewed-by: dt
2010-02-01 12:23:14 +01:00
Tobias Hunger
4ee223d45d Add a id() method to projects
* This makes it easier to distinguish projects in the
   userfileaccessor
2010-02-01 12:23:14 +01:00
Tobias Hunger
f923a561c3 Make use of ProjectConfiguration in RunConfigurations
Reviewed-by: dt
2010-02-01 12:23:13 +01:00
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