summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge multi Qt Quick UI wizards into onejkobus2013-11-061-2/+1
| | | | | Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove support for debugging JS with Qt 4.7Kai Koehne2013-11-041-23/+0
| | | | | | | | Remove infrastructure to debug/inspect QML applications with Qt 4.7. Change-Id: I277e9884e009475a29017f502bbe1d069317460f Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlProjectManager: Remove dependency on DebuggerAurindam Jana2013-10-151-2/+0
| | | | | Change-Id: Ic6e4c66ba2921de7d77e48e62e4d87bd820d9859 Reviewed-by: hjk <hjk121@nokiamail.com>
* Core: Clean up FileIconProvider interfacehjk2013-09-131-3/+1
| | | | | Change-Id: I98c3c8796cb887f5bb3c5184854562ff36727836 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Apply 'static' pattern to MimeDatabasehjk2013-09-031-8/+3
| | | | | | | | Also adjust and streamline using and surrounding code. Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlProjectManager: removing declarative dependencyThomas Hartmann2013-08-061-2/+0
| | | | | | | We can parse the .qmlproject files without using the declarative module. Change-Id: I78a910c9ec9477f5c6fbcdca23f62ab841ca4368 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Streamline mimetypes.xml filesOrgad Shaneh2013-06-071-1/+1
| | | | | Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Clean headers in QmlProjectManager.Friedemann Kleint2013-04-091-8/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: I2d1d2ec5a3071de9d2a0a03bc69ec653becc7f85 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | QmlProjectPlugin: replacing QmlProjectApplicationWizardThomas Hartmann2013-01-111-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new wizard is template based. This allows easy addition of custom QML templates and also allows us to add more QML wizards for e. g. components later. This template mechanism allows substitution in comment, which allows us to keep valid QML file as templates. This reduces the maintance burden significantly. Change-Id: I7766b037635131da2af5aae518d6fe4597ff8b9f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Use Core::Id in ICore::showOptionsDialoghjk2012-12-291-2/+2
| | | | | | | | | | Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04 Reviewed-by: hjk <qthjk@ovi.com>
* | QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-12-201-3/+4
|/ | | | | | Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Splitting QmlProjectApplicationWizard for Qt Quick 1.1 and Qt Quick 2Thomas Hartmann2012-11-281-1/+5
| | | | | | | | QmlProjectApplicationWizard now has a version for Qt Quick 1.1 and one for Qt Quick 2. Change-Id: Icdcf2b58ad9f252e47a838717a6234eb840a03b7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Profile introductionTobias Hunger2012-06-211-2/+0
| | | | | | | | | | | | | Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlProject: Update warning when QML Observer cannot be foundKai Koehne2012-03-151-6/+6
| | | | | | | | Task-number: QTCREATORBUG-7108 Change-Id: Id6d40f1985a1e96fd69549c5ced1b37c33f0642c Reviewed-by: Robert Löhning <robert.loehning@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-4/+4
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-3/+2
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Reduce number of categories and minimum size of preferencesEike Ziller2011-09-291-1/+2
| | | | | | | | | | | Merges the Project, Qt4 and Tool Chain categories into one Build & Run category, which makes it finally possible to reduce the minimum height of the preferences dialog. Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138 Reviewed-on: http://codereview.qt-project.org/5023 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QMLProject: Use cancel button.Friedemann Kleint2011-07-221-1/+1
| | | | | | | Change-Id: I2c9b3d3fb6b48428a0b8b9c46c5c994eb8941e13 Reviewed-on: http://codereview.qt.nokia.com/1979 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlProjectManager: moved the no-observer warning dialog to qmlprojectpluginChristiaan Janssen2011-07-211-6/+33
| | | | | | | Change-Id: I6ce724e0db17d22616adcdf058d1f05af7124b64 Reviewed-on: http://codereview.qt.nokia.com/1929 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* QmlProject: Rename QmlRunControl to QmlProjectRunControlKai Koehne2011-05-041-1/+1
| | | | | It's just easier if all the classes related with the QmlProject file format start with the same prefix.
* Update license.hjk2011-04-131-14/+13
|
* Exported header cleanup.Friedemann Kleint2011-01-201-0/+1
|
* 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
| |
* | Qmlprojectplugin: work againdt2010-12-071-0/+1
|/ | | | Splitted up patches wrongly
* QmlProject: Remove "Import QML Directory" wizardKai Koehne2010-10-041-2/+0
| | | | Reviewed-by: Christiaan Janssen
* Moving the "Qml standalone" wizards from qmlpm to qt4pmAlessandro Portale2010-08-251-3/+0
|
* Fix of a (harmless) typoAlessandro Portale2010-08-171-1/+1
|
* Pedantic cleanup of filename parameters for QIcon constructorAlessandro Portale2010-07-301-1/+1
| | | | | | | | | | | 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.
* Support existing Qml project for "standalone" Qml appsAlessandro Portale2010-07-201-1/+2
| | | | | | | | | | Now, the user can select an existing qml application that can be turned into a standalone Qml app. The qml source files will not be copied around but rather stay in their original location. The new .pro file that gets generated by this wizard will reference the qml source files via relative path and deploy them from there. Task-number: QTCREATORBUG-1814
* Wizard for standalone qml applicationsAlessandro Portale2010-07-161-0/+2
| | | | | | | | | | | | | | | | | | | Short: Create a new self running qml .sis/.deb package. Long: A typical Qml application usually consists of a couple of .qml, .js and image files. Deploying such an application is challenging, especially to mobile devices. This wizard will generate a C++ project with a customized, light weight Declarative Viewer, a helloworld Qml file and a .pro file that takes care of the deployment of the Qml file(s). This is just the first step. There will be an import wizard, and further more there will be the possibility to add additional Qml modules and probably also Qml directories to the package. Task-number: QTCREATORBUG-1813
* Move qmltaskmanager from qmlproject plugin to qmljseditordt2010-07-141-17/+1
|
* Task hubdt2010-07-071-4/+3
|
* Moved qmljsmodelmanagerinterface.hRoberto Raggi2010-06-101-2/+2
|
* Fixed QTCREATORBUG-1397.Erik Verbruggen2010-05-181-0/+2
| | | | | | | 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
* Hooked up the QML task manager again.Erik Verbruggen2010-04-161-2/+3
| | | | | The QML task manager behaviour is to show warnings/errors for _saved_ files only.
* QmlDesigner.ProjectExplorer: New icons for qml file typesChristiaan Janssen2010-04-011-0/+4
|
* Long live the king!hjk2010-03-051-1/+1
|
* QmlProjectManager: Fix compilation with latest changes of QDeclarativeKai Koehne2010-02-261-0/+4
| | | | | All files have been renamed from Qml to QDeclarative. Registration of types is now done in an initializer method.
* Renaming Qml wizardsKai Koehne2010-02-181-4/+4
| | | | Unify names to QmlProjectApplicationWizard & QmlProjectImportWizard
* QmlProjectManager refactoringKai Koehne2010-02-161-5/+10
| | | | Putting every class in it's own files + avoid "using namespace"
* Renamed qmlmodelmanager.Roberto Raggi2010-02-151-2/+2
|
View Lorry Controller Status