feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
8a977e7b80 ToolChainKitInformation: Fix build 
Change-Id: I678472bc2aaae06918b53f3ad0bff84f93dfeae7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-07-20 15:18:38 +00:00
Eike Ziller
013cb53aef Kits: Make upgrade of settings explicit when restoring kits 
Instead of implicit upgrading when KitInformation reads values from the
kit.

Also fixes that upgrading from 4.1 to 4.2 did not work (it did not
upgrade at all after 93c919a9ed3e52bcd2d3072a2b771bda0f2de21f
and before that wrote the settings with the wrong key for Cxx).

Change-Id: I0729df6eb1215f2ea01651a42a83cb4d2679b347
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 14:41:32 +00:00
Tim Jenssen
ae5f1918b4 QmlDesigner: cleanup code 
Change-Id: Ia281b8efcacdfb00e724e97b491fbd4250a99fb1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-07-20 14:40:51 +00:00
Leena Miettinen
aa566604be QMLJS: Fix punctuation of messages 
- Add full stop to the end of messages.
- Use double quotes for emphasis (instead of single quotes).

Change-Id: I5b0bd2cecda115735b67ceaab202c36ca5d81b43
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-07-20 12:06:45 +00:00
Ulf Hermann
3353029b52 SDKtool: More compile fixes 
Change-Id: Iccc8e6b71d94c794334eb6f2ed02348e0c41deb8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 11:37:57 +00:00
Ulf Hermann
2cb33df989 QmlProfiler: Remove some friends that don't exist 
Change-Id: Iaa7c458ae54564124c15a7bf5680d65a96886818
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2016-07-20 11:19:15 +00:00
Ulf Hermann
61a5f3b3ae QmlProfiler: Add memory and allocations modes to flame graph view 
Change-Id: Ic548812378cad92d931e3fa645e11f83a861e00c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-07-20 11:11:36 +00:00
Orgad Shaneh
3815affad5 VcsCommand: Fix indentation in lambda 
Change-Id: I6b62f10ad754a40027cfe1b5e0f2343b30701b18
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 10:14:56 +00:00
Orgad Shaneh
b55e06716b Git: Suppress stderr output (for the output pane) on clone 
It already appears in the wizard. No need to duplicate.

Change-Id: I74b1f7d9d5be44e95965bf2af3fee9727372995a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 09:22:24 +00:00
Orgad Shaneh
fae08f5c7c Utils: Minor cleanup in SynchronousProcess 
* Do not reserve QString before replacing it with another
* Do not append \n when there's only stdout

Change-Id: If75eade473949437a4b5fea2ac0153fa2853b3c8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 09:22:13 +00:00
Christian Stenger
2281386199 SDKTool: Fix compile for Qt5.6 
Change-Id: I9154ffbc09187a851c409b2b1ae9d2d8109f1c15
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 09:17:42 +00:00
Orgad Shaneh
a48acdff52 QmakePM: Replace QSignalMapper with a lambda 
Change-Id: Iea656322c56f31f6958d3d497f98fc3bcb424c78
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 09:13:10 +00:00
Orgad Shaneh
8e833db5a6 ProjectExplorer: Replace QSignalMapper with lambdas 
Change-Id: Iaa7334ba3bddd7fe873796daac40e0c81c78c68e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 09:12:53 +00:00
Tobias Hunger
008c4a222a SDKtool: De-noise rmkitoperation 
Change-Id: Iced1cbaf717139e3e20e4f52056b41a5ef4bcea4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-07-20 08:59:28 +00:00
Ulf Hermann
392955488c Move flame graph view from QmlProfiler to separate library 
We want to use it for other profilers, too.

Change-Id: Ice4bd7fdfce6e0153d62a7c9a83dc7de6d5cba30
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2016-07-20 08:55:28 +00:00
Christian Stenger
97a465ae18 QmlProfiler: Fix compile with Qt5.6 
Change-Id: I4394530321db3a2081d49b4e243b37c1840c2227
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-07-20 08:51:13 +00:00
Tobias Hunger
7ed7ecd4a5 SDKtool: De-noise rmtoolchainoperation 
Change-Id: I65f670a3590ad8502195d431bbcdb68c0b77273b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-20 08:31:01 +00:00
Tobias Hunger
a1020cc299 SDKtool: De-noise addkitoperation 
Change-Id: I362b5dcda37631e746311f2ed13264ba97ba232c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-07-20 08:20:39 +00:00
Tobias Hunger
922e5e8a77 SDKtool: De-noise addtoolchainoperation 
Change-Id: I94c2fae6e5fdd6384fd0acf2b626062b41719b07
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-07-20 08:19:07 +00:00
Tobias Hunger
157c0a3771 ToolChainKitInformation: Fix abi-based toolchain selection 
This broke when multiple toolchain support was added to kits.

Change-Id: Ibdd4942a4fe314a5dee727a41a834676b894525d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-07-20 08:18:58 +00:00
Ulf Hermann
f372f4aa5a QmlProfiler: Add tests for client manager 
Change-Id: I9d758857dc65daa564ab6a0394250c02ea006832
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2016-07-20 08:18:06 +00:00
Ulf Hermann
62b1217818 QmlProfiler: Add some sanity to the client manager 
Remove the PIMPL pattern, use smart pointers, add asserts for
important preconditions, add a timeout also to the local server case,
make sure all signal/slot connections to the old connection objects are
cleared when retrying to connect, make retry intervals configurable.

Change-Id: Ica7df0eaddc48778f13905795871d522401617ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2016-07-20 08:17:54 +00:00
Orgad Shaneh
9fd5d64194 Remove unneeded QSignalMapper includes 
Change-Id: Idec6b1357d7c1db316c8cb29e82c7c9a62e4f6d5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-07-20 08:12:30 +00:00
Orgad Shaneh
c894eb6bc1 Designer: Replace QSignalMapper with a lambda 
Change-Id: I0bf3b1e33188b98525cf717f799466994c494c11
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-07-20 08:12:20 +00:00
hjk
be684dc754 Debugger: Make MSVC happy and capture 'this' 
Change-Id: I765bc5b5c739bfeae70c09bd997db430f84c5aca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-20 06:30:48 +00:00
Alessandro Portale
a0f1e716c7 Themes: Draw optional toolbar borders 
We need a new Theme flag for that. And it will initially only be set for
the flat light theme.

Task-number: QTCREATORBUG-16633
Change-Id: Id723e128364eb6186fe8e28e2087a3698b1bf632
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2016-07-19 16:42:35 +00:00
Thomas Hartmann
f50f0675eb QmlDesigner: Set QML2_IMPORT_PATH for the fallback puppet 
We have to add the path from QLibraryInfo to find the plugins
shipped with Qt Creator.

Task-number: QTCREATORBUG-16609
Change-Id: I6793b989db9581670572490040a399ae0490589e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 15:51:58 +00:00
hjk
3b233033b9 QmlProfiler: Add a "this" to capture list 
Change-Id: I8bd7b0a8e488ee79262a46406f818d86326aabda
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-07-19 14:24:03 +00:00
Thomas Hartmann
a72c24a0fd QmlDesigner: Cleaning up DocumentWarningWidget 
This patch also simplifies DocumentWarningWidget.

Task-number: QTCREATORBUG-16539
Change-Id: I64a715c2a0eaf12a8515a59566e7b22c86ad8928
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2016-07-19 14:14:46 +00:00
Marco Bubke
9617520e52 Clang: Inline DocumentAnnotationsChangedMessage 
Change-Id: Ib2f16cb48bf3413006a1eaebcabc7d6cca696970
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:55:30 +00:00
Marco Bubke
ce45b4cf8b Clang: Inline HighlightingMarkContainer 
Change-Id: Idb19b65099f42023ff347b427b014b3c476a06c8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:53:56 +00:00
Marco Bubke
08574a415e Clang: Inline UpdateVisibleTranslationUnitsMessage 
Change-Id: I6cce81746a32fb97df64d21d1fd9e13f5b8ceacf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:53:45 +00:00
Marco Bubke
07991a6f83 Clang: Inline UpdateTranslationUnitsForEditorMessage 
Change-Id: I0e68c138d5eed394f9fece1bd3ca6fbd39575348
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:53:31 +00:00
Marco Bubke
7605bb1f84 Clang: Inline UnregisterUnsavedFilesForEditorMessage 
Change-Id: Ida87917a5162cfbe75f3a80c144378b834f90ad4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:53:22 +00:00
Marco Bubke
38d3d8e727 Clang: Inline RegisterUnsavedFilesForEditorMessage 
Change-Id: I22c23c1875cd7c73321cda15ad8a1e18c43db818
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:53:13 +00:00
Marco Bubke
e0db7ddcd2 Clang: Inline RequestDocumentAnnotationsMessage 
Change-Id: Ife327d5822ed04620bc651e9264e7fb7184123ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:53:03 +00:00
Marco Bubke
5ae44be34f Clang: Inline FixItContainer 
Change-Id: I00067803e5cbf5b0183dcefe11deaf9b78a45964
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:52:52 +00:00
Marco Bubke
5ccc1ac14a Clang: Inline SourceRangeContainer 
Change-Id: I04e5f1abbe17d6e007a2cba5cd28c84a3428bcbf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:52:43 +00:00
Marco Bubke
6a220a1575 Clang: Inline DiagnosticContainer 
Change-Id: I0d15b0b0d43f2a114d234f4b26f1eb8cf9d4a380
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:52:36 +00:00
Marco Bubke
3ea1eb3631 Clang: Inline LinePrefixer 
Change-Id: I5e55f8c9912d5be5102a5cdf5eb795b786dc1282
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:52:23 +00:00
Marco Bubke
0d40cc4e56 Clang: Inline ProjectPartsDoNotExistMessage 
Change-Id: I8476e0dcf2c5ce16c7fc76f6e91a7ec9d8512411
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:52:16 +00:00
Marco Bubke
85081a67a5 Clang: Inline ProjectPartContainer 
Change-Id: I4bd55f6be216b1ac99039e74be853c9634ac2fd6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:52:07 +00:00
Marco Bubke
12c5ff13d0 Clang: Inline CodeCompletionChunk 
Change-Id: Ia581ae109fe1fa2c05db37f1cfbe678f2d8e8778
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:54 +00:00
Marco Bubke
855bf6b007 Clang: Inline TranslationUnitDoesNotExistMessage 
Change-Id: Ib1f23410163036eb8de603eb3eef82c14428a8a5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:44 +00:00
Marco Bubke
e840ee3263 Clang: Inline TranslationUnitDoesNotExistMessage 
Change-Id: Ib46149912790d7f9e4231d36a4b62cd0d7c66401
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:35 +00:00
Marco Bubke
ee87fcb489 Clang: Inline RegisterProjectPartsForEditorMessage 
Change-Id: I910c122ae9ab12b9d27d3fd1363e6d3cbe602b46
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:28 +00:00
Marco Bubke
5bb5f7ae6d Clang: Inline CodeCompletion 
Change-Id: I69871aba33a7ca3b09b00452d07828fc05d605cc
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:19 +00:00
Marco Bubke
c62bf3e4e7 Clang: Inline CodeCompletedMessage 
Change-Id: I9f65bd95efe3a02848db6e9cadddc22c88b19902
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:11 +00:00
Marco Bubke
96e370e1ca Clang: Inline CompleteCodeMessage 
Change-Id: I7009ab3986cb2c8ff7b5c7a77ff22a35bc5d2b10
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:51:03 +00:00
Marco Bubke
4eae621df9 Clang: Inline UnregisterTranslationUnitsForEditorMessage 
Change-Id: If4adf19cc4ea9325a6f94d4c2b989609e1e83239
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-07-19 13:50:54 +00:00