summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/qmlproject.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Normalized connect()sRobert Loehning2012-03-061-2/+2
| | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-5/+5
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-3/+3
| | | | | | | | 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>
* Core::Filemanager: make some methods statichjk2012-01-251-2/+2
| | | | | | | This follows suit to the ICore changes. Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-1/+1
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlProject: Print a warning if the mainFile given is not readableKai Koehne2012-01-171-0/+11
| | | | | | Change-Id: If5951bb3121b13287a3ccf9d684bf23e0673231c Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@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>
* QmlProjectManager: Make sure project tree updates after in project file changeKai Koehne2011-09-191-6/+5
| | | | | | | | | | | Use FileManager instead of our own FileSystemWatcher, since this one only signals the first file change (cause Qt Creator apparently removes the file and creates a new one on each change). Change-Id: Idacd545e41cd3ee29bfbc122526b9097039c65d0 Reviewed-on: http://codereview.qt-project.org/4975 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* QmlProject: Update code model even without valid qmldump.Christian Kamm2011-09-161-3/+2
| | | | | | Change-Id: I6c27fe4ca0201cbbe929821d4408d61a068e8982 Reviewed-on: http://codereview.qt-project.org/4968 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Header cleanup in QML/JS and project manager.Friedemann Kleint2011-08-181-2/+4
| | | | | | Change-Id: I40b41a3ef6189a99272e345e3251680edccecca0 Reviewed-on: http://codereview.qt.nokia.com/3215 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-08-101-2/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/libs.pro src/plugins/debugger/watchwindow.cpp src/plugins/remotelinux/maemopackagecreationstep.h Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
| * QmlProject: Don't crash if no qt version is availableKai Koehne2011-08-041-2/+3
| | | | | | | | | | | | | | Change-Id: I1737ca26b29d366f4f326c534af1528776f2bfdd Reviewed-on: http://codereview.qt.nokia.com/2607 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge branch '2.3'Oswald Buddenhagen2011-07-251-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp src/plugins/remotelinux/maemodeploystepfactory.cpp src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
| * DebuggingHelper: Use right toolchainKai Koehne2011-07-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | Don't just use an arbitrary toolchain, which might break esp. for Symbian. Instead, retrieve the toolchain from the project, or in the case of the Qt Options page let the user choose. Change-Id: I6d271c485420e609d223d8cece754ef84e573745 Reviewed-on: http://codereview.qt.nokia.com/1978 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | QmlJS: Dump builtins per Qt version.Christian Kamm2011-07-111-0/+4
|/ | | | | | | Change-Id: I7b5179c4b33c24e83baf0536d158dd48d277637f Reviewed-on: http://codereview.qt.nokia.com/1305 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* QmlProject: Don't crash if there's no active target.Christian Kamm2011-05-251-6/+10
| | | | | | | Change-Id: I0fd95f0d388f4ba06936ec9164a91a3c53a0f005 Reviewed-on: http://codereview.qt.nokia.com/104 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Move a lot of qmake independent classes to a new plugin qtsupportdt2011-05-241-4/+8
| | | | | | | | | | Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by passing in the qtversion instead of figuring it out in qmldumptool. Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c Reviewed-on: http://codereview.qt.nokia.com/70 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Qt Version refactoringdt2011-05-121-2/+2
| | | | | | | | | | | | | | | | Split up target specific code into subclasses. Also change Qt4BuildConfiguration to allow a null qtversion. Remove code that relied on always having a qt version. Also make it possible to remove all qt versions. Completly change the qt in path autodetection to be only a fall back if no configuration was found. Note: For now the old settings are not removed, as such 2.2 and master can coexist. Reviewed-By: hunger
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
View Lorry Controller Status