Commit Graph

52078 Commits

Author SHA1 Message Date
Leena Miettinen
3696852880 QtQuickDesigner: Use double quotes for emphasis in messages
Change-Id: If53aff1563c1ea38e42007e4a391312d4ef5d261
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-28 11:20:25 +00:00
Eike Ziller
aed6a66be3 Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: I4876ce528e2422f63280535fe4f9dd6610a75dec
2017-07-28 13:19:50 +02:00
Eike Ziller
48d3fd1af5 Dev package: Collect from all directories except tests/ and share/
Except for the qmlpuppet directories under share/.
Some plugins have other directories to look into than plugins/.

Change-Id: I89cc61d02c39ecee2cfb6db72986003651ca4b9c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-28 11:18:17 +00:00
Christian Kandeler
da06a6546d Add another fall-through annotation
Change-Id: I2a44f7a12ea9f7f5bef2dd898b5f3575d8ecd190
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-28 11:00:12 +00:00
Christian Kandeler
11ba8f0538 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I71384c0eff96dcbd83f0e41c980799fbb184d871
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-07-28 10:56:27 +00:00
Christian Kandeler
02b825c65f qtcreatorcdbext: Fix qbs build for the "no python" case
Change-Id: Ic62b1052ffa693c0a040de1a2efd2dc06b49ac7f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-28 09:52:33 +00:00
Leena Miettinen
42d19bf367 TextEditor: Add punctuation to end of message
Change-Id: I3f8f85d8687e4b8fa14ed48e1cc02fce76b8c138
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-28 09:18:07 +00:00
Leena Miettinen
8b5dfab38e QtQuickDesigner: Add punctuation to the end of error messages
Change-Id: I7a7ebf343860e887c10be044cbe6930ffe13dd59
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-28 09:17:54 +00:00
Orgad Shaneh
21fd430db8 QbsPM: De-static const strings in constants header
Having a static variable in a header is strange.

Change-Id: I42c0244f6e73f1cbf530e704a36b96bf5b85a017
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-28 08:58:48 +00:00
Orgad Shaneh
abbea9a84e QbsBuildStep: Remove QLatin1*
Change-Id: I46e47531cba5c650a8e40e957d7423ae60ffb989
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-28 08:57:51 +00:00
Leena Miettinen
15819b5027 SilverSearcher: Fix UI text to follow guidelines
Change-Id: I6b0902e23b16a0e00087d65077776779498a9423
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2017-07-28 08:52:14 +00:00
Leena Miettinen
435c8cf0f9 ProjectExplorer: Use double quotes for emphasis in UI text
Change-Id: I2a051304de8f6aba3b37a0d572e96f35dd9d259b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-28 08:32:20 +00:00
Leena Miettinen
6150d908d1 ClearCase: Fix UI text to follow guidelines
Change-Id: Ida47885f58aa0a219ad9eef5aa670a643c58744e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-28 08:31:59 +00:00
Leena Miettinen
11893271ba Extensionsystem: Add a full stop to the end of error message
Change-Id: I8cf154434ed757861bf43de68ea9b6625cd6db4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-28 08:31:40 +00:00
Leena Miettinen
97a6dc2c36 ProjectExplorer: Add punctuation to ends of messages
Change-Id: Idaa794204b87b5a139203a6d183935425ecfd67e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-28 08:24:38 +00:00
Tim Jenssen
8f9e537dcf Icons: warn about invalid resources
Also give a 1x1 pixmap back to avoid paint engine error messages.

Change-Id: Ibd7793d133952c4c3169796432b42572af0ace21
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-28 08:08:30 +00:00
Leena Miettinen
b29ea4527a Git: Do not use the (s) plural in UI text
The UI text guidelines advice against this.

Change-Id: Ib8f9cb291f0217de10853412b133173f1d11e7b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-28 08:06:56 +00:00
Leena Miettinen
6c25c67b98 iOS: Write "error" and "simulator" in lower case in messages
Change-Id: I20d2266b2f40dc19b367e7704b72977a84814c3c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-28 08:06:35 +00:00
Leena Miettinen
d0093ad631 iOS: Add space before start bracket in UI text
Change-Id: If1ac4ac557790b4919637c77222c4a49c4366170
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-28 08:00:27 +00:00
Vikas Pachdha
fc3469eb1e iOS: Fix invalid device asserts during automatic kit update
Change-Id: I744022ca4441880995f9b965bf7092d6ec985886
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-28 06:46:17 +00:00
Eike Ziller
a7bc977056 Fix close icon for right side navigation panes
If there is only one view, it should show the "close to the right" icon,
not "close to the left".

Change-Id: Ifb7c4261cb74e35310dc3d634720d9daa20df3f1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-28 06:42:35 +00:00
Leena Miettinen
d2f6abbb0b Doc: Describe new auto test options
Update and add screenshots.

Change-Id: I3fb8b8193a6f83449dd121c32778ec22a156288f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-28 06:08:54 +00:00
Andre Hartmann
de7d6afb55 SearchResultWidget: Use member initialization
Change-Id: I0dea28ceec2ed3261a1a5b25c7b4b2c8f58f7be8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-27 19:53:11 +00:00
Andre Hartmann
3fe14e4452 SearchResultWidget: Remove excess newlines
Change-Id: Ifbbc42069951c6cd41e33df4324ff6cbeabea79f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-27 19:39:43 +00:00
Marco Bubke
5ab729ea10 Clang: Fix tests for output arguments
Change-Id: I9aeef5758c6291f19efc3d72d5d985adad4c13ab
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-27 14:04:32 +00:00
Eike Ziller
9297ee92c6 Help: Fix destination of index locator filter
When using locator in the external help window, open help pages or show
the topic chooser in the external help window, not the main window.

Change-Id: I792223147f1eb00addafb2618017536c126c71dd
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-27 12:15:11 +00:00
David Schulz
b1390a07ca Android: Simplify code assist by using KeywordsCompletionProvider
Change-Id: I566e54e8cb539227019fd9cf94113924d1ac9822
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-27 11:42:15 +00:00
Christian Stenger
9205bc7aeb QbsPM: Implement configureAsExampleProject function
This function is used in some of the plugin unit tests of
QC.

Change-Id: I8e5f5b734a78a207f139b676aa6616abcc9ce7c0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-27 11:14:02 +00:00
Orgad Shaneh
b123018287 Git: Fix blame with selection that ends on the last line
This also removes an additional line when the cursor is on a line start.

Change-Id: Iaec6f60b8e33d98c3a3ed0555ee4ff01991ad7fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-27 10:33:10 +00:00
Robert Loehning
3e214a2ebd TextEditor: Compile fix
Change-Id: I0edf0fd32077a06102aec5951860c28723e46178
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-27 10:23:15 +00:00
Oliver Wolff
f4db435976 Fix compilation: take 2
Change-Id: I1f1f2c8dee1afc768633af074af650bdfd200a2a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-27 10:11:48 +00:00
Oliver Wolff
d492f5aa44 Fix compilation
Change-Id: I2f7f92b028dcb60491d813b88bfe881c305c66ad
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-27 09:55:46 +00:00
David Schulz
26fa374084 Debugger: check for python when builing cdbext with qbs
Change-Id: Ife169124f9fcd885774cd39698281e9a64e4545b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-27 09:16:12 +00:00
Leena Miettinen
8e178c08e4 Android: Make UI text more clear
The definite article "the" should be "an", but I would like
to rewrite the notice to use simpler language.

Change-Id: Ic611343724f32b3b1f22a5c768c387cafceb0890
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-07-27 09:08:48 +00:00
Nikolai Kosjar
ba6939fa90 Unit tests: Fix ProjectInfoGenerator.* tests
...by adapting to recent mime type changes:

    commit e8e46ab553
    Plugins: Fix that mimetype definition was not valid JSON

Change-Id: Iac416ab481814e4488fac4d818c51c647c1ec349
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-27 08:44:12 +00:00
Andre Hartmann
c78ea5a7ea CppFindReferences: Fix file name case sensitivity on class renaming
Utils::matchCaseReplacement searches for common prefix and suffix
between old and new file name und leaves them unchanged. This leads
to unexpected new file names.

E.g. when renaming MainWindow to MyMainWindow, this function computes
the prefix "m", the suffix "ainwindow.h" and only considers "yM" as
the middle part that is actually renamed.

Use a better algorithm to determine the new base name, and for
unclear cases fall back to the "Lower case file names" option
from Tools -> Options -> C++ -> File Naming.

Task-number: QTCREATORBUG-18592
Change-Id: I818f7d372102eb6e266123b2b4b6355f6fa28d64
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-27 08:10:02 +00:00
David Schulz
2c5186253f QMakePM: Use generalized KeywordsCompletionProvider
Change-Id: Iaa6476be9285d814e4357b861c8fd00f1c9adc1c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-27 07:49:16 +00:00
David Schulz
c7abc41d97 TextEditor: Make text snippets available in all editors
... that do not define their own completion assist provider

Change-Id: I8edb65647a55178d4388b26c95cdeb301ff9f3fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-27 07:49:06 +00:00
Christian Stenger
d68f258754 Debugger: Avoid crash when attach to process fails
If attaching to the current's project running executable fails due
crashing inferior the run tool is cleaned up already when trying to
fetch its run parameters.
Circumvent by checking whether run tool is still accessible.

Change-Id: I56f3d841d77d0513806a2b91357841f160f74ed3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-27 05:02:59 +00:00
Orgad Shaneh
9030e34dea Debugger: Fix crash when interrupting while waiting for locals
Change-Id: I9c8fbe14d238b2c2526598d4cbca561c7e9a5d0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-27 04:46:53 +00:00
Jochen Becher
4b3acf03fb ModelEditor: Fix a crash moving packages into itself
Change-Id: I1a722b9514ee0a57d8bd8be2f4ea05ed87c6686d
Task-number: QTCREATORBUG-18262
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-26 15:59:30 +00:00
Tim Jenssen
babb49b048 QmlDesigner: add forgotten componentcore resource
Change-Id: I486c690f848a15ac4675077e786a05fbd65e6a0c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-26 15:34:27 +00:00
Marco Bubke
a39d0e6fe1 UnitTests: Fix printer
Fix recursion for QVariant printers.

Change-Id: I1473a94102d0f4446e8033f4c1828735614cdfa3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-26 14:10:39 +00:00
Kai Koehne
2b467e8ea7 Fix compilation breakage with mingw / windres
The replacement of string defines in the .rc file that was introduced
in commit b5703bcd029fd does not work with windres. Here the string
literals have to be explicitly quoted by STRINGIFY. Also, we need to
replace literal spaces with \x20.

Task-number: QTCREATORBUG-18635
Change-Id: Ie01886ea680c3c07c4e0a031f12b6fe60e896263
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-26 13:57:40 +00:00
Eike Ziller
bb145847d7 Bump version to 4.4 rc1
Change-Id: I7d78ce4ed70a14cfea95cfac4a852ba715e64fb1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-26 11:05:51 +00:00
Nikita Baryshnikov
5d362a4d76 QmlDesigner fix parentheses warning
/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp:145:
warning: suggest parentheses around '&&' within '||' [-Wparentheses]
                 || selectedItemCursorInMovableArea(event->scenePos())
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 && !event->modifiers().testFlag(Qt::ControlModifier)
                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 && !event->modifiers().testFlag(Qt::ShiftModifier)) {
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: Iea6018d885b9bad13363a39e2aee0e6e229f93c4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-26 09:01:12 +00:00
Orgad Shaneh
e6fb1fea65 C++: Delete empty source file
Change-Id: Ib86e09d6d516b175e715725fa9b60d7ae2626ff8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-26 07:57:20 +00:00
Orgad Shaneh
3e91c7670e C++: Re-add Roberto's license header to files without one
Nokia's license header was removed in
b342ad8cf4, but these files didn't have the
second license header that was supposed to remain.

Change-Id: Ib9977a3127fd48197a1a02982e7563c486bfca3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-26 07:57:03 +00:00
Orgad Shaneh
dc43b89172 Replace include guards with #pragma once
Change-Id: Icce9d191cc6cae89baf973e949dc0757d318d6ea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-26 07:44:27 +00:00
Eike Ziller
3841d2fce2 Locator: Fix diverse issues with drawing highlighted text
To draw the result items with highlighted parts, we split the text to
draw into "before highlight", "highlight" and "after highlight", and
painted them separately. This had several issues:

It breaks the text layout. Characters within a text are often started at
subpixels, which was not so visible in the static search results, but
lead to ugly artifacts while typing in Locator (enter a search term, and
then continue adding characters that still match the first found item,
and watch the effect in the "after highlight" part).

It needs a lot of custom painting code. Properly supporting text elide
modes is hard, scaling to more than one highlight as well. Reusing parts
of the QItemDelegate base functions also has its issues, e.g. that
clipping doesn't work well.

Instead, QItemDelegate::drawDisplay should make it possible to set
format ranges for the text it draws. This patch copies part of
QItemDelegate to be able to add this parameter. Unfortunately Qt
currently has a bug (QTBUG-62019) that character backgrounds are not
painted far enough (1 pixel to the right has the wrong background), which
looks very ugly in selected items in the search results. So we use the
new delegate only for Locator for now, to be used later for the search
results too, when that bug is fixed.

Task-number: QTCREATORBUG-18532
Change-Id: Idf59b2c2bcfa6b188a810f7a3128a81e7e6fffb1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-26 07:16:25 +00:00