Commit Graph

50929 Commits

Author SHA1 Message Date
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
Oswald Buddenhagen
8e631c9b26 make fixnavi actually work with examples
we reference examples by title, not by file name (as it's unknowable).

Change-Id: I24e2a543138b77e8c6ea60e2aca49ba057c13273
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-03-13 12:27:08 +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
Christian Stenger
afbbb65e6b Squish: Fix suite_WELP
Change-Id: I3592f62fa1815d3c7bbd3a6433405bfec0ee020b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-13 11:49:05 +00:00
Ulf Hermann
cb63af70bc QmlDebugger: Allow functions and scripts to be specified as strings
For some of those it doesn't make much sense to assign a ref and the
refs are not stable anyway.

Change-Id: I7b6855225f883b93930b8d501495ef9dd62be7a2
Reviewed-by: hjk <hjk@qt.io>
2017-03-13 08:46:55 +00:00
Nikolai Kosjar
a76474f5c5 ProjectExplorer: Evaluate -mfloat-abi for macros
The option -mfloat-abi sets macros (in this case __ARM_PCS_VFP), so it
should be evaluated while determining the macros for the code model and
the clang static analyzer.

Task-number: QTCREATORBUG-17797
Change-Id: I22a72d31956521b7e2ad7c1126036b25cfe0898d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-13 08:25:36 +00:00
Orgad Shaneh
dbe77890cd Gerrit: Minor cleanup
Change-Id: I7bfa74053c41c68b956929b73a9b50bf77cbf6e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-13 07:43:42 +00:00
Orgad Shaneh
f9b556621c Gerrit: Store username provided by the user
Change-Id: I72163d974e744211da4c442c474611390f5d3111
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-13 05:55:38 +00:00
Orgad Shaneh
f71971323e Gerrit: Fix host/port resolving
Broke by b0ac6435b3.

Change-Id: I66f9c598b5e7466b93857cb19c40d1d6c796793a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-13 05:55:20 +00:00
Tobias Hunger
d08cbf6641 CMake: Fix empty display name when opening project
Change-Id: Id89177f6502c7f4f8bb121acefe3f3efca82828f
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:40 +00:00
Tobias Hunger
86fde306d1 CMake: Get better FileType in servermode reader
Change-Id: I8713043a625b17532ab33a72867aa0a20aa4cb3c
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:35 +00:00
Tobias Hunger
a70370cc04 ProjectNodes: Add method to query FileType
Add methods to get the FileType based on filepath or mimetype.

Use that method in treescanner.

Change-Id: I3de50d7afd8262cc86ae722e7de4ca53921153d2
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:30 +00:00
Tobias Hunger
7648504a30 FolderNode: Remove makeEmpty() again
It is no longer necessary.

Change-Id: Id044ace6f0861bc0fc659fb6d6823da1f0082bc9
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:23 +00:00
Tobias Hunger
3c85c00577 Resources: Register as tree manager
Change-Id: I400c1d77b23e465de7acbc517530f6c080549c5e
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:19 +00:00
hjk
fa67aa084b ProjectExplorer: Return a ProcessHandle for AppLauncher::applicationPID
Change-Id: I00fc4dbd3a3c022006de95087b61a86bbb83faeb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-10 16:44:13 +00:00
Tobias Hunger
c63805668f ProjectTree: Add a way to register managers for subtrees
Change-Id: I4694bb7dbe75b67946cdb5d8ca8b5a3ff1e40659
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:07 +00:00
Tobias Hunger
393cb16a20 ResourceTopLevelNode: Simplify use
Change-Id: I1b01e63f219aceb97aaf9acda67d572ad3024eca
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:25:26 +00:00
Tobias Hunger
ab235cfc79 ProjectTree: Do not delay updating the model
Parts of the project tree are switched out now, so there is no need
to delay the updates anymore in case there are more changes going
to happen soon.

Change-Id: I04bdf194fcdd545ba52f8526ee538649178fba1c
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:46 +00:00
Tobias Hunger
50e1df4007 ProjectTree: Make requirements for subtreeChanged more strict
Only accept FolderNodes, those are the only ones that trigger this.

Change-Id: Ia7aefdcb5aa04868458cc4dd4d9b7c28512c711f
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:41 +00:00
Tobias Hunger
d78e0edb5d ProjectNodes: Remove no longer necessary signaling
The project tree is updated in one go now, so there is no need to
signal each and every change.

Change-Id: I7d5829d688b406ee2e701a2aa004b9e8bb5870a9
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:36 +00:00
Tobias Hunger
49fef0ae24 ProjectExplorer: Create initial project tree
Create an initial project tree with a ProjectNode and a FileNode for
the project file itself.

Fix the Projects to not implement their own tree before they have
better data.

Change-Id: I147ccd5603d22d1d60880a97f30fd8c271eac88c
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:31 +00:00
Tobias Hunger
2fde3fffa9 Make all projects generate a fresh project tree
Do not update the existing project tree anymore: Start a fresh one
and throw the old one away.

Change-Id: Ifabe293b6ca668b0672516a6d81acd5346d98fe5
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:26 +00:00
Tobias Hunger
71a5aee36f Session: Update SessionNode when Project tree changes
This moves ownership of the project's root node from the
project into the project tree!

Change-Id: I84eba884bd63b44e56c75023d8bf12caf5cc2833
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:21 +00:00
Christian Kandeler
31ce111727 Embed the qbs documentation also when building with qbs
Task-number: QTCREATORBUG-13124
Change-Id: I214a92a03a6d0fa75c1cceca1909c68add09d2c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-10 15:47:54 +00:00
Tobias Hunger
707990632c Session: Store project and root Project Node
Change-Id: Ie8bdd81e408fa97875b233b3a19811dde5fadff0
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 15:38:45 +00:00
Tobias Hunger
b6234d12e6 ProjectExplorer: Emit signal when root ProjectNode changes
Change-Id: I2bbf2577b1dfbf70e21e05564b4f49c9fb820a8b
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 15:38:22 +00:00
Christian Kandeler
5556bcef87 Update qbs submodule
To HEAD of master branch.

Change-Id: I8bbee786f6944aa4be1bffe6f86596bf56c195dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-10 15:36:27 +00:00
Tobias Hunger
49989d46dc FolderNode: Add isAncesterOf(Node *)
Change-Id: I716593e7fd25f4acc31933e2f28273ced4674b73
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 15:30:46 +00:00
Christian Kandeler
b151e94dea QbsProjectManager: Fix soft asserts
Change-Id: I4efef985bc8bd2652a5ea4d6b54a5d4ee8d4941f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-10 15:20:08 +00:00
Tobias Hunger
5a5a464dfa ProjectNodes: Introduce FolderNode::replaceSubtree
Introduce FolderNode::replaceSubtree incl. necessary signalling

Change-Id: I57762cd24a2986d3a04d0de6b794c1f6c772dbe6
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 15:17:25 +00:00
Thomas Hartmann
4b539cf560 QmlDesigner: Fixing delete action
The delete action should always be visible (not always enabled)
in the toolbar. For this, we have to use the main Qml Designer context.

We react to context changes manually to disable delete, cut, copy
and paste. Those actions should only be available in the formeditor
and navigator.

Change-Id: Ibc3b718c14e787c8451a3e84b679eb37aac814b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 15:17:12 +00:00
hjk
7826ec7ed5 ProjectExplorer: Merge ApplicationLauncher and DeviceApplicationRunner
Treat ApplicationLauncher as a special case of a DeviceApplicationRunner
with an implicit desktop device.

As a first step, lump the two implementations together.

Change-Id: Ifa3ea3f38d320023050378555e2d256e762b6683
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-10 15:14:12 +00:00
Christian Kandeler
5090c2929a QbsProjectManager: Add missing assignment in QbsProductNode constructor
At least the "build product" functionality was broken because of this.

Change-Id: Ia552e53ba783b2b037ce7289d554e4061ed62262
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-10 15:12:09 +00:00