summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlproject.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-151-3/+2
|\ | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/gdbbridge.py Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
| * Braces cleanupOrgad Shaneh2013-11-141-3/+2
| | | | | | | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-061-2/+20
|\ \ | |/ | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I91b9ceba836d01086e9ccdb4499436d17195b729
| * QmlProject: Update code model if kit configuration changesKai Koehne2013-11-061-2/+20
| | | | | | | | | | | | | | | | Update code model if e.g. the Qt version in the active kit changes. Task-number: QTCREATORBUG-10656 Change-Id: I4263833c23c2b00035d15faa9725adbb734f8366 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectExplorer: Make Project::id value basedhjk2013-10-141-5/+1
|/ | | | | Change-Id: Ie210d2a068158c6caaac66aae58cbd886f61c18d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectExplorer: Clean up KitsManager APIhjk2013-09-111-5/+6
| | | | | Change-Id: Ib0b11918fbae9577928b6209a913afb3eccc48b5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* MessageManager: General cleanup.hjk2013-09-051-17/+13
| | | | | | | Apply 'static' pattern, rename 'printToOutputPane' to 'write' Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7 Reviewed-by: David Schulz <david.schulz@digia.com>
* Core::Id: Remove some explicit casts to Core::IdTobias Hunger2013-09-031-1/+1
| | | | | Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb Reviewed-by: hjk <hjk121@nokiamail.com>
* Core: Remove deprecated accessorshjk2013-08-301-1/+1
| | | | | | | Also adjust user code. Change-Id: I60935942a7012e6a0d6091ffbc89d69289366e35 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* KitManager: Use static API as other singletons doTobias Hunger2013-08-211-4/+3
| | | | | Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155 Reviewed-by: hjk <hjk121@nokiamail.com>
* QmlProjectManager: removing declarative dependencyThomas Hartmann2013-08-061-17/+13
| | | | | | | We can parse the .qmlproject files without using the declarative module. Change-Id: I78a910c9ec9477f5c6fbcdca23f62ab841ca4368 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Introduce Project::projectFilePath()Tobias Hunger2013-08-011-1/+1
| | | | | | | Use it instead of retrieving this information from the document. Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-091-1/+1
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge branch '2.7'Oswald Buddenhagen2013-05-151-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qtquick/qtquick-components.qdoc doc/src/qtquick/qtquick-designer.qdoc qtcreator.pri qtcreator.qbs src/plugins/cppeditor/cppinsertdecldef.cpp src/plugins/qnx/qnxruncontrolfactory.cpp Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
| * QmlProject: Update code model when target changesKai Koehne2013-05-071-0/+9
| | | | | | | | | | Change-Id: Ia8008748fb4d35507729c6ae684913e8bf72c985 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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>
* | Project: Set QML/C++ languages where both are possibleTobias Hunger2013-04-051-1/+1
| | | | | | | | | | Change-Id: I4bc5bd7a644c48dfa529f9f9f6052e401de76d40 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix gcc warnings about unused variables.Christian Kandeler2013-03-251-1/+1
| | | | | | | | | | | | | | These appear when compiling in release mode. Change-Id: I76ee3b1b8d728fd839d713ee4f914b6965851b99 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | QmlProject: Adjust to MessageManager api changeDaniel Teske2013-03-221-5/+6
|/ | | | | Change-Id: I4167939dea502b94efa61182c5a0aff56e9b3761 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProject: Select matching kit when loading .qmlproject fileKai Koehne2013-03-071-3/+68
| | | | | | | | | Find Desktop kit that matches detected QtQuick import, and has a viewer. Task-number: QTCREATORBUG-8900 Change-Id: I3d32dbc7a304dbeb36647dd4de9864e665f5a59f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* qmljs: add infrastructure handling qml dialects betterFawzi Mohamed2013-02-211-24/+3
| | | | | | | | | | | | | | | | | | QmlBundles enables us to treat the different qml dialects differently. Add imports completion. Change-log: [Qml/JS Support] Corrected handling of QtQuick2 only features. Change-log: [Qml/JS Support] Added import completion in editor. Task-number: QTCREATORBUG-8750 Task-number: QTCREATORBUG-8624 Task-number: QTCREATORBUG-8584 Task-number: QTCREATORBUG-8583 Task-number: QTCREATORBUG-8429 Change-Id: I1384b1b23136a85b4d077895ea86f92960da9e71 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Qml Debugging: Default option for Qt Quick applicationAurindam Jana2013-02-201-1/+1
| | | | | | | | | Qt Quick applications should have Qml Debugging enabled by default. Task-number: QTCREATORBUG-8208 Change-Id: I794249567b15071098f0ac8ba5f2a8e5f2be4ffb Reviewed-by: hjk <hjk121@nokiamail.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>
* | QmlProject: Detect import type from mainFileKai Koehne2013-01-211-9/+46
| | | | | | | | | | | | | | | | | | | | Detect the default import (QtQuick 1.x vs QtQuick 2.x) from main file, and use it to restrict kits + select the right runtime. Task-number: QTCREATORBUG-8358 Change-Id: Ib8cfd3eb989953f607fee6043c43e588f798c774 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | QmlProject: fixing QML import path for .qmlprojectThomas Hartmann2013-01-141-14/+25
| | | | | | | | | | | | | | The code is similar to what we do in Qt4Node. Change-Id: I4f206f8acdb38d7813160a7ecabc1ffd5daedcfb Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-141-0/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
| * qmljs: add qt5 qmlpath to code model pathsFawzi Mohamed2012-12-121-0/+1
| | | | | | | | | | Change-Id: Ie0fd6f74818def859ab5bcb6fa104c4eec1b67fb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-051-16/+2
|\ \ | |/
| * QmlProject: Don't add Qt import on command lineKai Koehne2012-12-031-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Actually this can lead to crashes if passing the QtQuick1 import path to qmlscene. The removed code was introduced in 404186a919b5655054. However, the Qt import path for the code model is also added in QmlProject::refresh(). Task-number: QTCREATORBUG-8365 Change-Id: I8581ce3d67c83c0f27d7b8aefedf9765935bedbc Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Move Project::subConfigWidgets to BuildConfigurationDaniel Teske2012-11-161-5/+0
|/ | | | | Change-Id: Idf58ebbb02e9cd0ab4ff7e74fbed17250e274693 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* QmlProject: Enable runconfiguratons after restoreDaniel Teske2012-10-171-3/+9
| | | | | | | Task-number: QTCREATORBUG-7980 Change-Id: I180bfc999421a13f25f41487d7498f652432b1c5 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProjectRunConfiguration: update enabled state on adding to a projectDaniel Teske2012-10-161-7/+20
| | | | | | | Task-number: QTCREATORBUG-7980 Change-Id: I63fa4809772ce2f7169baf3270fe753b22ea4a04 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>
* Show incompatible kits in Add KitDaniel Teske2012-09-211-2/+7
| | | | | | | | | And implement a tooltip for them Task-number: QTCREATORBUG-7870 Change-Id: I4975dd24ca2b619ebcbd0393f97311590ed4930f Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Profile -> Kit variable renamingOrgad Shaneh2012-09-111-3/+3
| | | | | Change-Id: I6cc06684134030bd527d9dcce21ad17938a56927 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* s/profile/kit/Tobias Hunger2012-09-041-11/+11
| | | | | | | | | | | | | | | * Rename profiles to kits. * Update some strings: * projects mode has a Kits tab, not a Targets tab. * " Settings" was dropped from the sub-tabs of the Kits tab * menu entry "Build/Open Build/Run Target Selector" was renamed to "Build/Open Build and Run Kits Selector". * Use "Kit" instead of "Target" in miniprojecttargetselector. (The class was not renamed as it does indeed select targets, not kits) Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix crashes when no default profile is setTobias Hunger2012-08-131-2/+3
| | | | | | | | | | | | * Handle 0 when calling createTarget to avoid the crashes in the first place * Do not try to create/add targets for 0 profiles to avoid creator writing a warning to the console * Fix possible crashes in debugger when no default profile is set. Task-number: QTCREATORBUG-7695 Change-Id: I9afc8e29c8b859ad078dad794ef5017168daac78 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce qmakeProperty(), use instead of versionInfo() where applicableOswald Buddenhagen2012-07-091-2/+2
| | | | | | | the idea is to encapsulate accesses to specific variables. Change-Id: Icafd2c85de6178db1a492a5dd36dde7f1925ea21 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Profile introductionTobias Hunger2012-06-211-19/+19
| | | | | | | | | | | | | 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>
* Make PluginManager mostly static.Eike Ziller2012-06-191-1/+1
| | | | | Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228 Reviewed-by: hjk <qthjk@ovi.com>
* Don't add singleton model manager to object pool.Eike Ziller2012-05-041-1/+1
| | | | | Change-Id: Iffca99867b25500fc77bbcf1e17a50a7cc4cf832 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Use Core::Id in project-related objectsTobias Hunger2012-04-251-3/+3
| | | | | | | | Use Core::Id for all the project related objects in favor of plain QStrings. Change-Id: I790ab40cb29899efdb49c413a77609486f52e683 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Fix QML plugin dumping for QML projectsTommi Asp2012-04-111-0/+1
| | | | | Change-Id: I2e5f4b645c262d8bc4f890a5fab943fbf2dd7cb4 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp src/libs/zeroconf/servicebrowser.cpp src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qmlprofilerengine.cpp src/plugins/qmlprofiler/qmlprofilertool.cpp src/plugins/qmlprofiler/qmlprofilertraceview.h src/plugins/qmlprofiler/tracewindow.cpp Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
| * QmlProject: Fix typoChristian Stenger2012-03-201-1/+1
| | | | | | | | | | Change-Id: Ib481931d637c8df04f1b2bd87bbd759d5f299e9c Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | Remove Project::dependsOn(), it's never calledDaniel Teske2012-03-161-5/+0
|/ | | | | | | | I don't remember why I did leave it alone in the reafctoring some years ago, but surely it serves no purpose. Change-Id: Idf920faf3f8f7128cd410501f2c3748e100dfbfb Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
View Lorry Controller Status