Commit Graph

50929 Commits

Author SHA1 Message Date
hjk
5992c74488 Debugger: Robustify L&E context menu handling
Keep strings in lambdas instead of WatchItem pointers that
might get deleted while the menu is open.

Change-Id: Iec65924696da9754ffbbbb833ae0db990598c8e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-14 07:42:02 +00:00
Orgad Shaneh
f572f7da39 Debugger: Prevent popup on shutdown when debugger is running
* Run a debugger (of any kind)
* Close Qt Creator window
* When prompted to shutdown choose Yes
* An error message box appears with "Unexpected GDB exit"

This is not a real solution, but a quick hack to make the error message go.

2 soft assertions are also hit on this case:
SOFT ASSERT: "state() == EngineShutdownRequested" in file debuggerengine.cpp, line 1130
Debugger::Internal::GdbTermEngine(0x55ef651cea30, name = "GdbEngine") "InferiorShutdownRequested"
*** UNEXPECTED STATE TRANSITION: Debugger::Internal::GdbTermEngine(0x55ef651cea30, name = "GdbEngine")
"State changed from InferiorShutdownRequested(16) to EngineShutdownOk(21) [master]"

SOFT ASSERT: "state() == InferiorShutdownRequested" in file debuggerengine.cpp, line 1068
Debugger::Internal::GdbTermEngine(0x55ef651cea30, name = "GdbEngine") "DebuggerFinished"
UNEXPECTED STATE: 22  WANTED: 16 IN gdbengine.cpp:1841

They are *not* addressed in this patch.

Task-number: QTCREATORBUG-16770
Change-Id: I419f134e527a154dfbe1c85a3fd6629597a363f0
Reviewed-by: hjk <hjk@qt.io>
2016-11-14 07:37:53 +00:00
hjk
77fe2959ce Debugger: Fix a few return value types in putCallItem uses
Change-Id: If66fb7bf6726dd8ec3f630d11c004ac24fae4d06
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-14 07:37:09 +00:00
Christian Stenger
be9c7d6929 Squish: Fix triggering items listed under "Recent Files"
UI has changed again, so adapt the test to reflect this.

Change-Id: I5d6bcf2b48b8b625f6086f5a1101041a73d7e329
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-11-14 06:53:31 +00:00
Frank Meerkoetter
d59cfb2f97 Fix dead stores in the modelinglib
Found via the clang-static-analyzer

Change-Id: Ic035a88d26b2a096d293133eb4638a090ac5a5c2
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-13 19:42:33 +00:00
Christian Stenger
701ccc5e3b Squish: Fix property of projects kit view
Change-Id: If36d2b0879cf8c8276d68e5a1f1425b6f47fc5dd
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-11-11 16:33:01 +00:00
Tobias Hunger
43258f91e8 ProjectExplorer: Nodes: Rename member holding parentFolderNode pointer
Change-Id: I8c2abc5a3b258f1ec0b9d2b9582e0f4b41e11568
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 14:27:46 +00:00
Tobias Hunger
8850d2e732 ProjectExplorer: Allow for const-correct use of Nodes
Change-Id: Ic1f145e3b429d80c0dcff642b900cb3a3f78f06b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 14:27:41 +00:00
Tobias Hunger
327f09c240 ProjectExplorer: Override filePath for recursiveFindOrCreateFolder
Override the base node's filePath for recursiveFindOrCreateFolder (and
buildTree, which is based on that). This makes it possible to use this
method to build up trees below project nodes, etc. that have no
representation as a existing directory in the filesystem.

Change-Id: I29fd1ab5b81b144b3db1966dc08dd50470c2d5d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 14:27:36 +00:00
Tobias Hunger
d59489c462 ProjectExplorer: Make it easier to trim down the project tree
Change-Id: I6dc712f131a27eceb5548c0e3a79418d9b950639
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 14:27:16 +00:00
Tobias Hunger
1628856d8a Core: Fix Reaper blocking shutdown
The eventloop is blocked while the destructor of ReaperPrivate is running.
So drive the ProcessReaper by hand instead.

Change-Id: I691a28f27455f58ae5807540746ffa1aa2783fed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 14:26:51 +00:00
Christian Kandeler
2d4c3d7689 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: I08cb96bba1aa5a8b821e7be354aaa3af71c0c2aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-11-11 13:35:34 +00:00
Tobias Hunger
04aa6f67dd ProjectExplorer: Make scanForFiles cancel-able
Change-Id: Icbc4fa4c84189bd470bd5720a674d11f3e485037
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 13:22:46 +00:00
Sergey Belyashov
874683a15e Fix lacks of Q_OBJECT macro
Change-Id: I0de19ed983c45260c957ea88422093bf7faca6a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-11 13:15:49 +00:00
hjk
e94c87f1a7 Debugger: More quote cosmetics
That's a follow-up to 88e79e16a6a91

Change-Id: I19725bca1c547bd961094f2d00e85e170b2be33e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-11 12:56:48 +00:00
Eike Ziller
2fe0d85b17 Fix binary artifacts branch
Change-Id: If0e993c50a692ebe9657aef049ee721ce6099a4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-11-11 12:45:27 +00:00
Christian Stenger
43b376a738 Squish: Handle wizard check for Quick Controls 2 Application
This wizard needs a Qt5.7 which we are not providing yet.

Change-Id: I03ba5c86835de40a44530753502f87a46554d6b3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-11-11 11:31:49 +00:00
Christian Stenger
771fa178b6 AutoTest: Re-do multi-threaded parsing for tests
Avoid using global thread pool, use internally provided functions
instead.

Change-Id: Id8d3c72c45d85d4806e3692ef3039c31a0eae7b9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-11 11:31:36 +00:00
Eike Ziller
9389f745ff Add missing change log entries
Change-Id: I57a8792cc6dc9c03f682f6cd98ac640c6559e828
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-11-11 10:32:12 +00:00
Jake Petroules
d1c2a841af Qbs: don't set cpp.linkerName
This is unnecessary (and counterproductive) with automatic linker mode
in Qbs 1.6.

Change-Id: I808effead885eeba0d524fa27989b8a54b8c655f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-11 10:28:49 +00:00
Jake Petroules
a8bb2af30e Qbs: fix Xcode SDK detection (take 2)
This adds xcode to the toolchain list, which is required to load the
Xcode module. It also uses the compiler path as the mechanism to find
the developer path, and then extracts the canonical SDK name using the
sysroot if it's a valid one for the previously extracted developer path.

amends d121fefaa9

Change-Id: I73cf1a50acd6b99a9fc3b6003bcc6dc23c2a04ab
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-11-11 10:28:44 +00:00
Filippo Cucchetto
1a1cf3c12b Nim: Added support for nim script files
Added a new entry inside the "New" menu for creating a new nim script file (*.nims)
Added support for editing them inside the editor

Change-Id: I09a514fdd4e4a0e9a78bb557db3e8c7e97683b8d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-11 09:23:12 +00:00
hjk
8fce605913 Debugger: Display {un}signed char* similar char*
Task-number: QTCREATORBUG-17236
Change-Id: Ibbc58807572c6d1785f20948992f7a2c0dcc87f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-11 09:07:41 +00:00
Christian Stenger
2380757199 QbsProjectManager: Fix missing include
Avoid compile issue when using gcc 4.8.
(error: variable 'const QRegularExpression re' has initializer but
incomplete type)

Change-Id: Ic89f9afdf0a6854948a21103a64ec8b8f4ad1681
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-11-11 07:57:02 +00:00
Thomas Hartmann
a6d16f85c4 QmlDesigner: Check for parent is not required
States actually have a parent.

Change-Id: Iaee31dec4d969c2f84224a2d93796d67f39fda77
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 07:28:35 +00:00
Thomas Hartmann
6c6fb10ab7 QmlDesigner: Do not use Component in PathView source
The Component is not required (implicit component) and
the Component item is not allowed in .ui.qml files.

Change-Id: I705df5eb5b002f710ba87279083fa282e82639c8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-11 07:28:30 +00:00
Christian Stenger
9c5e92c714 Core: Fix QModelIndex interaction for variable chooser
The tree has a QSortFilterProxyModel, so we have to map
the current index back to its source model to avoid
using a wrong index.

Change-Id: I78b6172a2c9b3d4255132e30e8eddf72dc95d5e4
Reviewed-by: hjk <hjk@qt.io>
2016-11-11 05:45:58 +00:00
hjk
ae4d3c52e6 Debugger: Sanitize report of timings
Use Python's list and dict output directly, instead of
a manually stringified version thereof. Also, report
milliseconds instead of microseconds.

Change-Id: Ibcbdea732e7ecc58fd672bc5da794832215865b4
Reviewed-by: hjk <hjk@qt.io>
2016-11-10 20:14:25 +00:00
hjk
5fb2dc6e47 Debugger: Some dumper code cosmetics
Mostly quotes, remove some unneeded comments, ...

Change-Id: Ie3f410ac84e6cfe48e7971af948326abc21f2554
Reviewed-by: hjk <hjk@qt.io>
2016-11-10 19:59:47 +00:00
hjk
67505423e6 Debugger: Dumper code cosmetics
Mostly left-overs from earlier reorganization.

Change-Id: I94f44efa1aab1e17de3c0fec6c230722149a1404
Reviewed-by: hjk <hjk@qt.io>
2016-11-10 19:29:02 +00:00
hjk
75be7de6f4 Debugger: Make dynamic type lookup more robust
... in builds without debug information.

Change-Id: I3842736aebe5b7c6b46d0ea1eec540dc3c088920
Reviewed-by: hjk <hjk@qt.io>
2016-11-10 19:22:25 +00:00
Christian Kandeler
77ba40603a qbs build: Fix the names of some Qt modules in Depends items
It's "testlib", not "test". And "designercomponents" is actually a
private module.

Change-Id: I1a14d107bb5568b4f3807558ec6ed11937ac816a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-11-10 16:36:17 +00:00
hjk
9040c4081e Debugger: Use less GDB inferior calls in normal field extraction
They are not usable in core files.

Change-Id: I2134b61f27c27862c12a679d0acf7bebc9fcc7a2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2016-11-10 16:20:37 +00:00
Tobias Hunger
9252a3ae44 CMake: Add fileoverlay icons for cmake project files
Change-Id: Id9b8aa9b1902e6f88ca4e8bde2e5f20281a77437
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-10 16:05:59 +00:00
Tobias Hunger
39e2c013dd ProjectExplorer: Handle root directory when creating folders
Handle root directory properly (a empty filePath in the base node) when
creating folder nodes in the project tree.

Change-Id: Iad761b94ee210406ed5ab9ceb2d00ce25db90046
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-10 15:59:14 +00:00
Tim Jenssen
ffe305527b Wizards: remove default icon
Change-Id: I665ccb887294885758b45b0bd272620e1a796eec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-10 15:45:09 +00:00
Tobias Hunger
f9e9357756 ProjectExplorer: Add method to find ProjectNodes
Change-Id: Ib8056bd7d5603ced67c3ce3514d49ec51d05e2cf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-10 15:24:22 +00:00
Tobias Hunger
ad003363b7 ProjectExplorer: Rename Node::projectNode to Node::parentProjectNode
Change-Id: I47fa794a0bd8456ae23271934a957d9667d2d7bb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-10 15:24:14 +00:00
Tobias Hunger
c7b0163fcb ProjectExplorer: Make FolderNodes a bit easier to work with
Add some methods to look up different kinds of nodes in the
project tree.

Change-Id: Ia91844b45c2a124dc01771297e1f5c414d84e7cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-10 15:24:08 +00:00
Tobias Hunger
67e011ba5f ProjectExplorer: Make naming of methods on Nodes more consistent
Change-Id: I5050a020f0fc0ef4556db1d2020afeadfcd51585
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-10 15:24:02 +00:00
Tobias Hunger
b782b98fef Core: Use QString in FileIconProvider API
Prefer "const QString &" over "const char *" in the API of FileIconProvider.

That makes no more sense, now that we no longer need QLatin1String around char arrays.

Change-Id: Iaf4af25d6e3b96529586032113297754d6c9d74e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-10 15:23:47 +00:00
Tobias Hunger
b72d579ece Core: Handle matches on complete filename in fileiconprovider
This enables file icons for cmake's CMakeLists.txt files.

Change-Id: I9c0af8f27a64c57251e986508287a05fc1e66073
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-10 15:23:39 +00:00
Friedemann Kleint
99ead48a7d purify2tasks.pl: Escape backslashes in messages
Purify sometimes has file names in its messages.

Change-Id: If0fd8306f124a9f59938092ae2bfa4efaca64f5d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-10 12:10:13 +00:00
Leena Miettinen
f3bd1e47e0 Doc: Update the copyright year in the page footer to 2016
Change-Id: Ifc4e1b9fe2e2e7804774a6d4a72308bbd1a74b79
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2016-11-10 11:51:20 +00:00
Jake Petroules
d121fefaa9 Qbs: fix Xcode SDK detection
The Xcode related properties in the cpp module no longer exist. Use the
correct ones, and be a little stricter about extracting the constituent
components from the sysroot.

Change-Id: I6ceaebf529764e69e1e04af6650a2920b139fac2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-10 11:04:57 +00:00
Tobias Hunger
0d79f0d5d9 Qmake: Make sure to mark new ProFileNodes as "parse in progress"
ProFileNodes start out as "no parse in progress" and need to be told
that there is a "parse in progress" when created as part of the project
parsing.

Otherwise they will not notify their associated run configuration that
they are done parsing, which in turn keeps the run buttons in the UI
inactive.

Change-Id: Ic37a9f1ccb6beecbf37f4fc54747122572e52c90
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-10 10:49:35 +00:00
Ulf Hermann
a5e11066ab Timeline: Fix tests involving TimelineModel::color()
Change-Id: Id2043721f99b67d986829b60ea604e0b1b3c7458
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-10 08:55:23 +00:00
Ulf Hermann
05746be80d QmlProfiler: Fix tests involving TimelineModel::color()
Change-Id: Ia3d1ab6be249fb7193ce084b7312e2b6192edad6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-11-10 08:55:15 +00:00
hjk
77bd581f49 Debugger: Re-enable access to dumper.Value by integral index
Task-number: QTCREATORBUG-17220
Change-Id: I63632a90e2518151b3bf20b1241c24f9808ec39c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-10 07:02:58 +00:00
Christian Stenger
beec36c7d3 Debugger: Allow debuggerruncontrol creation with warnings
Change-Id: I50092cb99c24ab31fafb1b5ce3c0b371adc42f38
Reviewed-by: hjk <hjk@qt.io>
2016-11-10 05:46:06 +00:00