summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlproject.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* add/unify i/o error handlingOswald Buddenhagen2011-04-181-4/+5
| | | | | | lots of use of Utils::FileSaver and Utils::FileReader Task-number: QTCREATORBUG-1619
* Utils: Introduce FileSystemWatcher.Friedemann Kleint2011-04-151-3/+5
| | | | | | | | | Remove duplicated classes ProjectExplorer::FileWatcher and QmlProjectManager::FileSystemWatcher, create Utils::FileSystemWatcher from them, merging the functionality. Also use in HelpManager/Maemo, reducing the number of QFileSystemWatcher instances (and thus, shutdown time).
* Merge branch '2.2'Oswald Buddenhagen2011-04-141-14/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp src/plugins/qt4projectmanager/qt4target.cpp src/plugins/qt4projectmanager/qt4target.h src/plugins/qt4projectmanager/qtoptionspage.h src/plugins/qt4projectmanager/qtversionmanager.cpp src/plugins/welcome/welcomemode.cpp
| * Update license.hjk2011-04-131-14/+13
| |
* | projectexplorer: move project{Context,Language} from IProjectManager to Projecthjk2011-04-121-0/+4
|/ | | | Reviewed-by: dt
* Update source stringsJarek Kobus2011-03-301-1/+1
| | | | Reviewed-by: Pawel Polanski
* QmlProject: Show error message if the project file was deleteddt2011-03-231-2/+4
| | | | | | Task-Nr: QTCREATORBUG-4195 Reviewed-By: kkoehne
* qmldump: Allow for debug and release versions and choose the right one.Christian Kamm2011-01-251-1/+1
| | | | | Task-number: QTCREATORBUG-3549 Reviewed-by: Kai Koehne
* Header cleanup in src, specify module name.Friedemann Kleint2011-01-241-3/+3
|
* Qt4projectManager: Refactor Qt4Target, split up in per target classesdt2011-01-171-1/+0
| | | | | | | | | | | | | | | 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
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License headers.con2010-12-171-7/+11
| |
* | QmlProject: Add mainFile propertyKai Koehne2010-12-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | The mainFile property of QmlProject is the default file to run. People have still the opportunity to override this in their run settings, though. The wizard generated code was updated accordingly. Note that this makes projects generated by the wizard incompatible with QtCreator 2.1! Task-number: QTCREATORBUG-3249
* | ProjectExplorer: Move ITargetFactory to object pooldt2010-12-071-8/+5
| | | | | | | | | | | | Makes multiple target factories per project possible Reviewed-By: hunger
* | ProjectExplorer: Move configWidget from Project to Targetdt2010-12-061-5/+0
|/ | | | Reviewed-By: hunger
* qmldump: Ensure path and environment are taken from the same Qt version.Christian Kamm2010-10-261-10/+1
| | | | | | Fixes f1fb0bddb11d69355784953a6cc0364f9fa25d3e. Reviewed-by: Kai Koehne
* Debugger/JS Code model: Set environment for QML tools correctly.Friedemann Kleint2010-10-261-3/+8
| | | | | | | | | 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
* QmlProject: Tell the code model about the target Qt's import path.Christian Kamm2010-10-131-0/+16
| | | | | Task-number: QTCREATORBUG-2639 Reviewed-by: Thomas Hartmann
* QmlJS: Try to build qmldump when opening a Qml project.Christian Kamm2010-09-301-1/+1
| | | | | | | To make plugin dumping work without having to compile the debugging helpers explicitly. Reviewed-by: Kai Koehne
* QmlJS: Fix qmldump not working for qmlproject projects.Christian Kamm2010-09-291-0/+6
| | | | Reviewed-by: Erik Verbruggen
* QmlProject: Fix memory leakKai Koehne2010-09-241-0/+1
| | | | Explicitly delete the root project item when closing a QmlProject.
* QmlJS: Fix import path handling in the model manager.Christian Kamm2010-06-221-7/+5
| | | | | | | | Previously, the model manager always had exactly one import path - but you can open more than one Qml project at once. Now, we store the union of all import paths in the model manager. Reviewed-by: Roberto Raggi
* Merge remote branch 'origin/2.0'con2010-06-101-1/+1
|\ | | | | | | | | | | Conflicts: src/plugins/projectexplorer/taskwindow.cpp src/shared/proparser/profileevaluator.cpp
| * Fix crash when loading a .qmlproject with a custom run configurationKai Koehne2010-06-091-1/+1
| | | | | | | | Task-number: QTCREATORBUG-1609
* | Moved qmljsmodelmanagerinterface.hRoberto Raggi2010-06-101-2/+2
|/
* QuickDesigner: Fix compilation with latest qt.gitKai Koehne2010-05-201-1/+1
| | | | the method name got changed in 5732a440.
* Fixed QTCREATORBUG-1397.Erik Verbruggen2010-05-191-12/+5
| | | | | | | When adding a new file, refreshing semantic errors in the open editor should have worked. It now also works for removing existing files. Done-with: Christian Kamm
* Emit extra signals to have the task manager show issues on project-load.Erik Verbruggen2010-04-161-1/+1
|
* Hooked up the QML task manager again.Erik Verbruggen2010-04-161-3/+9
| | | | | The QML task manager behaviour is to show warnings/errors for _saved_ files only.
* QmlJSEditor: Build Snapshot by looking at imports of parsed files.Christian Kamm2010-04-061-1/+1
| | | | | | | | | Previously we just scanned every directory containing a qml file for other qml files. This makes import ".." work. Reviewed-by: Erik Verbruggen
* QmlJSEditor: Fix file/directory imports for qml files not in a project.Christian Kamm2010-03-311-7/+1
| | | | Reviewed-by: Roberto Raggi
* Remove isApplication() and simplfy startup project logicdt2010-03-251-5/+0
|
* QmlProjectManager: more libraryPaths -> importPaths renames.Christian Kamm2010-03-211-6/+6
| | | | See c722282cf3e7c03f89b3454b1b77e88d15b3ed67.
* QmlProjectManager: Rename 'libraryPaths' property to 'importPaths'Kai Koehne2010-03-191-1/+1
| | | | Suggested by Erik Verbruggen
* Improve Qml code model import handling.Christian Kamm2010-03-181-1/+14
| | | | | | | | | * Fill the snapshot with files that could be imported. * Implement package imports. * The qmldir file is not parsed yet. Reviewed-by: Erik Verbruggen
* QmlProjectManager: crash fixThomas Hartmann2010-03-111-1/+2
|
* QML project executable file to default to lowercase .qml fileLasse Holmstedt2010-03-081-0/+5
| | | | | | | | Use a lowercase .qml file found in project tree if no current file is selected. This way we don't have to disable run controls if there are some files to execute. Reviewed-by: kkoehne
* Long live the king!hjk2010-03-051-1/+1
|
* QmlProjectManager: Fix compilation with latest changes of QDeclarativeKai Koehne2010-02-261-2/+2
| | | | | All files have been renamed from Qml to QDeclarative. Registration of types is now done in an initializer method.
* Remove support for old .qmlproject file formatKai Koehne2010-02-171-28/+11
| | | | | | | | | We used to fail back to the old format if the .qmlproject file was invalid. Anyhow, this lead to weird effects ... better disable it explicitly. That no warning is shown right now when loading an invalid qmlproject file is a bug in coreplugin.
* Cleaned up qmlinspector and qmlproject and removedLasse Holmstedt2010-02-171-61/+0
| | | | metatype redefinition
* Don't show error message if file added to qmlproject is picked upKai Koehne2010-02-171-0/+10
| | | | | | Check for the case that a new file to be added to a .qmlproject is also automatically covered e.g. by a wildcard filter. In this case we don't have to do anything.
* Merge branch 'debugintegration'Lasse Holmstedt2010-02-161-0/+61
|\ | | | | | | | | | | Conflicts: src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlproject.h
| * Changed QML Inspector from a separate global mode to a plugin.Lasse Holmstedt2010-02-161-3/+28
| | | | | | | | | | | | The new QML Inspector depends on DebuggerPlugin. Also added a dropdown menu into the debugger toolbar from which the user can select the used debugging language, e.g. C++ or QML.
* | QmlProjectManager refactoringKai Koehne2010-02-161-490/+20
| | | | | | | | Putting every class in it's own files + avoid "using namespace"
* | Renamed qmlmodelmanager.Roberto Raggi2010-02-151-2/+2
|/
* Integrate target supportTobias Hunger2010-02-091-39/+41
| | | | | | | | | | * 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
* Set newly created runconfiguration active in QML projectTobias Hunger2010-02-041-1/+3
|
* Pass library paths specified in .qmlproject file on to qmlviewerKai Koehne2010-02-031-1/+19
|
View Lorry Controller Status