Commit Graph

54723 Commits

Author SHA1 Message Date
Tobias Hunger
ae95074b17 MiniProjectTargetSelector: Simplify code
Change-Id: Ie28efa6deb29801dd670656eeeeef81ccc4ae87f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-25 14:29:09 +00:00
Tobias Hunger
96df9f9189 QmlJSModelManager: Simplify code
Change-Id: Idb4fef70063ce3b42c497e302e4b69bb73f314d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-25 14:29:03 +00:00
Marco Bubke
4beaae0f79 Introduce Breakpad crash handler
Google Breakpad (https://chromium.googlesource.com/breakpad/breakpad) is a
widely used crash handler framework, e.g. by Mozilla and Chromium. It is
providing a platform neutral solution to generate mini dumps, collect
debug information and generate stack traces from those.

Done-with: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Change-Id: I09382e7db0dc9e29b228e7b554fda7b6f5684349
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-25 14:24:11 +00:00
David Schulz
0332a8c173 ProjectExplorer: Simplify TaskMark constructor
Change-Id: I8ba0e8451772eff605961e0d9aff15f535c12566
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 13:28:24 +00:00
Vikas Pachdha
8db91e822b iOS: Skip simulator rename for empty input
Task-number: QTCREATORBUG-18629
Change-Id: I47ebb8b9046dda904e22612818f597e0ec7416db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-25 12:28:48 +00:00
David Schulz
5294c68c98 TextEditor: Add display settings page link to annotation tool tips
Change-Id: I453127693dd1e0b30918333ac6866ac2fca4baa6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-25 12:00:49 +00:00
David Schulz
3ec59b46df TextEditor: Use member initialization in TextEditorFactoryPrivate
Change-Id: I97a077a922208545b5a6c7dc07c4de667fa0d833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-25 10:51:49 +00:00
Robert Loehning
95617ff971 Qmake: Remove dead code
Change-Id: If28fb24a47a462b5c79ff22ded515d14c010ce72
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 10:19:19 +00:00
Orgad Shaneh
131a796f9f GCC: Detect multiple versions of gcc/g++ on linux
Debian/ubuntu systems can have /usr/bin/g++ which is GCC6,
/usr/bin/g++-5 and /usr/bin/g++-7.

The same applies for cross-compilers.

Detect them all.

Change-Id: Ia7b403efbfab60b05c4f27a9011d054d52c3aa1a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-25 10:17:26 +00:00
Eike Ziller
efa5a7b6d7 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
2017-07-25 11:54:44 +02:00
Eike Ziller
41127e0f47 Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: I4e14ef31dc6cdcc0606d39be90195e30c1ee9b25
2017-07-25 11:50:43 +02:00
Vikas Pachdha
3881ff94f7 Android: Fix sdkmanager timing out on slower machines
sdkmanager times out on slower machines or with slower network
connection. Increase the timeout and show timeout message box

Task-number: QTCREATORBUG-18458
Change-Id: I9118024ec1438ef9c18842df2f7431e696c73f92
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 09:43:54 +00:00
Tobias Hunger
336f54def4 CMake: Fix progress calculation in server-mode
Add unit test to make sure this stays fixed.

Task-number: QTCREATORBUG-18624
Change-Id: Ieeb41982418481223d9ebf8f5c6ec4b3b78bfe00
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-25 09:35:24 +00:00
Kai Koehne
7d8847101d Add name, version as metadata to Windows executable
The description and version is seen e.g. in the file dialogs, but
also in the task manager and crash dialogs.

Change-Id: I65f7076a55ecbdcaa6b7c9ab57fecaab59bcaa08
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-25 09:06:01 +00:00
Kai Koehne
68fe72e99a Define COPYRIGHT_YEAR in build files
This allows us to use the copyright year also in the following
patch that adds it as metadata to the windows executable.

Ideally we'd unify IDE_YEAR and IDE_AUTHOR (because they're
only used together anyway) but that would break translations.

Change-Id: If0f84eaeb22e9ba71b2b29798324b76a91eda78f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-25 09:05:43 +00:00
David Schulz
3ed88cda2f GenericHighlighter: Update supported kate styles
Change-Id: I016b25c56b31c615e208e86e690fc7408c9e5384
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-25 06:24:54 +00:00
Eike Ziller
e8e46ab553 Plugins: Fix that mimetype definition was not valid JSON
JSON officially does not support multiline strings, so we should use
the same mechanism that we already use for the plugin description
(i.e. additionally support arrays of strings which are interpreted
as lines).
This just happens to work because Qt's JSON parser eats it without
choking.

Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-25 06:00:49 +00:00
Jochen Becher
c8962c34ba ModelEditor: Add a bit of documentation for new features
Change-Id: I08ca964652f2594d30d5576b5d956d97e01a4ef8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-07-25 04:05:52 +00:00
Jochen Becher
2da3a4ab43 ModelEditor: Fix crash pressing shift on a size-locked object
Change-Id: Ifcdd5010369a71649a5f34c72c81ec9a30556bc7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 04:05:35 +00:00
Jochen Becher
ffb5dc756a ModelEditor: Introduce custom relation type "Connection"
Change-Id: Iddd45508dcb2de1fa2b6d9b2b881b54a73172caf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 04:04:53 +00:00
Jochen Becher
82cb2b248e ModelEditor: Show relation templates in object toolbars
Change-Id: I06de22538e500c133693ff0c791ac8a2d3be3402
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 04:04:36 +00:00
Jochen Becher
6ea47c98fb ModelEditor: Refactor relationables into common parent class
Change-Id: Id863a5004cb903cbc2929745e818e5810ff70dd2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 04:04:21 +00:00
Jochen Becher
8100812531 ModelEditor: Support custom relations in configuration files
Change-Id: I87338f290bd1ea729682236df8b017516a18e7bb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-25 04:04:05 +00:00
Alessandro Portale
5df0f97d2f Core: Tweak the wizard icon text overlay
Increasing the text size a bit, making the text darker and making the
margin proportional to the image size (resolution independent).

Change-Id: I029b57e2bf1c355f35161e5f8810dddea4114047
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 18:03:34 +00:00
Alessandro Portale
8997386675 QmlDesigner: Polish the formeditor split toolbuttons a bit
This gives them a similar look of other toolbuttons
in Qt Creator.

Change-Id: Ib3163ff6c1eab2bd26e46d1136de5fa474dea66d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 17:48:34 +00:00
Nikolai Kosjar
c3ce2dc063 Clang: Sort files in *.pri/*.qbs
Change-Id: I284298c926f3d445272987ee622e6fc4aba4697a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-24 15:58:59 +00:00
Nikolai Kosjar
8ca2f9d3fa Clang: Tests: Sort files in unittest.pro
Change-Id: I5473230ba9bc1b6c1a9520971d66918d545c9e5b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-24 15:58:38 +00:00
Alessandro Portale
9113125a5e Wizards: Add file extension as text overlay to some wizards
Change-Id: Ibfd1144271c4381c7125db80713cbde431a54cf7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-24 15:32:24 +00:00
Alessandro Portale
5a0d7a0abd Core: Enable text overlay for "New File/Project" icons
Change-Id: I6f206b2c97f7435b4de3a06c32b3933f3519181a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:26:57 +00:00
Alessandro Portale
15e6ec4552 Utils: Make the wizard icon for files wider
In order to able to fit some overlay text to it.
(See following commits).

Change-Id: I9b762b20d9a17e5bf779bf1d197804803fa812ad
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-24 15:26:43 +00:00
Orgad Shaneh
257bf341ca GccToolchain: Minor cleanup
Change-Id: I9bf2d935bf95ff45b29ebfbefd8f8aaf8e22e3ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:10:20 +00:00
Orgad Shaneh
948fad02d1 Git: Recurse into submodules on grep if applicable (Git >= 2.13)
Change-Id: I5028d6a46749b22cc0e0f5707c9e283126511902
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:10:15 +00:00
Alessandro Portale
42844215ca Utils: Introduce the empty16 icon
Empty14 is sometimes simply 2 pixels too small.

Change-Id: Ia711f4d17388a51999d056ffff1ed4089e8d4819
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 14:58:23 +00:00
Marco Bubke
99af4ae8e6 Clang: Show all tokens of a getter as output argument
f(x.get()); -> x.get() should be shown as a output argument

Task-number: QTCREATORBUG-18591
Change-Id: I99f5637660bcd0a889338ebfa6737d79de226f87
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-24 14:31:23 +00:00
David Schulz
e97ff9f739 Clang: Do not warn about unhandled enum values
... in switch as long as there is a default case.

Change-Id: I584660cb26ee03a9ce3e41b297af0093dce59d1f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-24 14:21:36 +00:00
Marco Bubke
edbb656f2d Clang: Add field prefix for HighlightingMark
Change-Id: I6cbd091f65ed931fbc31707c09b832ad782de03f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-24 13:41:28 +00:00
Marco Bubke
05a77a39a1 Clang: Make C++17 default for clang queries
We don't want users to stop to use new features.

Change-Id: I7c63f236a8c0059e6db6904b7ceef4d78da6cf42
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 13:38:20 +00:00
Marco Bubke
9428624fc1 Clang: Tool tips for clang query diagnostics
If you hover a diagnostics in for a clang query you get now a simple tool
tip.

Change-Id: I6352dd3d4b9a33c183e69037eac903469b90eea4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 13:37:18 +00:00
Marco Bubke
9b5d6546b8 Clang: Remove pointer arguments from output argument
Non constant pointers are used many times as non output arguments, so you
get misleading information.

Task-number: QTCREATORBUG-18591
Change-Id: Ic5f987db44ad63a0b1a38fd59cd807db5f2acc8f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-24 13:27:29 +00:00
Nikolai Kosjar
15793d3318 Clang: Make clangCompleteAt.sh work with standard headers
"clang -cc1" is the frontend only and as such it does not have any
include paths set. Use -Xclang <arg> instead.

[1] https://clang.llvm.org/docs/FAQ.html#id2

Change-Id: I372601cae5c672562b63fa07ed9e638e984fdd58
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-24 13:24:45 +00:00
Nikolai Kosjar
6b2d6e7965 CppEditor: Cancel waiting for use selections if revision changed
Not sure whether this can happen at all, but if it can, we should not
make the UI unusable.

Change-Id: I1a40630d0c1f057e20a33b2c755e1fd5aea0b003
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-24 13:24:31 +00:00
Robert Loehning
4335f1184e Core: Replace guards by assert
Change-Id: I116d7fece2a96dbfc9adad0905bc08d8ea4ca40e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-24 12:36:48 +00:00
Leena Miettinen
9652e85b3d Doc: Describe new ways of marking code errors when using Clang
Change-Id: I9b2d8ee52e83c60b7c6d46d2b5e8e830536e6bdb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-24 11:50:41 +00:00
Christian Stenger
b4ca318383 AutoTest: Improve test results summary items display
Instead of letting warn prevail over pass and fail over
warn just add warn as additional visual marker at the icons
and keep the original test result.

Task-number: QTCREATORBUG-18311
Change-Id: Ia67288fa84598b02c20fc1019799b1bb9282d63e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-24 11:05:21 +00:00
Christian Stenger
625129d29c AutoTest: Fix appending test results with the same name
If two test cases had the same name but came from a different
executable the results pane still might have shown any later one
(badly) cascaded inside the first one. Avoid this by providing
an additional unique information (the respective executable for
the test case)

Task-number: QTCREATORBUG-18502
Change-Id: Ib071e389758b6269a9a90cc4c4afbcf86ca583ac
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-24 11:05:08 +00:00
Christian Kandeler
2a555a0da7 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I9561a75c9ef9ceb2b331d7244aded508a596e037
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-24 08:45:04 +00:00
Christian Stenger
0480dbd3a8 ProjectExplorer: Fix compile for older gcc/Qt5.6
Change-Id: I3b5728797fe1c9f1508f94ea9ea9e66773061a6b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 06:07:57 +00:00
Orgad Shaneh
f073c39b86 Git: Minor cleanup in grep
Change-Id: I2a686b6f56947d3fbb6dc70757e539bf4f274bff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-23 20:24:28 +00:00
Tobias Hunger
6979a8f2f5 IosBuildStep: Use member initialization
Change-Id: If64e3ca3c2457e88f2eba948eee6a7a9a127d346
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-23 11:51:20 +00:00
Thomas Hartmann
561a50e3a1 QmlDesigner: Increase the size of resize handle
This makes it less likely to accidentally move an
item instead of resizing  it.

Change-Id: I6102a05c50a68d50ea9e4a316f48089186b3a373
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-21 14:04:33 +00:00