aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmljstools
Commit message (Collapse)AuthorAgeFilesLines
* Revert "qmljs: better defaults, more uniform handling of paths"Fawzi Mohamed2014-05-071-11/+8
| | | | | | | | | moving to master This reverts commit 0c46692244def9edb89c2914b9b1e5eff10cb6ce Change-Id: Ie09f6db02058f4a5539221f1a0cc4f9225f38300 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Revert "qmljs: add qbs default paths"Fawzi Mohamed2014-05-071-5/+0
| | | | | | | | | moving original patch to master This reverts commit 809d6b96be8842c854364f7e4181ee3bc15e495d Change-Id: If875d22f8dad93d40be7a12e3fe3b308d6cafb8e Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Revert "qmljs: fix compilation with Qt4 (attempt 2)"Fawzi Mohamed2014-05-071-2/+0
| | | | | | | | | moving original patch to master This reverts commit 24c020baf00f0ccc3c8319da1261d6748d5a39b7 Change-Id: Iab24b97c058483d6d1dfbd557bf635ef3e102512 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qmljs: fix compilation with Qt4 (attempt 2)Fawzi Mohamed2014-05-071-0/+2
| | | | | Change-Id: I4a324dc0c6558dc8494d576b75b81a55455f218a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qmljs: add qbs default pathsFawzi Mohamed2014-05-061-0/+5
| | | | | Change-Id: Ia9e4d6d87ebe24b9c1fb7f43f8c78d55c404693e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: better defaults, more uniform handling of pathsFawzi Mohamed2014-05-061-8/+11
| | | | | | | | | | | | | | | | | Uniform handling of the different qml dialects. Now paths for a given document prefer the project of that document. For Qt the following sequence is used: - Qt of the project of the document - Qt of the active target - Qt used to run creator Currently all paths of the open projects are still merged, but that can be changed. Change-Id: Iacf28d63184c05e2bcdfe0210ec472d2bf140d66 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qmljs: fixing attributes naming (code style)Fawzi Mohamed2014-02-191-2/+0
| | | | | Change-Id: I3d5916483b99a8d6839b9cb6b9bde119a9da351a Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qml: moving most of ModelManager logic to ModelManageInterfaceFawzi Mohamed2014-02-1910-2730/+31
| | | | | | | | | | | | | | Currently ModelManager contains lot logic, but as it sits in QmlJSTools it is not possible to use it in standalone tests. Moving most of the logic to ModelManagerInterface (and cleanup) to allow better testing, and refactoring. This introduces a dependency of the qmljs lib on the cplusplus lib Also a (small) part of the CppTool::ModelManagerInterface has been moved to CPlusPlus::CppModelManagerBase to remove the dependency on CppTools to gather the Qml types exposed from C++. Change-Id: Icad7fe96dfd0f1a2b1058d82bd98c77c40aa5e9d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlJSConsole: Fix scrolling behaviorChristian Stenger2014-02-181-2/+2
| | | | | Change-Id: I3baaf8ac70661301a6f0947f4f8e79e97184a1a2 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Clean up single namespace forward-declarationsOrgad Shaneh2014-02-127-30/+10
| | | | | | | | | | | | | | | | | | Done using the following ruby script: Dir.glob('**/*.h').each { |file| if File.file?(file) s = File.read(file) t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') } if t != s puts file File.open(file, 'w').write(t) end end } Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e Reviewed-by: hjk <hjk121@nokiamail.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-112-5/+11
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* qmljs: generalize language treatementFawzi Mohamed2014-01-283-60/+30
| | | | | | | | | * 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 <Thomas.Hartmann@digia.com>
* TextEditors: Move font settings to documentEike Ziller2014-01-241-1/+1
| | | | | Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditors: Remove widget's setTabSettings methodEike Ziller2014-01-211-1/+1
| | | | | Change-Id: If212b45e2d526534b7853f3fa23b170f61e1976e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Use document instead of widget in TextEditor::RefactoringChangesDataEike Ziller2014-01-211-4/+5
| | | | | Change-Id: I938041c9774fbebd1edc6dc29ccfa569bae94f70 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-201-3/+6
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f
| * qml: avoid dumping or reading type info multiple timesFawzi Mohamed2014-01-161-3/+6
| | | | | | | | | | | | Change-Id: Id0c52f6a96a5c36893f64cbc96cc7eee300e6afa Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | qml: make dumping errors more chattyFawzi Mohamed2014-01-202-0/+5
| | | | | | | | | | Change-Id: I1471ba9459a1e48a03e26aa5dc008072460447be Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | TextEditors: Move indenter to document.Eike Ziller2014-01-151-2/+2
| | | | | | | | | | Change-Id: I8bdf7134562d007aa16cc63a34f5a15a708577ae Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Core: Merge Find and Locator into Core pluginhjk2014-01-145-17/+14
| | | | | | | | | | | | | | Change-Id: I7053310272235d854c9f409670ff52a10a7add8b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-0849-49/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-0849-49/+49
| | | | | | | | | | | | 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/3.0'Eike Ziller2013-12-181-2/+1
|\| | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/stdtypes.py src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
| * QmlJSTools: Fix plugin unit testChristian Stenger2013-12-121-2/+1
| | | | | | | | | | Change-Id: Ia8c807537de110844c1203bdf44ccd58e7abfa35 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Preferences: Add default implementation for filteringEike Ziller2013-12-102-29/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | The default "matches" method now takes the widget and looks for all child labels, checkboxes, push buttons and group boxes. Because of that, the former "createWidget" method can be called multiple times without creating a new widget (-->widget()), and the "finished" method must ensure that the created widget gets deleted, since not all widgets that were created are added to the UI anymore. Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Rename QString ITextEditorDocument::contents --> plainTextEike Ziller2013-12-101-1/+1
|/ | | | | | | To differentiate it from the byte array based IDocument::setContents Change-Id: Icc9600732c2742fb79254a0697870bacce3a59ee Reviewed-by: David Schulz <david.schulz@digia.com>
* qmljs: delay import scan until at least one qml file is parsedFawzi Mohamed2013-11-262-0/+18
| | | | | | Task-number: QTCREATORBUG-10899 Change-Id: I5dca739a89434c7b5813c7a79a76ab7c22e3d71d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: avoid double parsing of importsFawzi Mohamed2013-11-261-8/+22
| | | | | Change-Id: Ib45a63e3175924158dc2cff60a7b1964f491c375 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlJS: Fixing warningsThomas Hartmann2013-11-261-1/+1
| | | | | | | | | | Correcting ImportKey::compare(). The compare function was not stable and QMap did not work properly. Done with: Fawzi Change-Id: I11790215cba6944bf9f04be0c3844b35ea54ea70 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlJsTools: Fix compilation with Qt4Nikolai Kosjar2013-11-201-1/+1
| | | | | Change-Id: I76e067ec8223c42b480ad9d296cd3b7357831aab Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qmljs: scan importsFawzi Mohamed2013-11-203-27/+178
| | | | | Change-Id: Ied59f5d56c5816d9da57f23a619d604acec76000 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: fingerprints for documents, libraries and FakeMetaObjectsFawzi Mohamed2013-11-202-3/+7
| | | | | Change-Id: Ib9c9b86fbed19539dc42696292bdb3b93dd1b575 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: new import/dep trackingFawzi Mohamed2013-11-203-1/+38
| | | | | Change-Id: I9f4de2a06aad3afb80372a4b80e56db658683575 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Braces cleanupOrgad Shaneh2013-11-141-4/+2
| | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
* qmljs: use QTC_OVERRIDE in qmljsmodelmanagerFawzi Mohamed2013-11-121-29/+30
| | | | | Change-Id: I3cf1c241a236f8b38fda1b4d40c45e75faa3a1f7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qml: solve race condition when deleting while indexingFawzi Mohamed2013-11-122-2/+4
| | | | | | | | Task-number: QTCREATORBUG-10734 Change-Id: I521ac0881ff83a44846b133de5c292af8cda9d4e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlConsole: Save cycleshjk2013-11-081-0/+1
| | | | | Change-Id: I164449f83b6c24bdf89b0b770c9e19f32fe3f5be Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* qmljs: use new qml parserFawzi Mohamed2013-11-061-1/+1
| | | | | | | | 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>
* qmljs: temporarly disable tests, until new import handling is inFawzi Mohamed2013-11-061-0/+1
| | | | | Change-Id: I2585ae6b92c8c9e07dcdea2155d2438c3d020dce Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Qml Console view: Fix scrollingDaniel Teske2013-10-291-0/+2
| | | | | | | Broken by qtbase commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c Change-Id: I55b1ae8636a1c1cf1ed75f4d03b58ebf5bba511a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmljs: added qmljsconstants.hFawzi Mohamed2013-10-234-36/+36
| | | | | | | | | | | | | | Moved Document::Language, Import::Type and StaticAnalysis::Severity enums to qmljsconstants.h and renamed values removing the redundant part. Thus the effective length changed little or improved (Document::QmlLanguage => Language::Qml). The separate file allows better reuse of enum values without introducing circular dependencies. Change-Id: I5186d7c04f5d3f6c289068b919be5ff1ff118326 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Remove most trailing newlines from translated messages.Friedemann Kleint2013-10-221-2/+2
| | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* CppTools: Adapt C++ locator names to realityNikolai Kosjar2013-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | The new names are: * C++ Methods in Current Document -> C++ Symbols in Current Document * C++ Classes and Methods -> C++ Classes, Enums and Functions * C++ Methods and Functions -> C++ Functions Further notes: * "C++ Classes" stays the same. * The term "Methods" was removed since "Functions" says it all (member functions, non-member functions). Because of this, the "m" shortcut for this filter does not fit so well to the name anymore. * "C++ Symbols in..." - "Symbols" means the same as in the C++ Search dialog: classes, enums, functions and declarations Change-Id: I8e5f410f2dcb1fafe83d0a1c8607f4c17eabbb8c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* TextEditor: Use direct interface for registerMimeTypeForLanguageIdhjk2013-09-261-18/+6
| | | | | | Change-Id: I6984173acf86e80175f9e2346315b5b226d6bde9 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* CodeStyleSettings: De-noise user code by using QByteArray ids.hjk2013-09-251-4/+3
| | | | | Change-Id: Ia7210b0ff85667951e4e5554155d89ed6925f9ec Reviewed-by: David Schulz <david.schulz@digia.com>
* Apply static pattern to TextEditorSettinghjk2013-09-202-22/+17
| | | | | Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Move some functions out of defaults.js and make them project properties.Christian Kandeler2013-09-091-2/+1
| | | | | | | | | The one that is left is the only one that's actually a function taking real input. This saves a number of includes. Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* MessageManager: General cleanup.hjk2013-09-052-9/+5
| | | | | | | Apply 'static' pattern, rename 'printToOutputPane' to 'write' Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7 Reviewed-by: David Schulz <david.schulz@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 17:36:21 +0000