summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/stringtable.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-031-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/coreplugin/editormanager/editormanager.cpp src/plugins/cppeditor/cppeditor.cpp src/plugins/remotelinux/remotelinuxdebugsupport.cpp src/plugins/texteditor/basetexteditor.cpp Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
| * C++: set the objectName of QTimers.Erik Verbruggen2014-08-291-0/+1
| | | | | | | | | | | | | | | | | | This will hopefully help a bit in resolving the crashes that happen in QCoreApplication::notifyInternal. Change-Id: Ib3aa8c1a1f50778bd89938d7c529d8399ccf91ea Task-number: QTCREATORBUG-11262 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Cpp{Editor,Tools}: Remove some Qt4-only codeNikolai Kosjar2014-08-281-5/+1
| | | | | | | | | | Change-Id: I94ca7b239e974b6b400933466ee2ef5ae4def336 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Use the functions in QRefCount to check if the QString is in useThiago Macieira2014-07-011-4/+10
|/ | | | | | | | | | | | | QStringLiteral() returns a string that has a refcount of -1 and it must be kept. There is no way to determine if it's still in use, so we'll just assume it is. Any QStringLiteral inserted into the structure will stay there forever. On the other hand, we must not accept unsharable strings, so Q_ASSERT on that. Change-Id: I5fbdc1046f0f00319f27fdfb7aa3ff87371ea668 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* CppTools: Fix compilation with Qt4Nikolai Kosjar2014-06-021-7/+14
| | | | | | | Change-Id: I76c6ea3557c46fbca4ccb0fb293c6ed6f03e96df Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* C++: use a global string table for SearchSymbols.Erik Verbruggen2014-05-281-0/+116
This string table uniques strings, so that multiple identical strings share their contents. It is used by the locator and the symbol searcher, and will later be used by the class view. Change-Id: Ib8b50f69bbf994d0d7a39b66dc8caf1a3d9bfb42 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
View Lorry Controller Status