feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

50929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Hunger
b88e7ff6ae Core: Override icon method of QFileIconProvider 
Change-Id: Id622ec37351394ba6fc7d5bf9c3464f3da9c21a6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-30 13:39:35 +00:00
Tobias Hunger
16bb89fee9 Qmake: Remove useless nullptr check 
Change-Id: I6fe9ca620d6bac9e3cab44fb90623fa984229416
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-30 13:39:21 +00:00
hjk
3193321532 Debugger: Add a dumper for std::weak_ptr 
Change-Id: I253b6d8069ecf36618aa40038da6820f52eb38df
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-11-30 13:37:46 +00:00
hjk
f85c6efcd1 Debugger: Consolidate watcher insertion code paths 
All were targeting the same running engine, doing the same thing.

Change-Id: If1186f6467cde6b44a051ea5845d4528917ca8f9
Reviewed-by: David Schulz <david.schulz@qt.io>
 2016-11-30 12:55:29 +00:00
Robert Loehning
83e516771b Fix string in German translation 
Change-Id: I4c29e01e94060be905fb85ae7598e7fb1b384e42
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2016-11-30 12:37:22 +00:00
Tim Jenssen
a27003c4ea QmlDesigner: adding text at root item error case 
Change-Id: I2a9533d3d3eb71e60e3d0328e651e40676b24f14
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-30 11:48:00 +00:00
Tim Jenssen
a071871c08 QmlDesigner: refactoring load method 
- we will use this method later for using internal
  text editor error checking
- no behavior change, mostly moved code into an internal method
- used m_document where it is possible

Change-Id: I689a05a543dd93766c6be14d28a44140be53e559
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-30 10:56:52 +00:00
Tim Jenssen
2908d42b60 QmlDesigner: keep centralTabWidget for later use 
Change-Id: I564e178ba049d963af9a7b5ab8e208c50bcba12c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-30 10:56:45 +00:00
Tim Jenssen
99723f69ce QmlDesigner: improve from editor code 
- remove hasItemForQmlItemNode and use if (FormEditorItem
  *item = ...)
- use alogorithm to make the code more compact
- sprinkle some const

Change-Id: I81914fc2aa547101bc1ebaedd3f1a241c220c5df
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-30 10:56:32 +00:00
Tobias Hunger
64c31f1889 Android: Simplify qmakeandroidbuildapkstep 
Change-Id: Ib4d0caaa92be850e03c919988079bb9cab6fa06f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-30 09:59:36 +00:00
Tobias Hunger
27dbbbc28b ModelEditor: Do not leak Packages 
Change-Id: I535bef1cdf62d443b3b5b69b91db30717f4715d5
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-30 09:57:47 +00:00
Tobias Hunger
78ced14c4c CppEditor: Remove dead code 
Change-Id: If65f43e232c83924a746bcbb30ced5db57dd547b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2016-11-30 09:48:59 +00:00
Tobias Hunger
f068f59846 Snippets: Simplify code 
Change-Id: I8e8d8fb6f01022106a818291c87970831e72db92
Reviewed-by: David Schulz <david.schulz@qt.io>
 2016-11-30 09:47:40 +00:00
Tobias Hunger
6a16a5bae0 CppTools: Initialize members 
Change-Id: Id57982ad7fcd6756a95213e16aa59b41a2a329e1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2016-11-30 09:47:23 +00:00
Tobias Hunger
e611ba526b DeviceSupport: Simplify code a bit 
Change-Id: I2daca38612636b2eeb7407c32f2791b3c350677a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2016-11-30 09:47:15 +00:00
Tobias Hunger
7d76dd0079 CPlusPlus: Fix isQtReservedWord 
checking for size >= 4 masks Q_D and Q_Q.

Change-Id: If9ab7d3b2c2c571e73b98e89908e492fc6241296
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
 2016-11-30 09:47:00 +00:00
Tobias Hunger
9c895ed6f1 QmlJS: Make destructor of base class virtual 
Change-Id: I11233c4fde6e1db09b604965f07ae32741c1bddf
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2016-11-30 09:46:51 +00:00
Eike Ziller
6365eda349 BaseFileFind: Simplify code 
Get rid of the need to manage a map of QFutureWatcher -> SearchResult

Change-Id: Ieafbd852c09174ec09b94f167c3b4e211bd841c6
Reviewed-by: David Schulz <david.schulz@qt.io>
 2016-11-30 09:40:49 +00:00
Eike Ziller
6d08973ced BaseFileFind: Make some methods static 
Change-Id: I2cf75aabec2f44278c52e2bcff8a5278678517f3
Reviewed-by: David Schulz <david.schulz@qt.io>
 2016-11-30 09:40:40 +00:00
Eike Ziller
a016c7f4f4 RunExtensions: Connect before setting future 
"connecting after calling setFuture() is likely to produce race"

Change-Id: Ia4eecf977fc0a89aff5ac72e42c877d1297d263d
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-30 09:40:29 +00:00
Thomas Hartmann
95366d25e0 QmlJS: Fix crash in QML reformatter 
This fixes a tack overflow caused by an exponential
number of combination tested.

We try to find the optimal solution for line breaks by brute force.
Unfortunately this leads to a stack overflow, if two many
line breaks are possible.

This patch limits the number of possible line break positions to 11.
If there are more possible line breaks we remove every second one.

This seems to be a reasonable enough heuristic and we deal with
a corner case anyway.

Task-number: QTCREATORBUG-17331
Change-Id: I1b80fc3eaa0e148aec30fc57ac75824181f2d883
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2016-11-30 08:30:29 +00:00
Thomas Hartmann
5eeecdb1b4 QmlDesigner: Fixing double free 
Calling detach() in setKey() will free the shared memory twice, if
we do not set m_memory to nullptr.
Clean cleanHandleInternal() does always return true, so
checking the value does not make sense.
We have to call cleanHandleInternal() immediately after the close.

Change-Id: I110693d1dd9dae4ff5e52cfd3fdd2f33137af969
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-30 08:29:25 +00:00
Orgad Shaneh
22e6cf39ca CppEditor: Fix MSVC warning 
MSVC2015-amd64 warns about size_t -> int implicit conversion

Change-Id: I60ec63cd50b9a48d96b838237b2e926b3d6ace5b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2016-11-30 08:09:05 +00:00
hjk
d583469249 Debugger: Keep watchers alphabetically ordered 
Task-number: QTCREATORBUG-12308
Change-Id: Ifdffa20f3ccec6aa2c086ce83db3b4a8817e08ab
Reviewed-by: David Schulz <david.schulz@qt.io>
 2016-11-30 07:24:04 +00:00
Tim Jenssen
337393ce97 QmlDesigner: fix build 
Change-Id: I81211fbf55c72d7b55aff80720e2ff2a71cbdf4f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
 2016-11-29 17:54:54 +00:00
Vikas Pachdha
24ae8e0491 Android: Change polling pid script to fix permission denied issues 
Task-number: QTCREATORBUG-17272
Change-Id: Ia45ad8b2bd9e1d1c984c600d320241b81580d85f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
v4.2.0-rc1 		2016-11-29 17:00:58 +00:00
Orgad Shaneh
329c24ce3a Git: Replace msysGit with Git for Windows in comments 
msysGit is obsolete

Change-Id: Iaa2aee0de2e8280dcc060cdd26b41962fb38a112
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-29 16:34:44 +00:00
Orgad Shaneh
1c3f4686da Git: Replace msysGit -> Git in HOME description tooltip 
msysGit is obsolete

Change-Id: Iafb80f218ec2eb4404c76d41fc55b24842383538
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-29 16:34:41 +00:00
Orgad Shaneh
38cd2736ea Doc: Replace msysGit with Git for Windows 
msysGit is obsolete

Change-Id: Ib7dea018043e90f1288c68a19ebe356c6212bf0c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-11-29 16:34:38 +00:00
Tobias Hunger
e2986af343 Debugger: Initialize variables in debugger main window 
Change-Id: I705e02d177b2d8cd41f87791441dcc9fa093e60a
Reviewed-by: hjk <hjk@qt.io>
 2016-11-29 16:32:00 +00:00
Tobias Hunger
6e32744c0b QmlDesigner: Remove dead code 
Change-Id: Idf4f14f349cab6ff9e313fad77c7fe45235070f3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-29 16:31:30 +00:00
Tobias Hunger
c230f3427e QmlDesigner: Remove dead code 
Change-Id: Iaa32c7fffeef88f8f9cd4434d3b7e2551f9de12e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-29 16:31:20 +00:00
Tobias Hunger
b849333f7e QmlDesigner: Remove dead code 
Change-Id: I45aeebf86e55b10d3a5f9b5590457e73718de6f4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-29 16:31:09 +00:00
Tobias Hunger
f650b17d23 QmlDesigner: Fix JSObject 
Change-Id: I108d5f1c0bf891f8229d4eb962f553f735e23e94
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2016-11-29 16:30:57 +00:00
Tobias Hunger
236ce87696 Revert "Qmake: Remove some QLatin1Strings" 
Does not build with all supported compilers. Sorry.

This reverts commit c0fdb14a94.

Change-Id: Iac2cde27b8b4eb208c9bbbd38f63877e77ff3eb5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 16:30:09 +00:00
Tobias Hunger
63b80ee080 QmlEngine: Do not leak items 
Change-Id: Ib06b4fbd44c9c0fd87ae9f719563d1533334af77
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-11-29 15:40:55 +00:00
Tobias Hunger
8773d0fba3 CMake: Initialize members of CMakeCbpParser 
Change-Id: I8cbfaa2f1d9cf9a9a77a4e54015c0239f0abfb35
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 15:34:26 +00:00
Tobias Hunger
5e6dc0e5fd RemoteLinux: Initialize members 
Change-Id: I91d716cfc014e8b4e120782a0058c1d832ba5031
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2016-11-29 15:34:15 +00:00
Tobias Hunger
a1531694d1 QmlEditorWidgets: Initialize members and simplify code 
Change-Id: I361e0e5b4b3175fc8cab412a8603eadb608ba82c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 15:33:36 +00:00
Tobias Hunger
45626216b4 CppTools: Initialize settings pointer 
Change-Id: Ib12d4c67fc69a0e41f863f5679013edfd09008ae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 15:32:33 +00:00
Tobias Hunger
65f70d07fd QmlDesigner: Remove dead code 
Change-Id: I9623adeb87a2f34ed1b99f1064282fb5f3351c12
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 15:31:30 +00:00
Tobias Hunger
7eaea31790 QMake: Fix uninitialized active member in InstallsItem 
Change-Id: I969d1943b63df37c59f53ca857d58fe1b27b480f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 15:23:41 +00:00
Tobias Hunger
654f894eef Qnx: Initialize member of qnxqtversion 
Change-Id: Icb6b3d7cc513ee1597803658b6a576b4be6ef92a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-29 15:23:41 +00:00
Tobias Hunger
1317beda20 QmlProfiler: Initialize members 
Change-Id: Iaac47ff5cbc9b5ec9753cef97e68528f3fb1d456
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-11-29 15:23:32 +00:00
Tobias Hunger
bd6742a45e Help: Clean up code 
Change-Id: I743e799d1414a6d27b468c938c450487edcef0f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-29 15:23:24 +00:00
Tobias Hunger
2c98c04fc4 Core: Initialize members in IMode, clean up code a bit 
Change-Id: I2cef9e0eb9c68efae4ca84d487f5a08675874efd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2016-11-29 15:23:15 +00:00
Tobias Hunger
b31bc37dca Scxml: Simplify code 
Change-Id: Ia1ea8527054a9c94e5f40cca665f7f4b0a5c53e7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-11-29 15:23:04 +00:00
Tobias Hunger
6f48d5a9a3 CMake: Initialize int members of servermodereader 
Change-Id: Id7262d4c7f96f56aa95925852d64d9856292fb1e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-29 15:22:51 +00:00
Tobias Hunger
e2fb126509 Scxml: Avoid possible nullptr dereference 
Change-Id: Ie70da61f1c4f05d9247eb8b729fadad59b85cc45
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-11-29 15:22:44 +00:00
Tobias Hunger
e75f95115f Scxml: Avoid potential nullptr access 
Change-Id: Ib3bed9d6bd5f42adfd24aca2a935940d7de0ee38
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2016-11-29 15:22:27 +00:00