Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
b8417e0f0c CMake: Fix projects with complex CMakeLists.txt layouts
This fixes soft assserts in e.g. Musescore.

Change-Id: I860c8c184161e53918fb901d66b89cffb0c09e23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:22:24 +00:00
Thomas Hartmann
b3238d5736 QmlDesigner: Fix nodeAtTextCursorPositionRekursive()
If the length is -1 then the document is invalid and we should
return an invalid model node.

Change-Id: Id2a329a16617f862a518a3c1f00f9078697d72d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:15:38 +00:00
Thomas Hartmann
73f8308959 QmlDesigner: Only change selection if required
This avoids sending selection changed notifications.

Change-Id: I2303941f388495e98171ef40dce2ee12739f7dcd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 10:15:21 +00:00
hjk
df73d57295 QmlProject: Simplify interface a bit
Remove unneeded code and don't repeately fetch a singleton value.

Change-Id: I718a44c28be7ef8718f813f987f45b32cbcd7ad5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-15 06:57:31 +00:00
Orgad Shaneh
5d1e12faad iOS: Fix compilation
Change-Id: Ieb5357a25240a64c4461325cc7165b68df3e71b9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-03-14 19:49:11 +00:00
Vikas Pachdha
f80808f5e9 iOS: Let user specify developer team and provisioning profile
Task-number: QTCREATORBUG-16936
Change-Id: Ie4a91125f34fbf35cda4e1593919899af5f4cdbb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 17:16:11 +00:00
Vikas Pachdha
7c95aedfd3 iOS: Add API's to get provisioning data
Change-Id: I927b2dbaa9e6c175d90b1407418570bbd2a3d96e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 17:15:57 +00:00
Tobias Hunger
6f0a31166d ToolChains: Write compatibility information for QtC 4.2
This avoids turning all toolchains into C++ when going from Qt Creator 4.3
to Qt Creator 4.2 and back.

Change-Id: I607606f76d958c634ab27cb6db3bf35a1236b2b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 15:56:03 +00:00
Vikas Pachdha
7136162047 add extra arguments for qmake
unlike user arguments, extra arguments are not user editable

Change-Id: I0413c2da699c6d2fce1db10a8bc3dd938c8477b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 15:51:31 +00:00
Orgad Shaneh
5b9eaf747d QbsPM: Add nodes incrementally
Change-Id: Id53a0107df64b26d8ec57eda734635bda9e045f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 15:51:12 +00:00
Tobias Hunger
6815633dff Qbs: Fix build after update to ProjectNodes
Change-Id: Ibb736901596a7295f50059f5dd448a2b5da32e85
Reviewed-by: hjk <hjk@qt.io>
2017-03-14 15:25:00 +00:00
Orgad Shaneh
9804d56009 Nim: Add an explicit include for QRegExp
Other includes will be merged from 4.2. Nim doesn't exist there.

Change-Id: I0d701a07adefe04e730898a219be021ec4e70860
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 14:42:19 +00:00
Orgad Shaneh
cf93b4cc03 Merge "Merge remote-tracking branch 'origin/4.2' into 4.3" into 4.3 2017-03-14 14:42:07 +00:00
Robert Loehning
2d703c7dd4 qmljs/parser: Remove check for impossible value
Change-Id: Ide23dd761016a37ef4720c7637818e20925df7d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 14:25:53 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
2017-03-14 16:20:14 +02:00
Tobias Hunger
2e54c89738 GccToolChain: Remove autodetection for gcc-4.0 and 4.2 on macOS
Change-Id: I64f9533a153d6a2577747f31a422f91ff555351e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-14 13:34:19 +00:00
Orgad Shaneh
11e8ce65db Gerrit: Force remote refreshing on 401 error
Can happen if the password was changed.

Change-Id: If0f0fa047c376c193ceda50e5465d016e16b61a3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 13:02:40 +00:00
Orgad Shaneh
75273506c1 Gerrit: Resolve also user name from gerrit response
If gerrit provides it (version >= 2.10).

Change-Id: I7087be338e954fa13eb4a9fcc4f848d6272a46d6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:35 +00:00
Orgad Shaneh
8795ec0beb Gerrit: Replace single line slots with lambdas
Change-Id: I63c3e963a2aa04043c4da3da6313757b001f568d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:15 +00:00
Orgad Shaneh
db16f265c9 Gerrit: Add a button for server revalidation
Change-Id: I0ef823aa562093e5e3d63bc2766ab1a95ae259d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-14 12:55:10 +00:00
Orgad Shaneh
c1d013437f Gerrit: Persist server details
Avoid repeating connection tests for the same server between runs.

Change-Id: Iecea52af986a708f317878c171d4fcea088cbbde
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:55:04 +00:00
hjk
a6a271881f ProjectExplorer: Inline FolderNode::recursiveFileNodes()
... into its only remaining user.

Change-Id: I5efa716ce34ba6a237dfcbcfebb257c863fdd21d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:33:47 +00:00
hjk
4d8352a6c1 ProjectExplorer: Add a FolderNode::addNestedNode() function
Also, rename buildTree() to addNestedNodes(), it's really
adding things, not recompletely (re-)building the subtree.

Use it whenever possible to avoid intermediate lists of items
to insert.

Change-Id: I5fde41e5b164a8a292410bd381a85f5efadf3471
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 12:26:22 +00:00
Tim Jenssen
7428aa9cec QmlDesigner: fix linking the tests
Change-Id: I8cf37aa48c05c0c67dc0c31373e8365584fb106c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-14 11:58:44 +00:00
Thomas Hartmann
116c92ba8d QmlDesigner: Fix warning
Change-Id: I77f2963957ec0679485e5582b79edd13a57beee9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-14 10:50:19 +00:00
hjk
30b4955ed7 ProjectExplorer: Add a SimpleRunControl implementation
Essentially a RunControl with and ApplicationLauncher member like it is
used directly or in disguise in the LocalApplicationRunControl, Nim and
Python. Extenting that to RemoteLinux/Qnx is possible, but left to the
next patch.

Change-Id: I91b3199d3d6a418fe4e5be7a5d61689c581a5121
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 10:35:37 +00:00
Thomas Hartmann
a116529177 QmlDesigner: Fix performance regression when selecting
The method nodeContainsCursor() is rather slow for huge documents
and we do not really have to call it. Checking if the selected node
does contain the cursor is enough and can be done in constant time.
Since we do this whenever the selection changes this fixes notable slowdown
in huge documents.

Change-Id: Ie525f0fbcacd6abb72f843f59a793c4f82190a0c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 10:31:06 +00:00
Thomas Hartmann
37c0176883 QmlDesigner: Fix nodeAtTextCursorPosition()
The old implementation assumes that the order of nodes
returned by directSubModelNodes() is the order in the QML\
text document. This is not always true if we mix different
node properties.
If we cannot rely on the sorting the algorithm becomes slow.

This fixes selection of delegate items in styles.
e.g.
Button {
   text: Text {
   }
   some children
}

The selection of the Text element did not work in all cases before.

Change-Id: Icf89bdcab4cb9d2a9fe395d1fbf4e961c09e10e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 10:30:54 +00:00
Orgad Shaneh
6f3892bf51 QmlDesigner: Fix tests compilation
Change-Id: I08f1abdfb19a04f83e01afd5917ee97e7d61f9cd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-14 09:11:25 +00:00
Eike Ziller
27cd6125c4 Merge remote-tracking branch 'origin/master' into 4.3
Change-Id: Icec79bee97b5f216c0caa2645cd27e7cb61ad77b
2017-03-14 10:06:35 +01:00
Christian Stenger
8a071a57bd AutoTest: Make some strings translatable
Change-Id: I9cbb3051d5b3d63116c086cbdcdb97992202298e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-14 08:24:21 +00:00
Christian Stenger
5708f3aa34 AutoTest: Handle sub-typed TestCases correctly
Furthermore ensure that TestCase is really the Qml type
to avoid handling self-defined types as Quick Tests.

Task-number: QTCREATORBUG-17787
Change-Id: I08a6c70c3c166eefec6f24669cc225f568e51c7a
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-14 08:24:08 +00:00
Samuel Gaist
4033471aa9 QRegExp include cleanup
This patch adds the missing include statements for QRegExp.

Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-13 22:05:30 +00:00
Orgad Shaneh
e0c6fd334f Gerrit: Remove superfluous title assignment
It's already done in setupUi().

Change-Id: I5f768436f5e374ef252d0ca4086180027e69f75b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-13 19:32:33 +00:00
Robert Loehning
bd9824a45c Debugger: Comment out quasi dead code
Change-Id: I8d7773d911646b05d6343241ae09882b40e861b2
Reviewed-by: hjk <hjk@qt.io>
2017-03-13 17:41:53 +00:00
Robert Loehning
25087b0153 ModelEditor: Fix various warnings
Change-Id: Ibcd95304c2c59dd047481e89ac3162c74b53307b
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-13 16:54:35 +00:00
Tobias Hunger
98505427d3 CMake: forward dirty signal in server-mode
This fixes auto-running cmake on changes to the project files.

Change-Id: I652b48b243b5decb6927b1619c47527af83d7f03
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 16:27:01 +00:00
Tobias Hunger
c05222c8e7 CMake: Trim down on headers
Change-Id: I9a168dfd6eecbe5a4ba9c5c69d5c99e962708024
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 16:26:52 +00:00
James McDonnell
e69c2eb2d5 Make QNX a separate OS type
Limits conflicts with Linux tool chains and debuggers.

Change-Id: Ie6408aecbc2828e8be53c46cf579441ccaba19bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-13 14:32:11 +00:00
Ulf Hermann
f087f36269 Qml Debugger: Raise sanity level to 1
This signals that we understand packages without extra "handles",
that we can deal with only one level of nesting on replies to lookups
and expression evaluations, and that we can understand script and
function names transmitted as plain strings rather than refs.

Change-Id: Iffdd50179b8f9374e2fc8ad3a03cf44fbc627bf1
Task-number: QTBUG-42435
Reviewed-by: hjk <hjk@qt.io>
2017-03-13 13:58:32 +00:00
Eike Ziller
32a098d24d Merge "Merge remote-tracking branch 'origin/4.3'" 2017-03-13 13:54:04 +00:00
Ulf Hermann
fed805d568 QmlDebugger: Limit recursive property lookups
The QML engine will send the number of children in an object as the
"value" property together with the ref. We can use that to determine
if an object has children without actually fetching it.

Also, always save the type of a ref, even if we don't know the value
yet. This avoids redundant lookups.

Task-number: QTBUG-42435
Change-Id: Ia423b661187dc054fb5782349d1256711ee11265
Reviewed-by: hjk <hjk@qt.io>
2017-03-13 13:53:53 +00:00
Eike Ziller
8aed66706e Merge remote-tracking branch 'origin/4.3'
Change-Id: I805dfecf9a385d4c4798049272e19e5b70bc698d
2017-03-13 14:52:56 +01:00
Orgad Shaneh
f441cf57f2 Locator: Expand first column when second one is empty
Useful for the file system filter with long file names, and for the
execute filter with long commands.

Change-Id: I2884f3d3832586ce2576d8537046b2853ca31f09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-13 13:51:27 +00:00
hjk
70578004cb ProjectExplorer: Some code cosmetics
Silence a warning about using a pair by value instead by reference.

Also, remove an unnecessary duplicated check.

Change-Id: Idd5a01cdfcb16dad03389d2f360e0b2dbff21dc8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-13 13:01:28 +00:00
Thomas Hartmann
9f2822a687 QmlDesigner: Improve styling of line edit in form editor
We ignore the theming and always use the form editor
highlight color.
Painting a background to reduce weird artefacts.

Change-Id: Ibb22cab53451bfdba995690944fe0283224dbc3c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 12:09:25 +00:00
Thomas Hartmann
a7a29fa6d6 QmlDesigner: Fix translation functions in QmlObjectNode
Change-Id: Icea185a508319f7f2f7d7d11e41c73043d5b56d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 12:04:40 +00:00
Thomas Hartmann
bf3008292f QmlDesigner: Add support for high dpi to form editor and puppet
We forward the device pixel ratio to the qml2puppet and
render items in higher resolutions.
We have to set the device pixel ratio on the pixmap manually,
since it is not serialized.
The option IgnoreDevicePixelRaio allows disabling high dpi awareness.
Rendering in high dpi affects performance, but since we
use shared memory this does not seem to be a serious issue.

Change-Id: Ie9219b8fdb37841c24d4fb3f0ca259f0194ef65c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 12:04:18 +00:00
Thomas Hartmann
a6985eaa85 QmlDesigner: Disable caching for form editor items
This just wastes memory. We already cache the content in a pixmap.
Anything we render on top is cheap.

Change-Id: Ieecb689aa001ec8948b76c454e0b5217ff20be4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 11:56:52 +00:00
Thomas Hartmann
970510c181 QmlDesigner: Block graphics view update during reset and attach
This reduces/minimizes flickering when reseting the puppet.
With layouts items have the tendency to jump around.
We just block any updates on the view for one second.

Change-Id: I4baa4bca3ed87a233bce41ab20bd25fc7f59fc06
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-13 11:56:45 +00:00