Commit Graph

406 Commits

Author SHA1 Message Date
dt
af7b39e3a7 Qt4ProjectManager: Add some safety code
Might, or might not fix
Task-Nr: QTCREATORBUG-2361
2010-10-25 17:26:41 +02:00
dt
4a1f15dbb8 Qt4ProjectManager: Compress the folderChanged via a small timer
Reviewed-By: hunger
2010-10-25 14:14:33 +02:00
dt
3cd9c59679 Optimize which folders we recursively enumerate
Reviewed-By: hunger
2010-10-25 14:14:30 +02:00
con
9240ceaf35 Add the path to the installed Qt Frameworks on Mac.
Otherwise all the Qt headers might not be found at all.

Task-number: QTCREATORBUG-1377
Reviewed-by: Tobias Hunger
Reviewed-by: Erik Verbruggen
2010-10-18 18:11:40 +02:00
dt
47310350a1 Qt4Project: Avoid warnings from QFileSystemWatcher
Reviewed-By: Thorbjorn
2010-10-13 14:46:35 +02:00
Christian Kamm
61504082a9 Qt4Project: Push the Qt version's QML import path to the code model.
Task-number: QTCREATORBUG-2639
Reviewed-by: dt
2010-10-13 13:31:31 +02:00
Christian Kamm
00a8d9c32b QmlJS: Try to build qmldump when opening a Qml project.
To make plugin dumping work without having to compile the debugging
helpers explicitly.

Reviewed-by: Kai Koehne
2010-09-30 15:10:33 +02:00
Christian Kamm
b87f0bfdcf QmlJS: Fix qmldump not working for qmlproject projects.
Reviewed-by: Erik Verbruggen
2010-09-29 17:54:51 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
dt
299f139553 Revert "Remove the QmlJSEditor dependency from Qt4ProjectManager."
This reverts commit f8c5001382.
2010-09-27 15:56:37 +01:00
dt
580bf35a15 Qt4Project: Remove dead code 2010-09-27 13:09:49 +01:00
Christian Kamm
f8c5001382 Remove the QmlJSEditor dependency from Qt4ProjectManager.
The Qt4ProjectManager now uses metacalls to inform the QmlJSModelManager
about the project data.

Done-with: hjk
2010-09-23 14:16:46 +02:00
Christian Kamm
427f775489 QmlJS: Allow setting import paths in Qt4Projects using QML_IMPORT_PATH.
Introduced new Creator-specific qmake variable QML_IMPORT_PATH that
lists the import paths required by the QmlJS engine.

Done-with: Alessandro Portale
2010-09-21 14:56:25 +02:00
dt
d07f4ad804 Ups a debug statement left over. 2010-09-02 17:20:26 +02:00
dt
6bc346443a Fix hangs on trying to cdUp through not longer existing directories 2010-08-25 11:52:41 +02:00
dt
4c085581f9 Fix watching new folders for DEPOLYMENT 2010-08-18 11:57:01 +02:00
Jarek Kobus
573006f370 Add "Add library wizard" to the pro file editor
Reviewed-by: dt <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-125
2010-08-16 18:25:38 +02:00
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