summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move a bit closer to Qt Creator coding stylewip/boostbuildprojectmanagerhjk2015-07-0115-210/+184
| | | | | | | | | - use m_member prefix convention - bind some * to the identifier - remove some unusual comments Change-Id: Ife9b148b54c3f930561e2de79a016dfcfe0487a0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add Boost.Build Project Manager plug-inMateusz Loskot2015-07-0140-0/+6051
| | | | | | | | | | | Preparing to contribute the plug-in, see the announcement at http://lists.qt-project.org/pipermail/qt-creator/2015-February/004436.html Change-Id: Ic3920c9b888af5bea1b7742b8ff49984c29a2909 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* QmlProfiler: remove bogus commentUlf Hermann2015-06-301-1/+0
| | | | | Change-Id: I5a2e0479fb2f64585e3407013edeea18a30ba080 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QmlProfiler: Remove extra clear() from loadData()Ulf Hermann2015-06-302-2/+0
| | | | | | | | | The models are expected to have been cleared already at this point. Clearing them again on loadData() makes it harder to properly set up their shown/hidden state. Change-Id: I70644015edb228f6a7a30d8ab3a4ad4b761686a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QmlProfiler: coding styleUlf Hermann2015-06-301-2/+1
| | | | | Change-Id: I38ef14b4d8a9ad926359909497a870c9d9d58d78 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* only ignore json files under src/pluginsTim Jenssen2015-06-291-1/+1
| | | | | | | | | As we using json for wizards a git clean -dxf was funny after adding a new wizard. Change-Id: Id7d4c6b59cbbfb05a16b436643aa8c91881eb420 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* QmlProfiler: Remove unused parameter to events relatives viewUlf Hermann2015-06-262-6/+3
| | | | | Change-Id: Ic7b601d11709f55de7921909a775604f02c2aad6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* QmlProfilerTool: Don't check for pre 4.7.4 qt versions anymoreDaniel Teske2015-06-241-17/+0
| | | | | | | | Those positevly stone old. Everyone using Qt 4 should be on at least 4.8. Change-Id: I71e0edc38bb8bb39a40919920ab4de90cf09b09e Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4' into 3.5Eike Ziller2015-06-232-4/+4
|\
| * Documentation: Describe the non-prefixed "Device:*" variables.v3.4.2Christian Kandeler2015-06-221-4/+4
| | | | | | | | | | | | | | | | | | | | These are the ones that people should use in build steps and such. Task-number: QTCREATORBUG-14614 Change-Id: I398ee57a0338c16f41dd190abe3fc9b055a50132 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Update qbs submodule.Christian Kandeler2015-06-181-0/+0
| | | | | | | | | | | | | | Fixes MSVC 2010 build. Change-Id: Ia4a15e2d289b288c77fc5e52d717cb0d1a1960da Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
| * Update qbs submodule.Christian Kandeler2015-06-181-0/+0
| | | | | | | | | | | | | | To HEAD of 1.4 branch. Change-Id: I64a6099bf67d4705c657e36f6c79d53c33729d13 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Update qbs submodule.Christian Kandeler2015-06-181-0/+0
| | | | | | | | | | | | | | To HEAD of 1.4 branch. Change-Id: Ifc6ad172a2ae10d8461e9ebeaea2dc9396fd6daa Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Debugger: Remove some unused parameterhjk2015-06-221-1/+1
| | | | | | | | | | Change-Id: Ica2b6facee379fd1e046ced617e3e5176bb3d192 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | WS only changeTobias Hunger2015-06-221-5/+5
| | | | | | | | | | Change-Id: I035253d68d1dcdf2af69531e6eee354f2932dd5c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Debugger: Retrieve threads info for coredumpOrgad Shaneh2015-06-221-5/+0
| | | | | | | | | | | | | | | | | | | | | | handleStop2 used to retrieve the stack. This is no longer right. While at it, remove outdated comment regarding GDB version. Task-number: QTCREATORBUG-14617 Change-Id: I9511fe5315e941fd9e08737a5b11677f9fdf8d09 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-222-42/+43
| | | | | | | | | | | | | | No text change Change-Id: I13d959e9c9204628775abbcb53a1b824d1b62578 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-23/+22
| | | | | | | | | | | | | | No text change Change-Id: I2b927d847bda3c5a0e2881d9a5eb9c74900fc0d4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | WS only changeTobias Hunger2015-06-221-6/+6
| | | | | | | | | | Change-Id: Icd71bf5ccf3503dacf6b0b5affc92b74286cbdf3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Update formatting and \uicontrol usage in debugger documentationTobias Hunger2015-06-221-424/+413
| | | | | | | | | | | | | | This should not change the text in any substantial way Change-Id: I837cc628d831636c186958485b8315c8d6895713 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Beautifier: Consistently use qt5 connection styleLorenz Haas2015-06-226-11/+14
| | | | | | | | | | Change-Id: Iea7a554dbb323b3a2b691d3e254c4e111897beb8 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | WS only changeTobias Hunger2015-06-221-2/+2
| | | | | | | | | | Change-Id: I8dced5f96026b252b098d85a77ccb004397f1f62 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-7/+7
| | | | | | | | | | | | | | No text change Change-Id: I4c422d6af1cc37a0dca0e7cb15ed141935ece2aa Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-23/+25
| | | | | | | | | | | | | | No text change. Change-Id: Ie030930637bf25d181a9f95030aa91a50348912f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-5/+6
| | | | | | | | | | | | | | Again no text change, just reformatting it to a width of 80 characters Change-Id: I3292932e4e672d3502e3f7100433f56e970d8deb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformatingTobias Hunger2015-06-221-11/+11
| | | | | | | | | | | | | | No text change, just reformating to a line length of 80 characters Change-Id: I36c0b2526ce5646f5aeddb3b5e87d8a480d78b39 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Mention that you can navigate the issue list by keyboardTobias Hunger2015-06-221-1/+2
| | | | | | | | | | | | | | That is a key feature in my opinion. Change-Id: Ib56818e67c8120ba2aef83723279405b5ed359b3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Adjust paragraphsTobias Hunger2015-06-221-5/+4
| | | | | | | | | | | | | | | | No text change, just adjusting the line length for easier readability in an text editor. Change-Id: Id4eff9502eb8dd9d0a2dac8a7136f7ed4ffaa6ae Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-7/+7
| | | | | | | | | | | | | | No text change Change-Id: I0d394d043bc3c878324ed0d18d3a25ecadb00eca Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Beautifier: Avoid raw loops wherever applicableLorenz Haas2015-06-225-22/+13
| | | | | | | | | | Change-Id: I8b595ce0f7b3544466c6308457bf22826d1dafeb Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-4/+4
| | | | | | | | | | | | | | No text change Change-Id: I6e7f0a7293f9dbec337e3d4fe6d058d449b0aee0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Add icons for static fields and functions.Alexander Izmailov2015-06-2211-10/+53
| | | | | | | | | | | | | | Icons for static members in completion list now with S letter. Task-number: QTCREATORBUG-203 Change-Id: I6c997ad14eeb500936ffe73e2fc0ad8e552a46c9 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | Android: Pull the right libc.so from device.BogDan Vatra2015-06-222-4/+10
| | | | | | | | | | | | | | On an 64 bit Android, libc.so for 64 bit apps is located in /system/lib64/. Change-Id: I93f0e4658e552c9a32822706bab3e503642a8c59 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | Git: Fix Stash & Pop for synchronous actionsOrgad Shaneh2015-06-221-4/+5
| | | | | | | | | | | | | | | | | | | | After a successful Cherry-Pick or Revert, a ConflictHandler needs be instantiated in order to call endStashScope. This was broken in b6608d0d3. Change-Id: I2e828fa87695b9ac9972fca569e473b5f63abfec Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Doc: WS only changeTobias Hunger2015-06-221-7/+7
| | | | | | | | | | Change-Id: I62dde2475d28f87fa5c77412e21eda29da97acd1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: WS only changeTobias Hunger2015-06-221-29/+29
| | | | | | | | | | Change-Id: Ibf99c7fddbc4409f38b0be337c0fd1efcad0db42 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: WS only changeTobias Hunger2015-06-221-263/+264
| | | | | | | | | | Change-Id: I0e6f296b9da48de2886672586ee1f3509d87aee1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Mark up color codeTobias Hunger2015-06-221-4/+5
| | | | | | | | | | | | | | Add \c before color code, break one line that was too long Change-Id: Ic5b2fe86919634969b5e5bc35c73d70d2ceab2fb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-11/+14
| | | | | | | | | | | | | | | | \uicontrol split up, \key clean-up (but Ctrl++ does look wrong!), but no other text changes Change-Id: I4e831d48554bf6abc031a3061e01899b4ca64dc2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformatTobias Hunger2015-06-221-17/+18
| | | | | | | | | | | | | | No text changes Change-Id: Iabfdbdd19b255172b8f59fc5ed4ba55f1168e7d6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformatTobias Hunger2015-06-221-2/+2
| | | | | | | | | | | | | | | | Only add space between \uicontrol and { (as is done almost everywhere else). Change-Id: I4e5a1e2c8fb1ccb5048da79ef31c11a5a3a6bba7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformatTobias Hunger2015-06-221-4/+4
| | | | | | | | | | | | | | No text changes Change-Id: I767337883dbb8b50d2bcbb0b6f7967135a103e08 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformatTobias Hunger2015-06-221-8/+8
| | | | | | | | | | | | | | | | | | Add \c for ".pro" file ending referrenced in the text. No other text change Change-Id: I2134432bebc7fb66dfe0ddc6e709946a437af84c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformattingTobias Hunger2015-06-221-6/+7
| | | | | | | | | | | | | | No text changes Change-Id: I67c983ba8c3b712d769a606527bf5734ab97d9ec Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Reformat textTobias Hunger2015-06-221-22/+23
| | | | | | | | | | | | | | Add a \c, split \uicontrols, but no other text changes Change-Id: Ieadf1c277875a9617ab633084f122975cf68e661 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: Use uicontrol more consistentlyTobias Hunger2015-06-221-12/+15
| | | | | | | | | | | | | | | | | | Use {} only when several words are grouped together and split up sequences like "\uicontrol { Tools > Options > ... }" into \uicontrol Tools > \uicontrol Options > ... Change-Id: Ia63a987db754d941f8875337c43728d05b5a9f14 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Doc: ReformatTobias Hunger2015-06-221-71/+67
| | | | | | | | | | | | | | No text change Change-Id: I757d1c07a37df917fa96d6099b9f3dea8426e378 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | CppEditor: Cleanup settings in InsertVirtualMethodsOrgad Shaneh2015-06-221-161/+98
| | | | | | | | | | Change-Id: Ic1fbd8a68e9022ef4250585448542b5e65508d92 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* | C++: Rename semanticRehighlight to recalculateSemanticInfoDetachedNikolai Kosjar2015-06-228-10/+10
| | | | | | | | | | | | | | | | semanticRehighlight() does a bit more than only rehighlighting and we want to trigger (only) rehighlighting in a follow-up change. Change-Id: Ic8da9ec8643f0f82f7c99ef9a8180b2868194254 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Core: Reduce use of Id::fromUniqueIdentifier in the Infobarhjk2015-06-222-19/+8
| | | | | | | | | | | | | | | | Should be the exception in general and is with Qt5/C++11 in this particular case not needed anymore. Change-Id: Ida3f1fb534a6c7c1c6a84f8d4bc62e1636964f44 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
View Lorry Controller Status