Commit Graph

49791 Commits

Author SHA1 Message Date
Thomas Hartmann
7b66a7427e QmlDesigner: Crash fix
Deleting or cutting the root node is not possible.

Task-number: QTCREATORBUG-17646
Change-Id: I613179c291e744c2d2f6e44ce103bcbd2afaed28
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 14:47:30 +00:00
Thomas Hartmann
f04f09e17c QmlDesigner: Crash fix
Throwing for an invalid model node does not make much sense.
I expected it returning false and that it what it does now.

Change-Id: I5c8c1a771e95a39bdb9ab7c30b4e94957464ffc1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 14:47:16 +00:00
hjk
71007df8fd QtSupport: Simplify welcome page examples model handling further
Use the ExampleSetModel directly in the combobox, rely on normal
model reset behavior behavior for gui updates.

Change-Id: Icdb34ff0f572caaf92259530823e90bfd783b933
Task-number: QTCREATORBUG-17678
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-07 14:29:14 +00:00
Tim Jenssen
f16bd2433b QmlDesigner: remove empty line
Change-Id: If8ad086bed95d051661fe834a6cfb3883bed5269
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-07 13:05:36 +00:00
David Schulz
a9f446704f Debugger: Adjust python dumper for 32bit MSVC binaries
Change-Id: Ia20321da89b387d016eb7fed076002a709aae748
Reviewed-by: hjk <hjk@qt.io>
2017-02-07 09:18:23 +00:00
David Schulz
26397935b4 Debugger: Fix guard expression
Change-Id: I2f31c3156636a413665aef4c5e327968c26f4a33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-07 08:59:44 +00:00
Leena Miettinen
8f53c02296 Doc: Describe Qt Quick Designer Form Editor and Text Editor tabs
Users can now use the code editor within the Qt Quick Designer.

Change-Id: I2ad30bafc4b61ce9c1115c9a8b1c019d2b21151e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-07 08:39:20 +00:00
hjk
541dd8643d Debugger: Inline GdbEngine::write into caller
Not used in earnest since the end of CODA/Symbian.

Change-Id: Ib2d22fb247d178b091a17f9927aa911d6707d3f9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-07 06:58:03 +00:00
Orgad Shaneh
f77af5e336 Gerrit: Remove repo selection from the dialog
Behave like the Branches dialog, which is updated by the current open file.

Change-Id: Id106b3e4fa777bcbf08b826f4e7d52845dde57a6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 17:00:26 +00:00
Tobias Hunger
ffbc331168 ProjectExplorer: Use makeEmpty in FolderNode::buildTree
Some lines saved.

Change-Id: I5a5e2bb150070aae48ad0ec1abb08bc2532d093b
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 16:57:41 +00:00
Tobias Hunger
bd8fe1c42b ProjectExplorer: Deduplicate functionality of makeEmpty
Only one line saved, but potentially less hassle should FolderNode::makeEmpty
ever change.

Change-Id: I4dd01179a8dce9735744991c3de080739ab693ae
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 16:57:36 +00:00
Thomas Hartmann
0b11ba3177 QmlDesigner: Keep result in local variable
Change-Id: I43c99bb18c1473b67fc40cda02af6cb1595c29ec
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 16:19:28 +00:00
Nikolai Kosjar
50a07695bd CppTools: Report also C language back to project
...for Project::setProjectLanguage().

Change-Id: I77347c4597061fb48782c629d5ad6898028fee13
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 14:31:49 +00:00
Eike Ziller
6244168202 Merge remote-tracking branch 'origin/4.2'
Change-Id: Idd63494e3878dbf8811c35beb957562255d83813
2017-02-06 14:52:37 +01:00
Leena Miettinen
f76227fa50 Doc: Describe the "New Session Name" dialog
A developer found the options in the dialog confusing.
Also reorganized the "Managing Sessions" topic for
the new text to fit in.

Change-Id: I5bbe0e2bed91ab5759c7d58d0086352ac4ab3751
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 13:41:24 +00:00
hjk
fd2bf97f82 Debugger: Remove the "Attempt quick start option"
This was GDB-only. It complicates the startup mechanism including breaking
certain setups (e.g. users manually controlling "set auto-solib-add" in
their .gdbinit) without providing too much benefit (anymore).

Part of the potential debugger startup time improvements that were
possibly gained by the feature are nowadays available by using a
release build *without* debug info, as one of the original reasons
to not use that (making Qt type introspection hard/impossible)
is largely gone with 4.2+.

Change-Id: Iffb34e0035f39ad74b24bf025749b546f25a489b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-06 13:15:19 +00:00
Vikas Pachdha
dfbe52efe3 iOS: Use command's exit code to check for failure
Change-Id: I8a565cab51b22bdf0d7d2ba274306479dc0397b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-06 11:17:13 +00:00
Marco Bubke
68afbbce75 UnitTest: Fix compilation for different configurations
Change-Id: I20d4217d1c33002f7e1ac084af4b0982b2f04971
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-06 10:23:29 +00:00
Jesus Fernandez
970e8defe7 Button text changes in Create Session Dialog
"Switch To" text is a confusing, changed to "Create and Open". "Ok"
button text changed to "Create".

Change-Id: I57071eb6e8173bf54561910259a6836a317c3485
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-06 10:02:17 +00:00
David Schulz
2144a8c798 Debugger: Make cdb python dumper tests green
Change-Id: I3b6c57660badf14eea2a97f4ccfb3ef9aa168901
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 10:02:00 +00:00
Leena Miettinen
8e536a3b01 Doc: Update descriptions of Qt Quick wizards
Qt Quick Controls Application, Qt Quick UI, and Qt Quick Extension
Plugins wizards have been removed from Qt Creator.

Change-Id: I30e6e59e38d7f120d35f6cf34603d4ec356a5ef4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-06 09:57:36 +00:00
Orgad Shaneh
e366e135b7 Git: Eradicate Q_FOREACH loops
Change-Id: I29b6071ea244d1b3ae0701d36c90b1e93cf21fbb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2017-02-06 09:37:44 +00:00
Orgad Shaneh
e3eee3b2b9 Utils: Eradicate Q_FOREACH in algorithm.h
Change-Id: I16cbe1896091e6677341dd954f58f69db1d61530
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-06 09:37:36 +00:00
Robert Loehning
69df8ec321 Squish: Add those from Windows 10 kit to expected debuggers
Change-Id: I5281fa5dc126a7cf1ea84592f735cb11d908b82d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-06 07:07:42 +00:00
Orgad Shaneh
28b61a9f9c Git: Avoid repeating calls to currentState() in updateActions
Change-Id: I9352b7d9ad064e6dc4eb694a9175c8f32b5b25c8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-02-05 07:45:00 +00:00
Orgad Shaneh
67933e4c1f Git: Move msgRepositoryLabel from StashDialog to GitPlugin
It's being used by many dialogs.

Change-Id: I3ef484cf8b9cc56210be1de5b4f201eb2f96ef67
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-02-05 07:43:25 +00:00
Leena Miettinen
0bbd1e3ca6 Doc: Setting QML import path when using CMake
Change-Id: I7e29f86d2b429fadaad763fa6abe371f79669d75
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-03 15:39:36 +00:00
hjk
5b50854e57 ProjectExplorer: Use more concise code to register extra compilers
Saves some line noise and a function.

(void) new Foo(this); is not really a new pattern in Creator code,
but a bit of a new pattern for "registering things".

Change-Id: Ie1bb409ed77bc20833fc07ca14715b9ecbc9bd5d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-03 15:37:56 +00:00
Marco Bubke
79e73ea4ee Fix spelling of unitttest_public
Change-Id: Id90dbfe30bb1f1c147299c4ac8cd210dbe7d8b82
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-03 15:35:44 +00:00
hjk
8c3307a51a ProjectExplorer: Add space between treeview entries
Task-number: QTCREATORBUG-17481
Change-Id: I27c304d1a63477c6ad081dd843ec3a6e9b6b2a4e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-02-03 15:26:31 +00:00
hjk
f1bc4ade50 QtSupport: Do not keep hold on a list of qtVersion
Can get invalidated, and lead to a crash.

Task-number: QTCREATORBUG-17644
Change-Id: Idc704ae8833ff12abd046a667f242b672d98f9b2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-03 15:11:26 +00:00
hjk
a0402dc0df QtSupport: Move built-in list of tutorials to resources
Task-number: QTCREATORBUG-17635
Change-Id: Ie1a738efe2dc6dbb217079cce508642b5c1504d6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-03 15:09:47 +00:00
Jesus Fernandez
42e3492e1a Add a shortcut to Session Manager
Change-Id: I695387d926549fe7370b20ed3f8d8a52099a5202
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-03 13:55:01 +00:00
Leena Miettinen
e929cc59f5 Doc: Describe the resource editor
This far, it was only briefly described in a widgets tutorial
and the information is needed when using Qt Quick Controls 2.

Change-Id: Ib80a446277e58dbaed9c6a5ac249e2183dc5f63e
Task-number: QTCREATORBUG-17670
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-02-03 13:47:27 +00:00
Orgad Shaneh
5159c3f20e Debugger: Add a missing underscore in the docs
Missed in c2e69f7cfb.

Change-Id: I5633dddba21e4b2db5c0300183b791f352af96c3
Reviewed-by: hjk <hjk@qt.io>
2017-02-03 13:45:51 +00:00
hjk
f8f7931b43 QMakeProjectManager: Shorten ProVirtualFolderNode constructor
It's only used in one code path, and the InternalNode contains
everything it needs.

Change-Id: I6bd4e2e3555b9a321bf0b93c56d5459f141be494
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-03 13:38:12 +00:00
hjk
31d6c3cd05 QMakeProject: Clean up qmakenodes.h
Remove unneeded things, move one-time uses to .cpp.

Change-Id: I9836a78ff697c965295d58be67530ce08c04e9d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-03 13:38:07 +00:00
Nikolai Kosjar
b1792007c7 CppEditor: Make minimized info bar icons more prominent
...by moving them further to the left in the editor toolbar.

Change-Id: I2e9b19778ea20ffc647cc80169da2f1666395c24
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-03 13:37:44 +00:00
Nikolai Kosjar
93fe64e789 CppEditor: Fix highlight of '#' Button for duplication case
Change-Id: Ib97f31912c9b2d619e3b92287ca8b192604f3831
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-03 12:00:36 +00:00
Nikolai Kosjar
dd3ba874b4 CppEditor: Disconnect lambdas
Otherwise this can lead to use-after-free access, as in:

 1. Open a document
 2. Duplicate it the editor
 3. Close current editor
 4. Modify the preprocessor directives ('#' button)

Change-Id: I3032dbbfac86ad86e08dc39e85703bc176a27ca2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-03 11:59:45 +00:00
Nikolai Kosjar
38ba61ec4f CppEditor: Rework showing/switching parse configurations
* Move the combox box for switching the parse configurations out of the
  "Additional Preprocessor Directives" dialog ('#'-button) to make it
  better visible/accessible. Also, decouple the extra preprocessor
  directives from the concrete parse context since this is not anymore
  in same dialog.
* The combo box appears only if multiple parse configurations are
  available for a file.
* The first time multiple parse configurations are detected, an info bar
  is shown that points the user to the combox box. A "Do Not Show Again"
  button is provided.
* Upon selecting an entry, the preferred parse configuration is saved as
  part of the session. The setting can be cleared with the context menu
  entry on the combo box.

Follow-up changes need to ensure that the display name and/or tooltip is
unambiguous, e.g. for qbs and cmake projects.

Change-Id: I9e9773704187291524ad7b605bfdddd83ef5b19d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-03 11:58:27 +00:00
Tobias Hunger
9ac96339ff CMake: Keep project configuration table visible at all times
Keep the project configuration visible at all times. This way users can actually
add settings, even when the configuration fails.

Task-number: QTCREATORBUG-17628
Change-Id: I0a342e0cba1dd720661a171818e0d91415ef5703
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-03 10:39:06 +00:00
hjk
39a8442f80 QMake/ProjectManager: Simplify QmakeProFileNode::applyEvaluate
... and remove ProjectNode::removeProjectNode, as this was the
only remaining user.

Change-Id: I2c53392a8e9dacf956270d652525b62ba4c9e0a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-03 10:09:38 +00:00
hjk
c2e69f7cfb Debugger: Add some examples of dumper function names
Change-Id: I898f8a7dafbca3beb6fdba9c93350b0488973a46
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-03 10:08:14 +00:00
David Schulz
0ef5463ed7 CdbExt: Add dumper support for new std container
std::multiset
std::unordered_set
std::unordered_multiset
std::unordered_map
std::unordered_multimap

Change-Id: I72ac9a96d64d85ca6c914acdbf626fba731c587a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-03 08:28:58 +00:00
Christian Stenger
062edcaa94 Fix compilation using Qt5.6 on macOS
Change-Id: I94c16668d8fd64c0974f7f1c459a1c46e1cbc9e3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-03 08:10:59 +00:00
David Schulz
9ddd66437f Debugger: Fix dumper test build
QTC_LIB_DEPENDS has to be set before including qttest.pri

Change-Id: Ie455b7341a2d79d74e3bf6f9f9d39ce8a7539e6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-03 08:10:32 +00:00
Orgad Shaneh
c0378e086b Fix build
operator% is defined in QStringBuilder header, which was unincluded in
32b628e16b.

Change-Id: Ib028485ed4e7d6362df1df5d678cb8009ac3c67c
Reviewed-by: hjk <hjk@qt.io>
2017-02-03 07:29:00 +00:00
Jarek Kobus
32b628e16b Remove unneded includes of QStringBuilder
Change-Id: I2f9690d9374b44731926a1a1532994e877809e26
Reviewed-by: hjk <hjk@qt.io>
2017-02-02 15:26:54 +00:00
Nikolai Kosjar
b250c073b5 Core: Fix memory leak in InfoBarEntry
Use like

    InfoBarEntry info(id, text);
    info.setShowDefaultCancelButton(false);

leaked the infoWidgetCloseButton.

Fix the memory leak and improve the API to avoid inconsistent state.

Change-Id: If2e06a8a5239e4f902a883da82122c3a27df48a6
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-02 14:47:10 +00:00