Commit Graph

50929 Commits

Author SHA1 Message Date
Tobias Hunger
ae0e15fad0 ProjectExplorer: Do not leak targetsetuppages
Leaving these around can lead to a crash when updating a kit after the
project has been closed.

Task-number: QTCREATORBUG-17571
Change-Id: Ie4be99a665b072f3c920e3f365f5b20949436850
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-11 08:36:06 +00:00
Eike Ziller
b1f1ccb32e Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
2017-01-11 09:29:37 +01:00
Kimmo Ollila
b76af11d80 Fix 'SFTP upload hangs' issue with Dropbear
This happens at least on Boot2Qt devices with Dropbear SSH.
Handling readChannelFinished() signal fixes the issue.

Task-number: QTCREATORBUG-16158
Change-Id: I7c6660ce3a1bfe6eeb868da5a818c0b92307eda0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-11 08:08:35 +00:00
Tim Jenssen
fa84524c0c QmlDesigner: rename RewriterError -> DocumentMessage
Change-Id: I8cbb1b8b83ec10c33e416de96a09281208be8773
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-10 16:22:23 +00:00
Thomas Hartmann
759db2b7b6 QmlDesigner: Polish error handling for integrated text editor
The integrated text editor requires a couple of fixes and features
in the error handling.

The errors are now handled by the model and not the document management
anymore.
The text editor does not get disabled if there is an error. Instead
we show the error in a status bar.
The form editor is blocked if there is a QML an error and we show the
error message inside the form editor.

Change-Id: I4bfb9b33b09e444ec1de31dd531ce83b32cbcf88
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-10 15:58:36 +00:00
Jarek Kobus
8b67458a95 Prefix editor's uniqueId with plugin name
In this way we minimize the chance of
generating non-unique id.

Change-Id: Idd177c5a4b44b17a58c2a944ec77b9517e91964e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 15:14:19 +00:00
Oswald Buddenhagen
a8230eb6c1 do not report the .pro file itself in ProFileReader::includeFiles()
it's pointless, as no consumer has a legitimate need for it - the
project file is the root of all traversals, and is known by other means.

amends 4148b05e0.

Change-Id: I4df69727e37151b0ecbcd88b2f5ef6e55712172f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 14:49:33 +00:00
Tobias Hunger
624339ea70 qmake: fix missing OTHER_FILES in project tree
... in subdirs projects which actually have any subdirs.

that would happen via this mechanism in QmakeProFileNode::evaluate():
first, IncludedPriFile nodes with proFile = null are created for the
subdirs. subsequently, this tree is enriched by transforming the
reader's included files. that loop iterates over all already created
nodes and tries to match them against included files. at nesting level
one, this would now run into the nodes created for the subdirs. the code
failed to skip over these nodes, and would thus create a bogus node for
the .pro file (as it has the parent null in the mapping of included
files). this node would not be included into the tree due to the loop
prevention in QmakeProFileNode::applyEvaluate() (it obviously had the
same file path as its parent), but at the same time it would catch the
files meant for the root node due to defeating the fallback in
QmakePriFileNode::extractSources().

Task-number: QTCREATORBUG-17473
Change-Id: Ice9f667345148be42297cc21ff0a73058f27cc38
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 14:49:07 +00:00
Vikas Pachdha
acb07875b7 Android: Fix workflow issues in package signing password dialogs
Task-number: QTCREATORBUG-17545
Change-Id: Ide0c322a50455997c7b8fb2350dbdef1d76257c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 11:30:47 +00:00
Vikas Pachdha
1e73c52dd5 Fix compile warning
COMMAND_TIMEOUT is not needed and will not be emitted

Change-Id: Id89aaa8c0b774a962e7a4e813a5b3d3e6a37524d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 11:30:16 +00:00
Vikas Pachdha
6c83981ee6 iOS: Use kill system call instead of shell command
Change-Id: Ic1d327ca2ed83ee91f78434cc1974ec247751483
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 11:30:06 +00:00
Ulf Hermann
eaba6ff660 QmlProfiler: Fix pixmapcachemodel test
Since the cache size is not given for individual file events anymore,
the test should only check it for the events in row 1.

Change-Id: Idfc7ec90ab8da214f4eedce36dd3b84fb00ed553
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-10 10:09:01 +00:00
Ulf Hermann
7477411d71 QmlProfiler: Calculate the model ID in the flame graph model test
... instead of guessing it. This is more robust.

Change-Id: I4855b78da23cb1caefa3a7a95bfa60c5733b32c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-10 10:07:02 +00:00
Friedemann Kleint
c14a24dca1 README.md: Fix slash in LLVM command
Change-Id: I0d69148e1b246ec90365d489b11e1954d0485576
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-10 10:03:51 +00:00
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
Eike Ziller
d3f725f39d QtQuick Wizards: Update available Qt versions
Change-Id: I0546cfd965a450a9844b42a2c5e869dbb3447063
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-09 14:26:58 +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
Robert Loehning
4d79ffb8f3 Squish: Replace progressBarWait() in tst_debug_empty_main
The progress bar already disappears while we're still in Projects mode.

Change-Id: I7dcf24d1d423eba3057868c4323b2054c99d19f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-09 11:56:18 +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