Commit Graph

235 Commits

Author SHA1 Message Date
dt
f643ab8371 Qt4ProjectManager: Remove dead code 2011-02-22 20:17:41 +01:00
dt
811466a2fe Repalce QDir::absolutePath with QDir::cleanPath
Qt 4.8 behaves differently.

Task-Nr: QTCREATORBUG-3849
2011-02-22 16:27:06 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
2011-02-21 18:33:23 +01:00
Christian Kamm
6b37fe19bc qmldump: Allow for debug and release versions and choose the right one.
Task-number: QTCREATORBUG-3549
Reviewed-by: Kai Koehne
2011-01-25 12:35:16 +01:00
Pawel Polanski
d6f9000451 Symbian: Passive content projects are deployed correctly.
Task-number: QTCREATORBUG-3579
2011-01-24 15:38:38 +01:00
dt
e505604b92 ProjectExplore: Introduce dis/enabling of buildconfigurations
The build actions are disabled if the buildconfiguration is disabled.
The deploy and run actions are disabled if deploying or running invokes
building automatically.

Qt4BuildConfigurations are disabled while parsing.

Task-Nr: QTCREATORBUG-2576
2011-01-19 15:47:00 +01:00
dt
67cfb7e078 Qt4projectManager: Refactor Qt4Target, split up in per target classes
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.

(*) Noteable missing is the qtversion, which needs to be split up
per target too.

Also fixes
Task-Nr: QTCREATORBUG-2440

Reviewed-By: hunger
Reviewed-By: ck
2011-01-17 14:13:40 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Christian Kandeler
53d41cb84b Project file evaluation: Take sysroot into account.
Task-number: QTCREATORBUG-1858
Reviewed-by: Oswald Buddenhagen
2011-01-05 17:58:21 +01:00
hjk
d6a459c332 cppmodelmanagerinterface: use singleton instead of object pool 2011-01-05 09:56:00 +01:00
Christian Kamm
5f50a6ae34 C++: Move the ModelManagerInterface from CppTools to CPlusPlus. 2011-01-04 15:58:21 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
dt
3f804ed0b2 coding style 2010-12-07 16:46:08 +01:00
dt
8697072ce4 ProjectExplorer: Move ITargetFactory to object pool
Makes multiple target factories per project possible

Reviewed-By: hunger
2010-12-07 13:17:12 +01:00
dt
95d7639bb7 Qt4: Move Qt4Target and Qt4BC out of the Internal namespace
Reviewed-By: hunger
2010-12-07 13:16:07 +01:00
dt
b477441ef9 ProjectExplorer: Move configWidget from Project to Target
Reviewed-By: hunger
2010-12-06 14:15:06 +01:00
Christian Kamm
9059dd86b1 Qt4Project: Notify the QmlJS code model even without QML files.
Reviewed-by: Erik Verbruggen
2010-11-11 12:29:24 +01:00
Christian Kamm
c6b688d4e6 QmlJS: Fix code model update when project filelist changes.
Task-number: QTCREATORBUG-2986
Reviewed-by: Roberto Raggi
2010-11-09 14:31:36 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments
Krazy was complaining about those.
2010-11-03 12:45:34 +01:00
dt
c09c5ec988 Qt4ProjectManager: Emit correct state once on restoring 2010-11-02 16:43:11 +01:00
dt
fe4549f775 Revert "hot fix to allow running projects again."
This reverts commit 0d6601e424.
2010-11-02 16:43:11 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
hjk
0d6601e424 hot fix to allow running projects again.
This disables Qt4Project::validParse() and needs to be reverted again

Reviewed-by: Tobias Hunger
2010-10-29 15:25:08 +02:00
dt
6c20d2beeb Qt4ProjectManager: Fix crash 2010-10-29 12:17:44 +02:00
dt
45dd1ad7f5 Disable Run Configurations while parsing .pro files
Initial patch and idea by hunger.
Reviewed-By: hunger
2010-10-28 16:09:41 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
Christian Kamm
528999d549 qmldump: Ensure path and environment are taken from the same Qt version.
Fixes f1fb0bddb1.

Reviewed-by: Kai Koehne
2010-10-26 16:30:49 +02:00
Friedemann Kleint
f1fb0bddb1 Debugger/JS Code model: Set environment for QML tools correctly.
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
2010-10-26 15:39:37 +02:00
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