summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProjectManager: removing declarative dependencyThomas Hartmann2013-08-061-6/+6
| | | | | | | We can parse the .qmlproject files without using the declarative module. Change-Id: I78a910c9ec9477f5c6fbcdca23f62ab841ca4368 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>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-2/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* 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>
* 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>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
| | | | | | | | 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>
* 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>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* QmlProject: Add copyright headerKai Koehne2011-02-181-0/+33
|
* Header cleanup in src, specify module name.Friedemann Kleint2011-01-241-1/+3
|
* QmlProject: Add mainFile propertyKai Koehne2010-12-081-0/+16
| | | | | | | | | | | 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
* QmlJS: Make the project always return absolute import paths.Christian Kamm2010-06-241-3/+15
| | | | | Task-number: QTCREATORBUG-1728 Reviewed-by: Kai Koehne
* Fixed QTCREATORBUG-1397.Erik Verbruggen2010-05-191-1/+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
* QmlProjectManager: more libraryPaths -> importPaths renames.Christian Kamm2010-03-211-3/+3
| | | | See c722282cf3e7c03f89b3454b1b77e88d15b3ed67.
* QmlProjectManager: Rename 'libraryPaths' property to 'importPaths'Kai Koehne2010-03-191-7/+7
| | | | Suggested by Erik Verbruggen
* Fixed wrong usages of the Q_D() macro.Roberto Raggi2010-03-031-4/+4
|
* QmlProjectManager: Fix compilation with latest changes of QDeclarativeKai Koehne2010-02-261-5/+2
| | | | | All files have been renamed from Qml to QDeclarative. Registration of types is now done in an initializer method.
* Fix compilation for latest qt/masterKai Koehne2010-02-231-3/+3
| | | | | | | | QmlList has been replaced by QmlListProperty (33eb76f050b45718d87926). Patch provided by Aaron Kennedy. Reviewed-by: akennedy
* Don't show error message if file added to qmlproject is picked upKai Koehne2010-02-171-0/+20
| | | | | | 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.
* Add libraryPaths array to Project element (.qmlproject format)Kai Koehne2010-02-031-0/+18
| | | | | | | Will be passed to qmlviewer with the "-L" option. Storing this in the .qmlproject file format itself (and not in the .user file) is useful in case the libraries are relative/part of the checkout that is shared between users/computers.
* Add new JavaScriptFiles & ImageFiles element to .qmlproject file formatKai Koehne2010-01-291-8/+8
|
* Let QmlProjectItem return always absolute pathsKai Koehne2010-01-291-0/+1
| | | | We're converting the path to absolute ones in QmlProject anyway ...
* Update project tree if .qmlproject file / included directories changeKai Koehne2010-01-291-1/+4
|
* New qml based .qmproject file formatKai Koehne2010-01-291-0/+101
View Lorry Controller Status