aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cpptools/cpplocatorfilter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* CppTools: Fix QStringRef and QSharedPointer related issues with Qt6Eike Ziller2020-09-151-1/+1
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I97347ac3fb397fea8eee655e3cc4ee252c511885 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-09-121-1/+6
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/projectexplorer/gcctoolchain.cpp src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
| * CppLocatorFilter: Fix highlighting in extra info columnAndre Hartmann2019-09-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the following example: typedef int value; void value_test(void) {} void test(value v) {} searching for "value" findes both candidates; and for the locator filters "m" and "." highlighting already worked fine. For the locator filter ":", however, the arguments are displayed in the extraInfo column. To get proper highlighting here, we have to repeat the regexp match in this column. While fixing that, make sure that full-qualified searches (separated by "::") are still highlighted properly. For the Clang Code Model, there is still a bug not addressed by this patch: Ctrl+K with ". value" -> "value" isn't highlighted yellow. Change-Id: Idd5eeeedb893151cd5c7f70f6b11397db788b706 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Locator: Extract MatchLevel and use it in several filtersAndre Hartmann2019-08-151-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | ... 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>
* | CppLocatorFilter: Simplify priority handlingAndre Hartmann2019-07-311-22/+14
|/ | | | | Change-Id: I612e0cc5e56a50bd6830ae2f25291aaed571ae67 Reviewed-by: Eike Ziller <eike.ziller@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>
* CppTools: modernizeAlessandro Portale2019-01-211-3/+1
| | | | | | Change-Id: Iaf02e4d026f1ac8b216833d83cd7a735e21ff60a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* CppLocatorFilter: Fix result sortingAndre Hartmann2018-11-021-4/+15
| | | | | | | | | | | * Fix rating items with startsWith()/contains() higher * Rate matches in function parameter list lower Task-number: QTCREATORBUG-19377 Change-Id: I2ea4c3ba96cd086aef82627326fa0888f700850f Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Clang: new empty locator filter classesIvan Donchevskii2018-01-241-2/+3
| | | | | | | | Introduce classes to replace builtin locator filters. Change-Id: I5cc6f15fb0f59ea8a51b14a86301cf219cc0d6d6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Locator: Cleanup and modernize Locator and filtersAndre Hartmann2017-12-301-1/+1
| | | | | | | | | | | | * Omit QLatin1{Char|String} * Use member initialization * Use range-based-for (and fixed the cases with non-const Qt container) * Sort includes to common style Change-Id: Ibc33a732bb153862efd6d5febfac758229cb61d4 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* CppTools: Fix highlighting when matching with scopeOrgad Shaneh2017-11-141-4/+14
| | | | | | | | | | | | | | | class Foo { void funcInside() {} void funcOutside(); }; void Foo::funcOutside() {} Search for Foo::func in the locator. func was not highlighted. Change-Id: I923bd3ef2df47c5fa030b8899d1b4df7437b1820 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* CppTools: Match also function arguments in locatorOrgad Shaneh2017-11-021-1/+4
| | | | | | | Useful when there are several overloads for the same function. Change-Id: I325bda7d2fdf4108f71a61d5473cd55310c51c28 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Locator: De-duplicate highlightInfo generation for camel humpsAndre Hartmann2017-10-051-5/+1
| | | | | Change-Id: I5a3fd28ddd68b2ac17a76384cffad12064d06259 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Locator: De-duplicate RegExp pattern generationAndre Hartmann2017-09-291-2/+1
| | | | | | Change-Id: I3576e1507aebed15245e1f197995bfe9e345e32b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Locator: Add camel hump locator filter for C++, QML, and filesAndre Hartmann2017-09-191-23/+29
| | | | | | | | | | | | | * Use the CamelHumpMatcher in the C++, QML, and files filters * Supports matching against UpperCamelCase, lowerCamelCase and snake_case strings * Supports highlighting of matched characters Task-number: QTCREATORBUG-3111 Started-by: David Kaspar <dkaspar@blackberry.com> Change-Id: If6220191432ef965bde3c8dbe4a10d89e222ba6f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove 1-1 dependency between locator and locator input widgetEike Ziller2017-06-131-1/+5
| | | | | | | | | | | Add possibility for filters to set a new search text when accepting an entry. Move placeholder text update from locator manager to widget. Propagate filter update through signal-slot connection instead of directly. LocatorManager::show is the only place left that directly references the locator widget. Change-Id: Id61354d9f166c2af8c9d5528ad8998c7c6b8e1ab Reviewed-by: David Schulz <david.schulz@qt.io>
* Locator: Add highlighting of the search textSerhii Moroz2017-03-211-19/+22
| | | | | Change-Id: Ia166e9667076e46770a754b626ceb28080139e79 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QRegExp include cleanupSamuel Gaist2017-03-131-0/+1
| | | | | | | This patch adds the missing include statements for QRegExp. Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove use of deprecated Qt algorithmsOrgad Shaneh2016-08-091-2/+4
| | | | | Change-Id: Ib35cffa2d5762874feea9b1d4df7f569c0e5f496 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* 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 <tobias.hunger@theqtcompany.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+2
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | C++: Remove unneeded qualificationsOrgad Shaneh2015-02-041-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I6fbe13ddc1485efe95c3156097bf41d90c0febac Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* C++: Remove class/function/enum extraction from CppLocatorData.Erik Verbruggen2014-06-181-18/+14
| | | | | | | | | | | | | | | | With every single change in a document the corresponding IndexItem elements were extracted and put into an vector. The locator filters then used these lists to iterate over and filter them. This change removes that extraction, and the filtering now directly iterates over the IndexItem elements with a callback. The exception is the current document filter, because it also queries for all declarations. Adding this to the model would result in a higher memory usage, while that information is only used by this filter. Change-Id: Ibe445cc11e9f68b5d807348fd46c7cac4aff4c85 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: Rename ModelItemInfo to IndexInfo.Erik Verbruggen2014-06-161-9/+9
| | | | | | | And move it into its own header and source files. Change-Id: I37401badd819e028e1d767425759dc0ff27afe31 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* CppTools: Fix compilation with MSVCTim Jenssen2014-06-021-0/+1
| | | | | | Change-Id: I6a304b978738573bfbea7797b3c3d610abde7374 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* C++: pass ModelItemInfo around wrapped in a QSharedPointer.Erik Verbruggen2014-06-021-14/+17
| | | | | Change-Id: I36162ea589ad01cf2ba79fc931732422fc1e6983 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Core: Merge Find and Locator into Core pluginhjk2014-01-141-9/+9
| | | | | | | 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>
* 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>
* 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>
* CppTools: Fix qualified ids in the ':' locator filterNikolai Kosjar2013-09-131-1/+1
| | | | | | | | | | | * Always display qualified ids in the ':' filter * Show correct qualified ids (for some symbols the namespace was shown twice) Task-number: QTCREATORBUG-10136 Change-Id: Id178cb4b8abcc316250fa16e5f3e5a8e72bc0c10 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Remove dead codeTobias Hunger2013-09-121-2/+0
| | | | | Change-Id: I89e544946ff06593cb16badfb39a04f9d22924ef Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* CppTools: Introduce LocatorDataNikolai Kosjar2013-08-301-80/+17
| | | | | | | | | | | | | | | | Until now the locator filters CppLocatorFilter, CppClassesFilter and CppFunctionsFilter used unnecessarily their own SearchSymbols instance. The results were also saved separately, which was unfavorable since e.g. the functions and classes data could be shared. Starting with this patch an instance of LocatorData will serve all mentioned filters. This saves about 20MB of memory after indexing the Qt Creator project. Change-Id: I8a34b67eb9fe0e5c68ba6e7c8f576389c78efc6f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Fix displaying symbols of CppLocatorFilterNikolai Kosjar2013-08-301-10/+2
| | | | | | | | | | The left column of the locator filter displayed the fully qualified name, which is a bit too long... Regression introduced by commit 760aa0f. Change-Id: I57fb44cd205c6e54158de22b6638e4a28014749c Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Locator: Match also against qualified namesNikolai Kosjar2013-08-261-2/+5
| | | | | | | | | | | | If the user input contains "::", match against the qualified symbol name. Otherwise, as before, match against the unqualified symbol name. This applies to the function and class filters and allows to narrow down the results by using a namespace prefix, e.g. "c core::*category". Change-Id: Id152f412740e27f2f2d001dc7008dba8a92a37ce Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppTools: Get rid of SearchSymbols::setSeparateScope()Nikolai Kosjar2013-08-261-16/+22
| | | | | | | | This will make it easier to use a single SearchSymbols instance and a single run serving all locator filters. Change-Id: Idb6a3693ad356227d46d0b28fb4c3a5db62b4ac4 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Locator: Case sensitivity of input affects prioritizingNikolai Kosjar2013-08-221-1/+2
| | | | | | | | | | | | | | | | | | | So far candidates were prefix matched case sensitive which led to an unfavorable results order. With this patch, if the input is lower case, the prioritizing happens by a case insensitive prefix match. Otherwise the match happens case sensitive (just like before). Example: Search for e.g. "m cppmodelmanager" Top result before: AbstractEditorSupport (match at parameter type) Top result now: CppModelManager Change-Id: Ic27042cfe717be812a2237a3437399597c98dd74 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* CppTools: Fix "! condition" coding styleNikolai Kosjar2013-07-251-1/+1
| | | | | | Change-Id: Ic7e634e4249fb64edbc2daceb65ec8e9b5f0f8b9 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by: David Schulz <david.schulz@digia.com>
* Move openEditorAt from BaseTextEditorWidget to EditorManagerEike Ziller2013-06-031-2/+2
| | | | | | | More sensible place, gotoLine is a method in IEditor anyhow. Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8 Reviewed-by: David Schulz <david.schulz@digia.com>
* Clean headers in CppTools.Friedemann Kleint2013-04-101-3/+0
| | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it. Change-Id: Ic8464ea084ca1ab401e9f4a7d0183b92b4038902 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* fix include style relating to cplusplus librariesOswald Buddenhagen2013-04-031-0/+1
| | | | | | | | | | | ... and adjust INCLUDEPATH accordingly. while i'm at messing with include statements, also re-order the include blocks according to policy and sort them within bigger blocks. Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: Change the locator filter to queue changed documents.Erik Verbruggen2013-03-071-6/+50
| | | | | | | | | | The changed documents get searched for symbols when either a limit of 10 pending documents is reached, or when the filter is asked to return all matches. Change-Id: Ic18fc66b0a802165fdd8a028bd13d0ce11524510 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@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>
* | Core: simplify ILocator interfacehjk2013-01-181-0/+2
| | | | | | | | | | | | | | | | | | Use data members instead of virtual functions for id, displayName and priority, use Core::Id, not QStrings for id, de-pimpl CommandLocator. Change-Id: Id8b41f184cb995138b2d76c923d6d3ae02b7e3f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | CppTools: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-221-1/+1
| | | | | | | | | | Change-Id: I31a6117c2b4be3f8603c16a9f98b6937a0b9aeb2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 13:30:00 +0000