aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmljstools
Commit message (Collapse)AuthorAgeFilesLines
* QmlJSTools: Fix plugin unit testChristian Stenger2020-07-281-1/+1
| | | | | | | Amends 58ea14aea7c676. Change-Id: I27d68572cffd9d2e37b3dbf8c47c75633db5d806 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Core/Utils: Migrate further to Utils::Idhjk2020-07-063-4/+4
| | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ExtensionSystem: Remove PluginSpec::isHiddenByDefaulthjk2020-06-161-1/+0
| | | | | | | Not used anymore. Change-Id: Ic73ba3024b9e6157ff044cb23450fc9dad3c4c02 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlJS: Track futures to allow testingChristian Kamm2020-05-211-1/+1
| | | | | | | | | Tests often want to wait for all async tasks to finish before progressing. Change-Id: I61738df730ca341b5c9d227569d961cd1991b296 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Philip Van Hoof <philip@codeminded.be>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-03-261-0/+7
|\ | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/dialogs/shortcutsettings.cpp Change-Id: I1f21845350bb69268ca51bc77167a8244adce22a
| * Editor: Add Qt Script mime typeDavid Schulz2020-03-241-0/+7
| | | | | | | | | | | | Fixes: QTCREATORBUG-23715 Change-Id: I4c7da375a11fb35c66e19769746267b2b661ee55 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: Remove Target::applicationTargets()hjk2020-03-251-1/+3
|/ | | | | | | That's BuildSystem::applicationTargets() nowadays. Change-Id: I01cf0a491e4cb289af08f529fd15c85bfcdf5493 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update qmljs parser to Qt 5.15 parserFawzi Mohamed2020-03-035-9/+21
| | | | | | | | | | | | | * 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 <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add final specifies to classesIgor Sidorov2020-02-051-1/+1
| | | | | | | Warning -Wfinal-dtor-non-final-class in clang trunk Change-Id: I2bf17064bf8898eab10b82b69583a283157766d0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Several SettingsPages: Code cosmeticshjk2020-01-301-2/+0
| | | | | | | De-Q_OBJECT-ify, remove unnecessary #includes, final-ize, etc. Change-Id: I461d3e73400dacac90c22e7c84a40e3ea1718b6e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake Build: rename target qmljs to QmlJSCristian Adam2020-01-161-1/+1
| | | | | | | This is in sync with what qmake and qbs project have. Change-Id: Id82bbd933a8331c3e2032e5068323c183b2a1814 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Core: Introduce a IOptionsPage::setCategoryIconPathhjk2020-01-161-2/+1
| | | | | | | Less noise on the user side. Change-Id: I34dea09e8a3c8639f5a7db89b22f8b825b946395 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TextEditor: Fix typo in a TextDocumentLayout functionNikolai Kosjar2019-12-181-1/+1
| | | | | Change-Id: I17153d9bfe9820f3ccc88f54bce1d494a522be33 Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlJS: Scan app.qmltypes and lib.qmltypes for type informationUlf Hermann2019-10-311-0/+8
| | | | | | | | | | | | | | app.qmltypes is being added as a new convention to Qt 5.15. These files are to be found next to application binaries, and contain the QML types those application register themselves, in contrast to QML types registered from plugins loaded via the regular import mechanism. lib.qmltypes works the same way, in principle, for libraries. This change only adds it to the possible names for qmltypes files, though. Change-Id: I1d7c5835c8c3e988d214c5cdb949ca677b48dfc5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlJS: Clean up qmljsmodelmanagerinterface.{h|cpp}Ulf Hermann2019-10-292-6/+10
| | | | | | | Avoid foreach, fix linter warnings, simplify types, apply coding style. Change-Id: I7cec65e775ee14ce60e1e57077e917285d58c152 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlJSTools: make setupProjectInfoQmlBundles privateUlf Hermann2019-10-282-31/+25
| | | | | | | No one needs to call this function. Change-Id: I5647475ef2ec7dce5dcf7834245985bfb45632e6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlJS: Clean up ViewerContextUlf Hermann2019-10-231-1/+1
| | | | | | | | | | The special ctor wasn't used anywhere, the default ctor can be replaced by inline initialization, maybeAddPath is only meaningful in the model manager and the language compatibility check should definitely not pretend to be a general rule either. Change-Id: I11cf25fe1c696550d33b56ce57316100321d564b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Remove unused QObject parent arguments on options pageshjk2019-09-112-4/+2
| | | | | | | | In the new plugin setup scheme they are data members of the plugin pimpl and never use the parent. Change-Id: I28fe150393e8159064dcfbd113ce0320af50fd58 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove usages of deprecated APIs of QLayoutSona Kurazyan2019-09-021-1/+1
| | | | | | | | | | Replaced: QLayout::setMargin() -> QLayout::setContentsMargins() QLayout::margin() -> QLayout::getContentsMargins() Task-number: QTBUG-76491 Change-Id: If28ef6910b3afe5d04e4746b74f9362a3e3b3c8e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils::Environment: Use expanded valuesChristian Kandeler2019-08-201-1/+1
| | | | | | | | | The Environment class is supposed to support values with references to other variables, but we failed to actually expand them in most places. Fixes: QTCREATORBUG-22687 Change-Id: I108cb59d3b4571471423455240f6f4f1cf64bf05 Reviewed-by: hjk <hjk@qt.io>
* Locator: Extract MatchLevel and use it in several filtersAndre Hartmann2019-08-151-5/+4
| | | | | | | | | | | | ... that already used index-based prioritising. There are a few more with two- or three-level priority, but these still use the old scheme with multiple lists good/better/bestEntries and converting them would not gain much. Change-Id: I21f7cfe07a3ae8183db9cb62311697d03db6e4da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlJSTools: Fix compileChristian Stenger2019-07-311-2/+2
| | | | | | | | Needed because of conflicting patches went in nearly at the same time. Change-Id: I042637438d1b4e412ae39bc2e8bc5e1aa24527dc Reviewed-by: André Hartmann <aha_1980@gmx.de>
* QmljsFunctionFilter: Simplify priority handlingAndre Hartmann2019-07-311-16/+13
| | | | | Change-Id: Ib3cb7f597256a3d19cc6cab3a2efa3961ac0c478 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Compile fix with recent Qt devhjk2019-07-291-5/+2
| | | | | | | | | The reasoning in 1b4766e26c6b did not take into account that the scope of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with f70905448f6 in Qt base. Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-282-3/+3
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Replace uses of qVariantFromValue with QVariant::fromValuehjk2019-05-271-1/+1
| | | | | | | | Deprecated in Qt 5.14, alternative has been around since Qt 4 at least. Change-Id: I4e3a53c289088368609e0d0ce2405a832d311308 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove excess blank lines after namespaceOrgad Shaneh2019-05-271-1/+0
| | | | | Change-Id: I4e4f83017f2bfc2cf842c4c971ed4b05e0447e6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: Add ability to disable building of individual pluginsEike Ziller2019-05-231-3/+4
| | | | | | | | | | | | | | Adds a cache entry "BUILD_PLUGIN_${NAME}", defaulting to ON which can be set to OFF to disable building of a plugin. Adds a extend_qtc_plugin function that should be used to add properties to a plugin after add_qtc_plugin, instead of the standard CMake functions target_... . The new function results in a no-op if the plugin was disabled. Change-Id: I57f6799620aea0aaa8b56acead4815ccced95911 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Qt Creator CMake portCristian Adam2019-05-171-0/+25
| | | | | | | | | | | | | | Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmljstools: Remove dead filesTobias Hunger2019-05-142-139/+0
| | | | | Change-Id: I25c75054bc1433844ce8a52c3774f5a94bf07bab Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-112-2/+2
| | | | | | | | | | | The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
* ClangFormat: Add cursor position to the indenter interfaceIvan Donchevskii2019-01-312-7/+16
| | | | | | | | | Sometimes it's imnportant where the cursor currently is to properly format the code without affecting the current line. Change-Id: I8b1fb11d2303adb5f960c7cb80a0ed2e6e45010f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Fix warning: "Don't call QVector::first() on temporary QList/QVector"Alessandro Portale2019-01-281-1/+1
| | | | | | | [-Wclazy-detaching-temporary] Change-Id: I23f5cbd80bb92d3f9f1bfb5ae07493818958c5b0 Reviewed-by: hjk <hjk@qt.io>
* ClangFormat: Refactor indenter to allow ClangFormat unit-testsIvan Donchevskii2019-01-226-30/+22
| | | | | | | | | | We do not build texteditor files in unit-tests so some tricks were required to make ClangFormatIndenter available. First simple unit-test proofs it builds and runs. Change-Id: I81d5ea099bd27fd1c1ed8b5b7877299dcc62a67f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* QmlJS: remove qtquick1 leftoversTim Jenssen2019-01-181-5/+1
| | | | | | | | QT_INSTALL_IMPORTS and the used ProjectInfo.qtImportsPath variable were only used for QtQuick1. Change-Id: I34da0cfc77effa84f3a7578e7f91fed0768a9bf4 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlJSTools: ModernizeAlessandro Portale2018-12-0717-73/+56
| | | | | | | modernize-* Change-Id: Ifc270455ab7500d18798ac0130744662ad3303fb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2018-11-291-0/+5
|\ | | | | | | | | | | | | Conflicts: src/plugins/android/androidrunnerworker.cpp Change-Id: Ibd8b99435365fb7e7d488313fd1d2b3a75adad1b
| * QmlJsTools: add mimetype for JavaScript modulesDavid Schulz2018-11-261-0/+5
| | | | | | | | | | | | Fixes: QTCREATORBUG-21517 Change-Id: I18b2b309279f40c3dd4cdee2e7cf27c25fa4984a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | qmljs: update parserMarco Benelli2018-11-221-4/+4
|/ | | | | | | | | Update the qtcreator qmljs parser to the one of Qt 5.12. It supports EcmaScript 7. Task-number: QTCREATORBUG-20341 Change-Id: I0d1cff71402ba17e22cde6b46c65614e162280de Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* Remove unused variablesRobert Loehning2018-09-071-1/+0
| | | | | Change-Id: I8b49a2eea7509abb685d751a0f038dc3b4f555ca Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Prefer using 'override' instead of 'virtual'Alessandro Portale2018-07-112-12/+12
| | | | | | | | warning: prefer using 'override' or (rarely) 'final' instead of 'virtual' [modernize-use-override] Change-Id: I6dac7a62b627fa1353b4455e1af92f869c2571cc Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* qmljs: cleanup locator's entries when closing a projectMarco Benelli2018-05-231-1/+18
| | | | | | Task-number: QTCREATORBUG-13459 Change-Id: Icebe06a8a49389511a12506728f2109dc0b95287 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Qml: Consistently use nullptrTobias Hunger2018-05-081-1/+1
| | | | | | | Fixed by clang-tidy modernize-use-nullptr. Change-Id: Ibe0dddaacbabd47b5a0519ae361132818d5b8be2 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* QmlJsEditor/QmlJsTools: Use override consistentlyTobias Hunger2018-05-072-5/+5
| | | | | | | clang-tidy fixes from modernize-use-override check. Change-Id: I29716dcf73946b5762568d349a3f5a3da4f656e6 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* Update Options dialog iconsAlessandro Portale2018-04-245-2/+4
| | | | | | | | | A new set of scalable and themable icons with unified look as provided by Diana. Task-number: QTCREATORBUG-20325 Change-Id: I68498b034e9e43fbb61511a38d9c7fc0003ab076 Reviewed-by: hjk <hjk@qt.io>
* Clean up options page category display name and icon set upEike Ziller2018-04-232-4/+2
| | | | | | | | | | | | | | In cases where plugins extend an existing settings category of a plugin that they depend on anyhow, they do not need to specify the translated display name and icon for that category. Some options pages were already not setting the icon, but still the translated name, which makes even less sense. Clean up this mess, only setting display name and icon if that is necessary. Change-Id: I8bc9d0c51b11d48f1d847337838704d663e70b45 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* qmljs: remove remaining references to QtQuick1Marco Benelli2018-04-032-12/+0
| | | | | | | | This patch removes all references to QtQuick1 in qml library, plugin, designer, profiler and tests. Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Don't translate default windowTitle again and againRobert Loehning2018-03-061-1/+1
| | | | | Change-Id: I4b4ff16e02c517bcd5a7c5ae73f62dd2a5bcc7cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QmlJSPlugin: reorganize setuphjk2018-02-088-87/+53
| | | | | | | Pimpl, remove use of global object pool, cosmetics, ... Change-Id: I9e1415b07d7ff8e95db0998c87ce7d75ca638a8e Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* TextEditor: Fix compile with Qt5.6/gcc4.9Christian Stenger2018-02-071-1/+1
| | | | | | | Amends 91c19c2734246dbf528a6076a57b72d924bf0484. Change-Id: I556c2336ac2bbde7f7f2acf4ed9339809a918b55 Reviewed-by: hjk <hjk@qt.io>