summaryrefslogtreecommitdiff
path: root/src/tools/qmlprofilertool/qmlprofilerapplication.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead fileKai Koehne2015-03-111-405/+0
| | | | | Change-Id: Ibe1b43379e9ac6ccf280d35ce9605591d720dc0a Reviewed-by: Ulf Hermann <ulf.hermann@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>
* 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>
* 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-7/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* Ui: No spaces before "..."Daniel Teske2012-03-071-6/+6
| | | | | Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Replaced one-char-stringsRobert Loehning2012-03-071-1/+1
| | | | | | Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-7/+7
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlProfiler: fixing standalone profilerChristiaan Janssen2012-02-021-5/+20
| | | | | | | Updating the code to match latest changes in qmljsclient Change-Id: Ia1a7914fca1beda0141c0d57c7ce76ca1002996d Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlProfiler: reading column information in bindingsChristiaan Janssen2012-01-201-1/+1
| | | | | Change-Id: I1a99c3508de733d98eb99f41419eccfdca030fe0 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Profiler: Print recording status correctlyAurindam Jana2012-01-201-2/+2
| | | | | Change-Id: I3120e1485cd81beb48d7a2cc1f6395708cb0e722 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* QmlProfiler: Show profiling data initiated by console APIsAurindam Jana2011-12-141-31/+43
| | | | | | | | The profile clients now also listens to profiling data sent by console APIs console.profile and console.profileEnd Change-Id: I7f7100448263889076e94a1e251b8977ce047843 Reviewed-by: Christiaan Janssen <christiaan.janssen@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>
* | QmlProfiler: refactor postprocess step in internal statisticsChristiaan Janssen2011-11-091-27/+0
| | | | | | | | | | Change-Id: Id6ea03161ccad92a27a664e84f56b2a49400be91 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | QmlProfiler: V8 profilingChristiaan Janssen2011-10-071-1/+26
|/ | | | | | | Change-Id: I926c5821d31453064f5dbed2b5a10f6195761f42 Reviewed-on: http://codereview.qt-project.org/5892 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* QmlProfiler: Fix help outputKai Koehne2011-09-141-11/+11
| | | | | | | Change-Id: I52aca06921ae45ad0103d672ede569cbbce09eea Reviewed-on: http://codereview.qt-project.org/4800 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlProfilerTool: Fix hang on exitKai Koehne2011-09-061-3/+8
| | | | | | | | | | the reader thread has to terminate on its own, terminate is not reliable. Change-Id: I4222bc8f0c585c190cd90efbaade0b03ca698ec7 Reviewed-on: http://codereview.qt.nokia.com/4194 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlProfilerTool: Fix help textKai Koehne2011-09-061-2/+2
| | | | | | | | | Make sure it fits 80 columns. Change-Id: I52eea0e79be33ae7b546fbca6b7e07e1d78d2a94 Reviewed-on: http://codereview.qt.nokia.com/4191 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Rename qmlprofiler to qmlprofilertoolKai Koehne2011-09-051-0/+380
Avoid clash with qmlprofiler.pro from plugins which causes problems for Visual Studio Solution. Change-Id: I360b952ab9170a4823ef0cab75b969512af5c31f Reviewed-on: http://codereview.qt.nokia.com/4190 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
View Lorry Controller Status