aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlProfiler: Code cosmeticshjk2025-04-101-5/+3
| | | | | | | Namespaces, #includes, whitespace, QVector->QList... Change-Id: Ibbdcb28df99f0f65b95362275ac74adec96d65d0 Reviewed-by: Christian Stenger <[email protected]>
* QtSupport: Use BuildConfiguration for populateQmlFileFinder()hjk2025-03-121-2/+2
| | | | | | | Removes one use Target::deploymentData() Change-Id: I9e6177376b340d04eb2c8b6803826fbf0d278bd6 Reviewed-by: Christian Kandeler <[email protected]>
* ProjectExplorer: Dissolve kitaspects.{h,cpp}Christian Kandeler2024-11-201-1/+1
| | | | | | | Move the remaining classes into their own files. Change-Id: I301e72004c21446fa9b8f15942bb042218b0ecef Reviewed-by: hjk <[email protected]>
* ProjectExplorer: Rename kitinformation.{h,cpp} to kitaspects.{h,cpp}hjk2023-08-151-1/+1
| | | | | Change-Id: I069bddeb457366210d339edcbb8ffb359a40fab8 Reviewed-by: Jarek Kobus <[email protected]>
* Various Plugins: Simplify return FilePath statementsJarek Kobus2023-08-021-2/+2
| | | | | | | Change-Id: Ia9efb86f722caca1492b577d51442f1f23b804b4 Reviewed-by: <[email protected]> Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
* ProjectExplorer: Move some not-fully-session related bitshjk2023-03-011-1/+1
| | | | | | | | | | | | | | | ... out of SessionManager. The idea is to later move SessionManager into the Core plugin, which both is sensible conceptually and also prerequisite to merge the Bookmark plugin into TextEditor plugin. Currently, only the interface is split, as the load/save implemetations are non-mechanical to disentangle. Change-Id: I31631db3094ea192825a2ccaa6add6188662940b Reviewed-by: Eike Ziller <[email protected]> Reviewed-by: <[email protected]>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <[email protected]>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <[email protected]>
* qmljs: (QString -> Utils::FilePath)++Fawzi Mohamed2022-07-131-9/+8
| | | | | | | | | convert more QString containing paths to Utils::FilePath Change-Id: I1219d7d147993e48cfa641dc9bea72ab38c90f51 Reviewed-by: Tim Jenssen <[email protected]> Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: <[email protected]>
* Rename QtSupport::BaseQtVersion to QtVersionhjk2022-01-241-1/+1
| | | | | | | | | | ... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid conflicts. Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd Reviewed-by: <[email protected]> Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Christian Kandeler <[email protected]>
* Don't call non-const method on temporary containerJarek Kobus2020-12-081-1/+1
| | | | | | | | ...as it may detach. Fix the following clazy warning: Don't call QList::first() on temporary [clazy-detaching-temporary]. Change-Id: I667c122c42ccfc1344508154466d9c1dc6ae6166 Reviewed-by: hjk <[email protected]>
* Update qmljs parser to Qt 5.15 parserFawzi Mohamed2020-03-031-1/+7
| | | | | | | | | | | | | * parser side support for annotations, inline components, new UiVersion and all the things included in QT 5.15 parser * SourceLocation moved from QmlJS:AST to QmlJS * Visitors now need to handle throwRecursionDepthError * BaseVisitor for visitors that want to override all visit Task-number: QTCREATORBUG-23591 Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630 Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Simon Hausmann <[email protected]>
* Resolve ambiguous results of searches for relative file pathsChristian Kandeler2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | Qt Creator extracts file names from the output of external processes in various places, for instance from compilers during the build. It often happens that such file names are not absolute, so they cannot be directly opened in an editor when the user clicks on their representation in some widget. That's why they are processed by the FileInProjectFinder facility first. This patch enhances the FileInProjectFinder to be able to return more than one candidate for a relative file path, and allows the user to choose between these candidates where possible. This way, we won't open a random file anymore when a project contains more than one file with the same name. Fixes: QTCREATORBUG-13623 Change-Id: Id19c9eace3e6b3dbde89f6528e6d02b55872d747 Reviewed-by: hjk <[email protected]>
* QmlProfiler: Remove extra file cacheUlf Hermann2018-07-161-11/+2
| | | | | | | | The FileInProjectFinder has its own cache. We don't need to duplicate it. Change-Id: I90450ac734953e3747e55cb74505dd48e5f22f6e Reviewed-by: Tobias Hunger <[email protected]>
* QtSupport: Move populateFileFinder to BaseQtVersionUlf Hermann2017-10-041-50/+2
| | | | | | | | | | This populates a file finder so that it is best able to find QML files, prioritizing the given project/target. Some of it would also apply to a non QML file finder, but as we don't use FileInProjectFinder for other file types we keep the code here, for now. Change-Id: I14e2ac63e699afe27d2f3af8ca3d57dfe732da8c Reviewed-by: Tobias Hunger <[email protected]>
* QtSupport: Add a method to retrieve the QML pathUlf Hermann2017-09-291-1/+1
| | | | | | | | We check that qmake property in many different places. Change-Id: Ifd5efe4ad2831385493bd3afe8538929578e8fb4 Reviewed-by: hjk <[email protected]> Reviewed-by: Tobias Hunger <[email protected]>
* QmlProfiler: Add QT_INSTALL_QML paths to FileInProjectFinderUlf Hermann2017-09-271-3/+9
| | | | | | | | This enables us to find QML files that are part of Qt, also if they are not in the same location on the host and target systems. Change-Id: Idcd0be8ae4301000c4123e39edeb04b43efb4659 Reviewed-by: hjk <[email protected]>
* QmlProfiler: Use a Target for populateFileFinder()Ulf Hermann2017-09-271-7/+3
| | | | | | | | The RunConfiguration we were using previously only served to retrieve a target. Change-Id: I30628197de3025511a03a53d3119083b980762c8 Reviewed-by: hjk <[email protected]>
* QmlProfiler: Properly prepare the file finder on every startUlf Hermann2017-08-151-0/+1
| | | | | | | | | We want to examine the current list of projects, also if we don't have a specific runConfiguration. Also, after repopulating the file finder, we need to clear the cache of file mappings, as they might have changed. Change-Id: I351789fe999009d443ca5ade9b365bfd490e0e23 Reviewed-by: Christian Kandeler <[email protected]>
* QmlProfiler: Rename QmlProfilerDetailsRewriter::clearRequests to clearUlf Hermann2017-08-151-1/+1
| | | | | | | It also clears the lookup cache. Change-Id: I9fdd9136084a17f427336d6ce2d37d724b9b20d2 Reviewed-by: Christian Kandeler <[email protected]>
* QmlProfiler: Add some sanity to details rewriter's PropertyVisitorUlf Hermann2017-08-151-28/+27
| | | | | | | Take care of possible integer overflows and apply coding style. Change-Id: Ib3922f30c102575ab773f7708864886fc0b53d15 Reviewed-by: Christian Kandeler <[email protected]>
* QmlProfiler: Move the file finder into the QML modelUlf Hermann2017-02-151-17/+80
| | | | | | | | | This is the place where we need it most. In addition, this allows us to use the DetailsRewriter's cache also on gotoSourceLocation. Change-Id: I14e0f11ba7c8a2a3888b2e8439a375068b36e29a Reviewed-by: Christian Kandeler <[email protected]> Reviewed-by: Ulf Hermann <[email protected]>
* QmlProfiler: rename requestId into typeIdUlf Hermann2016-12-281-5/+5
| | | | | | | No need to invent a new name for the same thing. Change-Id: I370ec7be9c762642ae35e4f7a60ff9f5eb8ae3fe Reviewed-by: Christian Kandeler <[email protected]>
* QmlProfiler: Avoid QHash::equal_range()Ulf Hermann2016-12-211-3/+4
| | | | | | | It was only introduced in Qt 5.7. Change-Id: I5f810c7244b8e8551c3249d8a8f7c6625185692e Reviewed-by: Christian Kandeler <[email protected]>
* QmlProfiler: Simplify details rewriterUlf Hermann2016-12-201-39/+41
| | | | | | | | | | | There is not need to constantly loop all the requests. We can simply hash them by file name. Also, we only need one container for file names and requests, and we don't need to construct a QTextStream, just to do QString::mid(), and the connecting and disconnecting to/from the QML code model needs to be centralized. Change-Id: I6a887f3375f0534e4b8fab6613882038ea4ddf43 Reviewed-by: Milian Wolff <[email protected]>
* QmlProfiler: Remove pimpl pattern from details rewriterUlf Hermann2016-12-201-52/+26
| | | | | | | It's internal, so we don't need to hide it behind a d pointer. Change-Id: Ib5b7ac790a1c143414a7ed11e06a5d8a9464de55 Reviewed-by: Milian Wolff <[email protected]>
* QmlProfiler: Apply some coding styleUlf Hermann2016-12-201-3/+3
| | | | | Change-Id: Id214986aaf6c7b0de50fdba2e45d8d0a309dabc3 Reviewed-by: Milian Wolff <[email protected]>
* QmlProfiler: Don't connect() null pointersUlf Hermann2016-07-051-1/+1
| | | | | Change-Id: I0373e19a6d362f115e578420487a90875488837c Reviewed-by: Joerg Bornemann <[email protected]>
* QmlProfiler: Make members of QmlEventLocation privateUlf Hermann2016-06-101-5/+6
| | | | | | | You should not change them independently as that is error-prone. Change-Id: I07890a29b045492fe804b9537094dea763bc1b8d Reviewed-by: Christian Kandeler <[email protected]>
* QmlProfiler: Don't crash if there is no QmlJSModelManagerUlf Hermann2016-05-171-3/+9
| | | | | | | Change-Id: I63b978f0f9c42c8968da7e779cdff876c18d8f31 Task-number: QTCREATORBUG-16276 Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Alessandro Portale <[email protected]>
* Move QmlProfiler specific files from qmldebug to qmlprofilerUlf Hermann2016-05-031-3/+3
| | | | | | | | | | These file were not used anywhere else and had no business to be in qmldebug to begin with. Moving them allows us to drop a number of namespace qualifications and forces us to rename a few local symbols in other classes in order to avoid name clashes. Change-Id: I658ed455eec027cbaddacf2980d2ea6827ae6205 Reviewed-by: Christian Kandeler <[email protected]>
* Make sure the path we add to pendingDocs is canonicalAlbert Astals Cid2016-04-071-0/+2
| | | | | | | | | | | | Otherwise i had a problem where we were waiting for /usr/share/unity8//Dash/DashPageHeader.qml but then on QmlProfilerDetailsRewriter::documentReady we got /usr/share/unity8/Dash/DashPageHeader.qml and since it's not the same qstring we didn't realize it was the same file Task-number: QTCREATORBUG-16020 Change-Id: I3b07450438d98734fbbff9f8b7a3d9d851ed4e5d Reviewed-by: Ulf Hermann <[email protected]>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <[email protected]>
* QmlProfiler: Convert connections to Qt5 styleUlf Hermann2015-11-021-4/+4
| | | | | Change-Id: I1a490add706cd0cfce3f243e4ebc32a8c9a975c7 Reviewed-by: Joerg Bornemann <[email protected]>
* QmlProfiler: Remove separator commentsUlf Hermann2015-07-021-2/+0
| | | | | | | It's not clear what they're supposed to tell us. Change-Id: I62f4fb1265396b8d61df0ce6e3409f0eda677170 Reviewed-by: Joerg Bornemann <[email protected]>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <[email protected]>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <[email protected]>
* | qmljs: improve handling of qml dialectsFawzi Mohamed2014-07-301-1/+1
|/ | | | | | | | | | | | | Language::Enum -> QmlDialect * class instead of enum * moved Language specific operations to it (from Document) * nicer handling QStringList -> PathsAndLanguages * store language along with path, to perform a correct scan and improve path handling Change-Id: If69d35c63cfeb48aa670b51870916cd0c40f1916 Reviewed-by: Thomas Hartmann <[email protected]>
* QmlProfiler: Cache file lookup when loading eventsUlf Hermann2014-03-071-1/+10
| | | | | | | | | | | The file lookup is the single most expensive operation when loading events from a profiled application, in particular because so far we're doing one lookup per source location, many of which are actually in the same files. Caching those lookups for a short time dramatically increases performance. Change-Id: Iaa47327aca3f34cbad194757d3ba152205788682 Reviewed-by: Kai Koehne <[email protected]>
* qmljs: generalize language treatementFawzi Mohamed2014-01-281-1/+1
| | | | | | | | | * better support qbs and similar non QtQuick qml languages * begin to clean and migrate things from ModelManager to ModelManagerInterface Change-Id: Ifa39dc1e4c568e9e21307f4913dcb5989e80420f Reviewed-by: Thomas Hartmann <[email protected]>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <[email protected]> Reviewed-by: Kai Koehne <[email protected]>
* QmlProfiler: reworkedChristiaan Janssen2013-08-091-6/+11
| | | | | Change-Id: I66a236a024d76e7bef6edfb91ae30b5dd098b76b Reviewed-by: Kai Koehne <[email protected]>
* 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 <[email protected]>
* | qmljs: differnt language constants for the different qml flavorsFawzi Mohamed2013-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | Added separated qbs, qmltypes, QtQuick1, and QtQuick2 and "generic" Qml languages. Cleaned up the mime types a bit, preparing for registered mime types. Change-Id: I0e484c93e003176cd659acc546baa6d024defa19 Reviewed-by: Tobias Hunger <[email protected]> Reviewed-by: Fawzi Mohamed <[email protected]>
* | 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 <[email protected]>
* | QmlProfiler: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-271-1/+1
|/ | | | | | Change-Id: I99c96e723e80ec318acd9300b4f44e7c3ce37485 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Christiaan Janssen <[email protected]>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <[email protected]>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <[email protected]>