Commit Graph

44349 Commits

Author SHA1 Message Date
Vikas Pachdha
54677f4985 iOS: Capture console output of launched app on iOS simulator
Task-number: QTCREATORBUG-17483
Change-Id: Id18c51e20cf8b396fc610918610f04d39ead28b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 09:34:31 +00:00
Christian Stenger
92db5afba4 AutoTest: Handle re-implemented test functions appropriate
If a derived test case implements the same private slot as one of
its base classes one of these information got lost as both were
using the same key to store the information at.
Additionally take care of what is possible and sensible when using
QtTest and deriving test cases from others.

Task-number: QTCREATORBUG-17522
Change-Id: I0d2a47c820d5eb002f8bdd851a07a4774e9838f0
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-10 05:39:05 +00:00
Tim Jenssen
e0c4f87e6e QmlDesigner: use const without static in namespaces
Change-Id: Ie608e6f2d733c015b315d16ad58b159de4a72d75
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-09 16:01:47 +00:00
Nikolai Kosjar
fe0a091802 C++: Fix use-after-free crash when handling auto expressions
The Control of the Document "exprDoc" in ResolveExpression::visit(
SimpleNameAST*ast) owns names that are passed on further as part of the
LookupItems. However, the life time of that Document and thus the
Control ends in that function.

Fix by using the appropriate Control object.

Task-number: QTCREATORBUG-16731
Change-Id: I5a7af0a67613fff79f7e07865801585c13bb9b45
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-09 15:38:33 +00:00
Kavindra Palaraja
ca507f2fe3 Change "Executing in" to "Running in"
While I understand that the term "execute" is techically accurate, to
execute has many meanings, not all of them are positive. Execute can
also mean to kill someone. We should try to have more geopolitically
neutral terms in an IDE like QtCreator since it is used all over the world.

Change-Id: Icd6742865afa7a4469764e38eee961d7a96c7d5f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-01-09 13:48:45 +00:00
Marco Bubke
0011d81817 Utils: Activate copy constructor and assignment
The move only patter is quite powerful but has the drawback that some
STL algorithms get quite complicated. For short string or const references
should be not difference to a move. So we activate them for all cases.

Change-Id: I959c13796e69c45f31bb0ecbbe64a70d39961e3f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:45:08 +00:00
Marco Bubke
8624e3c97d Clang: Remove unused files
Change-Id: If100138459665a11812ed5977ca15b79c0836b93
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:21:33 +00:00
Marco Bubke
023e1fa610 Utils: Add PathString to improve memory usage for longer paths
Change-Id: I90bca7eddfc4823406f1320a7f6e7836d53c3425
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:21:08 +00:00
Marco Bubke
a2642f253a Utils: Add io support for all BasicSmallStrings
Change-Id: I4c37d0f5940f9424175db7dbf4d6b057f8ced9ef
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:21:03 +00:00
Marco Bubke
9186a49603 Utils: Add conversion operator to QStringList to BasicSmallStringVector
Change-Id: I32b7df9ff2e08e6e998a6d9efbf721bd7eeca28b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:20:55 +00:00
Marco Bubke
07ee542a14 Utils: Activate copy constructor for BasicSmallStringVector
Change-Id: I8716c4533274578d01762657dd430796ac21afaa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:20:49 +00:00
Marco Bubke
8acacf5d42 Utils: Add a constructor for std::vector<SmallString>
Change-Id: I1ce11bfbf14d9fda975c2d1ca27ae9d7b8e40bc7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:20:45 +00:00
Marco Bubke
7b6e671809 Utils: Change of less operator for SmallString
Comparing file paths can be quite expensive because the start very likely
with the same string. Sorting for size and only compare the string is less
expensive. For many algorithm we need a sort order, so making the less
operator cheaper is quite desirable.

Change-Id: I33e7abc7a65264e80376f445f8b6dcada0625ab9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:20:40 +00:00
Marco Bubke
8088923f2f Utils: Add SmallStringView constructor to BasicSmallString
Change-Id: Ib8b92f9d39f342680f62433f8cc67d2adf1f6eb2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:20:29 +00:00
Tim Jenssen
c191672013 Utils: Change UNIT_TEST_PUBLIC in unitttest_public
Change-Id: If60f24e3b055d543ba7864d4eb7e8287721d1012
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:20:17 +00:00
Leena Miettinen
16c2b73061 Qt Quick Designer: Fix typos in and capitalization of UI text
Change-Id: Ida8dee65d34d033eca14e666aa7f1a8a93498061
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-09 13:09:13 +00:00
Anthony Heading
0735253139 Fix off-by-one error which stops qtchooser finding qmake
At startup,  qtcreator prints an error:

% qtcreator
"The command \"/qmake\" could not be started."

This appears to be because of an off-by-one error in
BuildableHelperLibrary::qtChooserToQmakePath(const QString &path) which
parses the output of a call to "qtchooser -print-env" to extract the
value of the QTTOOLDIR variable.  The code attempts to move past the
prefix string to find the end quote, but by moving one too few
characters it finds the starting quote instead, resulting in a zero
length string result.

Change-Id: I74368f10a81eda2286ae735bdc595c0f92e4e665
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-09 12:42:25 +00:00
Eike Ziller
7f8aa3a7be Make some plugins hidden by default
Hide core plugin, hello world plugin, and plugins that only provide the
base for other plugins.

Change-Id: I7f4a29a265d760b2a759122be153c7f06bd40bd2
Reviewed-by: hjk <hjk@qt.io>
2017-01-09 12:25:13 +00:00
Eike Ziller
284fa63be2 Support 'hidden' plugins
Plugins can be hidden in the "About Plugins" view by default. Users can
still make them all visible, but the default view can be made less noisy
by hiding plugins that only exist as a base for other plugins.
Plugins that can not run on the current platform are hidden by default
as well.

Change-Id: Iaf2f751c4ea4b3afc605bbbea6611eea042e62c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-01-09 12:25:08 +00:00
Jarek Kobus
b29513aa5b Display "Waiting for data" properly
Display "Waiting for data" instead of "No differences" when creating new
instance of an editor for the same document (e.g. by splitting the view)
during document reload.

Change-Id: If254006de3914ad4416c7405874e8cbea57ddd8d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-09 10:49:13 +00:00
Ulf Hermann
58f754bb66 To-Do: save the settings only if they've been "apply"d
The colors don't play very well with the theme support. We want to
switch the colors according to the current theme if the user doesn't
care for them. Not saving the default colors achieves that.

Change-Id: Idafc13e561d33736eb21b26944756291449594b5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-09 09:58:16 +00:00
Thomas Hartmann
b872a38040 QmlDesigner: Some cleanup
Change-Id: If1369124ca694bd5313213625636cf39a14af247
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 15:26:25 +00:00
Thomas Hartmann
78dbc9fc9e QmlDesigner: Reset property editor if root node type changes
This was not an issue before, because it was not possible in the ui.

Change-Id: I98e0634bdb667dae5a8589c5b1f70c2d87527ae6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-06 14:45:38 +00:00
Thomas Hartmann
c27d7c00d6 QmlDesigner: Move cursor to selected item
When an item is selected in the navigator we move the cursor.

Change-Id: Ia6d41e4d7bdf38688cf0cd73f134c349126eb68e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 12:30:12 +00:00
Thomas Hartmann
e540f2eda5 QmlDesigner: Synchronize selection with cursor position
We always the select the item that contains the cursor,
so the user can use the property editor.
This even works for non visible items.

Change-Id: I5573e6d9be4b478f764ab6960a3b5742136dcee9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 12:29:56 +00:00
Thomas Hartmann
1d3292e3aa QmlDesigner.: Using editorWidget instead of widget
Change-Id: I0c8dc16ceeabc608334027abf05ed3ddff5a9a36
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 12:29:47 +00:00
Thomas Hartmann
01095b5ddf QmlDesigner: Use stylesheet in TextEditorWidget
Change-Id: I08d9e76a40f468a399b031dfa3af14e6b1118e19
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 12:29:39 +00:00
Thomas Hartmann
5913e15011 QmlDesigner: Fixing contextHelpId for TextEditorView
* Using the same pattern we use for FormEditorView

Change-Id: I94f9219b1bd3f269a8288763fdea473f960efeaf
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 12:29:31 +00:00
Thomas Hartmann
b12a1915a1 QmlDesigner: Fixing regression for id renaming
When we rename an id we actually trigger a refactoring
operation on the qml text.
Due to recent changes we delay and compress qml changes
from the text side using a 400ms timer.
This is fatal for renaming ids.
When we trigger refactoring operations on the text we have to ensure
the update is done instantly without delay.

To ensure this we use the memeber m_instantQmlTextUpdate.

Change-Id: Ie007ee99f201cd444033c38630d7e7a9f5a673b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 11:47:18 +00:00
Thomas Hartmann
79d8b9c133 QmlDesigner: Refactoring TextEditorView
* Using smart pointers
* Renaming DummyWidget to TextEditorWidget
* Moving TextEditorWidget to separate file

Change-Id: Idbe0e50f976bf39beac8632d4254d6d9a5afd5b2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-06 11:47:03 +00:00
Tim Jenssen
5ad0cbc070 QmlDesigner: remove unnecessary save method
Change-Id: Ia2a195c84ce83bc3a83155cc19b0585475a5547a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-06 11:26:27 +00:00
Tim Jenssen
2ea7119b69 QmlDesigner: fix indentation in formeditorview
Change-Id: Ife7ead01abb340ea9ef1526281e68bda84b9ec63
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-06 11:26:13 +00:00
Tim Jenssen
04305aa2d1 QmlDesigner: use textCursor method
Change-Id: I43309ea37bc6c0af0feea101df582ff51bd2fe30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-06 11:26:04 +00:00
Christian Kandeler
353d6b2513 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: I8233e58ce52f62b2dcdd89fa5eea3792318ac0f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-01-06 10:49:37 +00:00
Tobias Hunger
ca0a8a6cf7 Qmake: Initialize ExtraRunConfigurationAspects after initial parsing
Task-number: QTCREATORBUG-17462
Task-number: QTCREATORBUG-17477
Change-Id: Ie74455362d7e7ddc0cbd9296a3e2438e7195b00b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-01-06 10:19:13 +00:00
Tasuku Suzuki
d6910b9288 QmlDesigner: Fix typo Chrash > Crash
Change-Id: I9cf55c25cb8c904ef1677376025b9ff6b81f1902
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-06 07:37:18 +00:00
Christian Stenger
572b04a00a AutoTest: Find data tags of inherited functions
Task-number: QTCREATORBUG-17522
Change-Id: I9fa1db3c2d7f338afe343fc835b9e3dbae353131
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-06 06:19:44 +00:00
Christian Stenger
0ceea628b0 AutoTest: Do not lose information of base classes
In case the base class is defined outside of the file with the
derived class we are missing the correct entry point.
Work around this by getting alternative entry points beforehand
and using them if we cannot find a valid entry point.

Task-number: QTCREATORBUG-17522
Change-Id: I07ef87b2fcdac4f78240da9e57eaa518ff0f4d20
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-06 06:19:35 +00:00
Christian Stenger
4a634a23cf AutoTest: Find inherited Qt test methods
Task-number: QTCREATORBUG-17522
Change-Id: Ie7cfed2bd38944c28ea8502552593e0083f9727c
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-06 06:19:28 +00:00
Christian Stenger
7d1d4471f0 AutoTest: Introduce inherited state for Qt test tree items
Preparation for later detection and displaying inherited functions
for Qt tests.

Task-number: QTCREATORBUG-17522
Change-Id: I2af1f758a837049ef676840b03f9cd73a2cb9873
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-06 06:19:22 +00:00
Thomas Hartmann
e575f054db QmlDesigner: Adding a toolbar
* Icons are not the final ones.

* I fixed a couple of glitches and cleaned up the code.
   - Action for copy and paste/delete were not properly updated
   - Delete had no icon
   - Using std::function for action predicates and operations
   - The context menu has no icons. This way we avoid having to define 2
icons.

Change-Id: Ic23cbc78ba299c19e07e8de775eb813aae55db9b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-05 16:44:32 +00:00
Marco Bubke
a8c14b558a Utils: Fix warnings in Treemodel
We made a implicit const cast. Like it is said C-style can be harmful
because they are not const safe etc..

Change-Id: I6b41c10c18d37af4caf58574359fdce7d4a420ca
Reviewed-by: hjk <hjk@qt.io>
2017-01-05 15:24:34 +00:00
Marco Bubke
e9a2996f8d Fix warning in okapi_bm25.h
Change-Id: Ie7be70f37695debff636d9094c6b192cb83f4136
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-05 15:04:19 +00:00
Tobias Hunger
87c8839202 RunConfiguration: Simplify adding of ExtraAspects
This makes the code a bit simpler, at the cost of the factories not
having access to the fully specialized RunConfiguration anymore. This
is apparently never used and the factories can still use the Id to decide
what to do if they really need to.

Change-Id: I7d94f85e984ac87e62c6d341c1038e1538aa15df
Reviewed-by: hjk <hjk@qt.io>
2017-01-05 14:42:24 +00:00
David Schulz
f3e3d395e5 Editor: Fix '.' completion trigger behavior
This is a partial revert of c7f19dc0a6.

Change-Id: I09998c5bc82c29a348dfd6ba4a9a14c1ce52422b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-05 12:46:39 +00:00
David Schulz
c30170117d Debugger: Don't check twice if a value is expanded
The check is already done by numberOfChildren.

Change-Id: I2dfad4e283546acb87d17ec63e47c43a0b0d467d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-05 11:56:30 +00:00
David Schulz
1da8ed2b25 Debugger: Add some debug messages
Change-Id: Ib75954ec8d3e59f77cc501a7fb64344386fb3a0f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-05 11:41:32 +00:00
Ulf Hermann
dba7333bef Timeline: Use the 'g' format for timestamp formatting
This has the nice property of dropping trailing zeroes and allows us
to simplify the code a bit.

Change-Id: I4ac98743960ba552c8e3e72e02f594ba910ab81b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-05 09:59:55 +00:00
Ulf Hermann
48570a754e QmlDebug: Use the original names for connection states and errors
The way to extract them from Qt is somewhat funny, but this leads to
clearer messages in the debugger log and other places.

Change-Id: Ib458d5ec796a2e69a6543d405593be8e54016946
Task-number: QTCREATORBUG-17492
Reviewed-by: hjk <hjk@qt.io>
2017-01-05 09:32:50 +00:00
Ulf Hermann
348b5ec8c5 QmlDebug: Add missing "emit"
Change-Id: Ib1affe0ca59c8ba01a9701fc9ee654f639122bd3
Reviewed-by: hjk <hjk@qt.io>
2017-01-05 09:32:36 +00:00