summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsdelta.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove QmLJSDelta classKai Koehne2015-04-241-582/+0
| | | | | | | | | The class was only used for the Apply on Save functionality in the QML Debugger, which got nuked in 3bf81efbe73ac2a731. Change-Id: I1842cc07d61fe84f8da23210ebac04dd4d567fce Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlJS: Remove unused variableOrgad Shaneh2014-05-061-1/+0
| | | | | Change-Id: Id5973f9f75f9928db64a91a7c9048226c4557795 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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>
* qmljs: use new qml parserFawzi Mohamed2013-11-061-4/+5
| | | | | | | | adds support for singleton and getter/setter properties Change-Id: Ia6691ac7799a46885db0df44617617dcc3c13189 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Clean headers in QmlJs.Friedemann Kleint2013-04-041-1/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it (Parser excluded). Change-Id: I5ec6e1076430009bb72094411b2c3386f8bea548 Reviewed-by: Aurindam Jana <aurindam.jana@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-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-9/+9
|/ | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 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>
* 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>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * 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>
* | QmlJS: Move commonly used functions to qmlutils.h.Christian Kamm2011-10-101-12/+5
|/ | | | | | | Change-Id: I22376d96fe575bc00a55094c06af80e32a5587e6 Reviewed-on: http://codereview.qt-project.org/6238 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* minor stylehjk2011-09-191-1/+1
| | | | | | Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7 Reviewed-on: http://codereview.qt-project.org/5122 Reviewed-by: hjk <qthjk@ovi.com>
* QmlJS: Adjust existing code for updated QML parser.Christian Kamm2011-09-141-5/+5
| | | | | | Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72 Reviewed-on: http://codereview.qt-project.org/4733 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlLivePreview: fix crash when inserting node with no parentsChristiaan Janssen2011-08-181-7/+9
| | | | | | | Change-Id: Ib781f64aed11aafc106dc15b40689181fefd5dd3 Reviewed-on: http://codereview.qt.nokia.com/3171 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlLivePreview: correctly formating file URLChristiaan Janssen2011-06-081-1/+2
| | | | | | | Change-Id: I7c77d7854dac8e28cd5bcdeb4e6a8687fdb8606e Reviewed-on: http://codereview.qt.nokia.com/361 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlLivePreview: removing and inserting animations and transitionsChristiaan Janssen2011-05-241-3/+9
| | | | | | Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545 Reviewed-on: http://codereview.qt.nokia.com/75 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlLivePreview: avoid compiler warnings on gcc on macChristiaan Janssen2011-05-181-1/+2
| | | | Reviewed-by: Roberto Raggi
* QmlLivePreview: adding states to an itemChristiaan Janssen2011-05-171-9/+33
| | | | Reviewed-by: Kai Koehne
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-051-0/+3
| | | | Reviewed-by: Kai Koehne
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* QmlJSObserver: Fix crash when adding an element to some .qml filesKai Koehne2010-10-081-1/+2
| | | | | | | | | | Make sure that the 'artifical' URL of the item created actually is absolute (starts with a file:///). Otherwise an Assert will be hit when the imports include e.g. a .js file, and the Engine tries to load it. Task-number: QTCREATORBUG-2644 Reviewed-by: Olivier Goffart
* QmlJsDelta: Guard qDebug outputKai Koehne2010-10-081-3/+10
|
* QmlObserver: showing a warning when changes cannot be synchronizedChristiaan Janssen2010-09-221-4/+16
| | | | Reviewed by: Thomas Hartmann
* qmljsdelta: Fix updating property on UiObjectBindingOlivier Goffart2010-08-271-8/+8
|
* QmlInspector: Added reparenting of items in the Qml Live Preview. Reviewed ↵Christiaan Janssen2010-08-261-1/+12
| | | | by: Lasse Holmstedt
* Compile on windowsOlivier Goffart2010-08-191-4/+4
| | | | Apparently, it did not like ::label
* qmljsdelta: little cleanup and documentation of the codeOlivier Goffart2010-08-191-16/+26
|
* QML JS Inspector: Improve warning messagesLasse Holmstedt2010-08-051-4/+4
| | | | | | | | When a change is done to an element that cannot be changed due to debugger/qdeclarative limitations, a warning is shown to the user in QML JS Editor. Reviewed-by: Olivier Goffart
* QmlJsDelta: give a valid label to the UiScriptBindingOlivier Goffart2010-07-271-2/+6
|
* QmlJsDelta: Fix the fact that sometimes, when inserting items, the new item ↵Olivier Goffart2010-07-261-3/+11
| | | | could match the next item
* QmlJsDelta: moved to the QMLJS libraryOlivier Goffart2010-07-211-0/+504
Also used 'int' instead of QDeclarativeDebugObjectReference for the debug id in order not to use the private API from QMLJS
View Lorry Controller Status