summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into wip/clangwip/clangErik Verbruggen2013-12-1010-39/+58
|\ | | | | | | Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
| * C++: split defines into project-defined and toolchain-defined.Erik Verbruggen2013-12-105-29/+40
| | | | | | | | | | | | | | | | So we can ignore possibly problematic toolchain-defines, while can still unconditionally apply project-defines. Change-Id: I7cb96f35a963d080011fe888ef71bfc098dd33ef Reviewed-by: Nikolai Kosjar <nikolai.kosjar@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>
| * Fix tooltips' texts.jkobus2013-12-041-6/+6
| | | | | | | | | | | | Change-Id: I9f8681a8d975558e5e8626566df73ac8438c4cef Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * C++: prevent possibly highlighting a document twiceErik Verbruggen2013-12-041-1/+5
| | | | | | | | | | | | | | | | Possible when the highlighter does not need semantic info to run, and is started through onDocumentUpdated() and updateDocumentNow(). Change-Id: I720299730213ac196143a273fb60cee8e43111f1 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| * Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-032-5/+0
| |\
| | * Revert "C++: Fix highlighting for lines with predefined macros"Nikolai Kosjar2013-12-032-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This takes too much memory. For qtcreator.pro the numbers are as follows: Patch applied: ~ 1600MB (RES) Patch reverted: ~ 510MB (RES) This reverts commit 4c2daa90ce558c3b4287edc97127471486a411d9. Task-number: QTCREATORBUG-10973 Change-Id: I843bd7c1ea4a26a1ec55ddc14c2a34a98d040922 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| * | CppTools: Add history completer to path choosersTobias Hunger2013-12-021-0/+1
| | | | | | | | | | | | | | | Change-Id: Iaedd5eb2890d19761c342d248e600b50e43be979 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-292-0/+5
| |\ \ | | |/
| | * C++: Fix highlighting for lines with predefined macrosNikolai Kosjar2013-11-292-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds definitions for the macros __FILE__, __LINE__, __DATE__ and __TIME__ on demand. As a side effect, this also introduces highlighting for the uses of these macros. Task-number: QTCREATORBUG-8036 Change-Id: Ib7546c7d45d2eecbc50c7883fc684e3497154405 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-273-2/+5
| |\ \ | | |/
| | * CppTools: Add revisions to AbstractEditorSupportNikolai Kosjar2013-11-253-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far revisions for AbstractEditorSupport were not needed because until recently we only had a single snapshot ("global snapshot"). Now, since editor snapshots are introduced, we need to make sure to update the corresponding documents in these snapshots, too. To do this efficiently, a revision is introduced for AbstractEditorSupport. Task-number: QTCREATORBUG-10894 Change-Id: Ibad1dbbafb7c721d1328959c1e903345fe465326 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | | Merge remote-tracking branch 'origin/master' into HEADErik Verbruggen2013-11-266-9/+79
|\ \ \ | |/ / | | | | | | Change-Id: Ia5a89c930d9dc127a299c8054e42441f6fcb0ca4
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-253-0/+49
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I0485b1bf75cc02f9fbcb5c05e350da91f491abe3
| | * C++: fix auto completion for member of classes accessed by usingPrzemyslaw Gorszkowski2013-11-223-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: namespace NS { struct S { int member; void fun(); }; } using NS::S; void S::fun() { mem// ctrl+space } Task-number: QTCREATORBUG-9037 Change-Id: I5a568be1b5c44deb02caa04996167a88a9c5d4d7 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-221-0/+1
| |\ \ | | |/
| | * CppTools: Fix crash on shutdownNikolai Kosjar2013-11-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to wait for the document parser, otherwise the CppModelManager object might get destroyed first and will be referenced later in CppEditorSupport::parse(). Change-Id: I1b591640c1da3e63e49ac0b4b8af41aae31b3d43 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-201-4/+7
| |\ \ | | |/
| | * CppTools: Fix race condition when closing filesNikolai Kosjar2013-11-191-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If parse() is called in another thread the CppToolsEditorSupport might be already destructed. Task-number: QTCREATORBUG-10548 Change-Id: Ie4215937eb1847b51bce8b080aca4925c0bee39f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-192-5/+22
| |\ \ | | |/
| | * CppTools: Use editor manager's codec as fallbackNikolai Kosjar2013-11-182-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...for reading not already opened files. This partly reverts commit f7c68f6. In case TextFileFormat::detect() fails, the user configurable editor manager's codec is used instead of QTextCodec::codecForLocale(). Adds also a qWarning() to easier detect encoding errors. Task-number: QTCREATORBUG-10378 Change-Id: I0fa4e6b898ed090d85414ce2a001f11b115a42d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | | Clang: add chooser for headers too.Erik Verbruggen2013-11-264-2/+27
| | | | | | | | | | | | | | | Change-Id: I8f720388f08a341e46049dfe2c3c158131a953c5 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | | Merge remote-tracking branch 'origin/master' into wip/clangErik Verbruggen2013-11-1618-31/+343
|\ \ \ | |/ / | | | | | | Change-Id: I11c5909b66334c3b6541d95fbee469714d93cf41
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-11-1517-30/+342
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/gdbbridge.py Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
| | * CppTools: Fix crash for documents without file pathsNikolai Kosjar2013-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 566be09 we might reparse the current document if the current editor changes. This is fine as long as the current document has a file path, which is not always true, especially for the documents created in the FakeVim tests. Task-number: QTCREATORBUG-10767 Change-Id: Ibe00ef8bb6a144e2ba09b311025d238c2dcde112 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
| | * Designer/CppTools: Fix flaky test_gotoslot_withoutProjectNikolai Kosjar2013-11-143-1/+9
| | | | | | | | | | | | | | | | | | | | | The document was not always updated in time. Change-Id: Iac89985d39a8784e3cbf63dfd42b1c5150775068 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| | * Braces cleanupOrgad Shaneh2013-11-142-5/+3
| | | | | | | | | | | | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
| | * CppEditor: Ensure utf8 encoded working copy from the preprocessor dialogNikolai Kosjar2013-11-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifbc2adeff83cbef9841da872e15a5b9dd8379a3d Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * CppTools: Speed up TypeHierarchyBuilder::buildDerived()Nikolai Kosjar2013-11-122-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending files of the file the base class is defined in were look up for *all* the derived classes. With this change, only the relevant files for the 'current' base class are looked up. Tested with qtbase.pro via Ctrl+T on the QObject definition. - Without this patch: ~60s - With this patch: ~40s Change-Id: Ia947f1a4f7d242a0cb81e42d0ef2afab2db70a7f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * CppTools: Add basic test for TypeHierarchyBuilderNikolai Kosjar2013-11-124-2/+225
| | | | | | | | | | | | | | | Change-Id: I7a82f2b22105d4e096fc0bd69679adacdde2c731 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * C++: Release more documents.Erik Verbruggen2013-11-128-9/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix memory leak in find-usages - do not retain snapshot in search history - when an editor is invisible for more than 2 minutes, release the backing snapshot Retaining snapshots will retain their documents, and if done for too long, the memory consumption might grow. This is especially the case when switching to a different kit (Qt version): in that case, the new versions of headers will be indexed, while the old ones stay around. Task-number: QTCREATORBUG-5583 Task-number: QTCREATORBUG-7645 Task-number: QTCREATORBUG-9842 Change-Id: I045eda1565e0a3fa702baeffaab9c12662f90289 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| * | CppTools: Fixed tooltip for Enable Doxygen blocksKnut Petter Svendsen2013-11-131-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ie047782cde63bd64b6a52747ee2cd7d4fc102b88 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | | Clang: enable code-model chooser.Erik Verbruggen2013-11-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I0929da85a0de8dc948f855b7501b78d547ed7477 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | | Merge remote-tracking branch 'origin/master' into wip/clangErik Verbruggen2013-11-051-5/+0
|\ \ \ | |/ / | | | | | | Change-Id: I4a0d2d179f5997022ada56595537a1e594729f90
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-301-5/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/plugins/qmakeprojectmanager/qmakeproject.cpp Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
| | * CppTools: Remove unused isInjectedFile() in cpppreprocessor.cppNikolai Kosjar2013-10-291-5/+0
| | | | | | | | | | | | | | | | | | | | | This static function got moved into a base class. Change-Id: I0b72f324bd52421388c7566dc4fd115a9b27ea7f Reviewed-by: David Schulz <david.schulz@digia.com>
* | | Merge remote-tracking branch 'origin/master' into wip/clangErik Verbruggen2013-10-291-8/+2
|\ \ \ | |/ / | | | | | | Change-Id: I59b0424258cdf25fe144305d32529a1ae9aebdc9
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-291-8/+2
| |\ \ | | |/
| | * Crossify normalizePathNameOrgad Shaneh2013-10-241-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Denoise usages get{Short|Long}PathName are now static. They're not used anywhere except in normalizePathName. Change-Id: Ief277b6d828faadd98ec7faa39dd682bfaa8805f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | | Merge remote-tracking branch 'origin/master' into wip/clangErik Verbruggen2013-10-2441-315/+1215
|\ \ \ | |/ / | | | | | | Change-Id: I20e318e656223cae863666379e628fdf828136ba
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-244-4/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/plugins/qnx/qnxutils.cpp Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
| | * CppTools: fix inclusion of "injected" defines.Erik Verbruggen2013-10-232-3/+8
| | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-10280 Change-Id: Ibc6ffeedb97a31a35a2d1f00625506f844692e16 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| | * CppEditor: Follow Symbol Under Cursor opens the preprocessor dialogNikolai Kosjar2013-10-223-1/+8
| | | | | | | | | | | | | | | | | | | | | ... when invoked on a macro that is defined inside that dialog. Change-Id: I419c6675d70cfb8dd174f6a33f502b4c584baa3a Reviewed-by: David Schulz <david.schulz@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-224-112/+168
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/git/gitplugin.cpp src/plugins/qt4projectmanager/qmakeproject.cpp Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
| | * C++: Limit typedef resolving depthNikolai Kosjar2013-10-182-52/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5be56c0 except for its tests. While it fixed the problem described in the bug report, it also introduced regressions. For now, we use a hard limit. Change-Id: I19a85be454e3d7969371707e3eb1c3d42a16ecee Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * Avoid holding on lots of data with C++ Find UsagesEike Ziller2013-10-182-112/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The snapshots at the moment of search were held as long as the corresponding search result panel was kept, to allow mapping of the old symbol to the corresponding symbol in the new snapshot. Now we just save the file name and ID of the old symbol. Change-Id: Iaf3c9ca27ec2b788f142bd0dd6b86e34e66d5c8b Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * C++: fix endless loop during template instantiationPrzemyslaw Gorszkowski2013-10-172-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first phase of fixing bug QTCREATORBUG-10320. This change resolves typedefs of template parameters(and resolves problem with endless loop). The next step will be matching appropriate template specialization (this is needed to solve problem with missing code completion). Missing matching: template specialization with the same parameters, e.g.: template <class T1, class T2, class T3> class T { }; template <class T1, class T2> class T<T1, T2, T2> { }; Task-number: QTCREATORBUG-10320 Change-Id: Icb6b539c021b2a67a66db9011a2e627f7d96526b Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-164-16/+34
| |\ \ | | |/
| | * CPlusPlus: Make (sub-)languague selection more generichjk2013-10-154-16/+34
| | | | | | | | | | | | | | | Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-10-146-10/+10
| |\ \ | | |/
View Lorry Controller Status