Commit Graph

44349 Commits

Author SHA1 Message Date
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
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
Tobias Hunger
be52000061 ProjectTree: Polish
Change-Id: Ib5c2af6385c8655c0e3ba8996edfc1d4c0640874
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 15:09:38 +00:00
Tobias Hunger
94c33d95ed ProjectNodes: Remove recursiveFileNode
Change-Id: Ibde61428517b187c84eca9293b17f8f665fb38ae
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 14:45:03 +00:00
hjk
42c68ad7b5 Debugger: Remove libUtils dependency from some tests
libUtils nowadays depends on Qt Declarative, which is not necessarily
present in pure test setups.

Change-Id: I8c40d086186ccf047c034345126f088f53652dbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-10 12:15:17 +00:00
Orgad Shaneh
4136e36c6f Algorithm: Add a member variant for transform
Change-Id: I329ee764cc13dd8b794c6769a2baf2f41d6a9983
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-10 11:37:03 +00:00
Orgad Shaneh
278f9bf993 Merge "Merge remote-tracking branch 'origin/master' into 4.3" into 4.3 2017-03-10 10:17:22 +00:00
Robert Loehning
5f95b61b2b qmljs: Remove dead code
Change-Id: I2b9cdf9960a28c952905e11332f029e1503850ce
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2017-03-10 10:00:58 +00:00
Orgad Shaneh
b14886cb94 Merge remote-tracking branch 'origin/master' into 4.3
Change-Id: Iab55f10105f1eced67ea74cfadf10f95b3c29b97
2017-03-10 11:03:58 +02:00
Nikolai Kosjar
5455a45784 Clang: Compile against llvm/clang 4.0
Task-number: QTCREATORBUG-17692
Change-Id: I2781129543c09aa64938c9570896d592b57a753c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:48:45 +00:00
Nikolai Kosjar
f6e75c43d1 ProjectExplorer: Use default text when cloning build/run configuration
Change-Id: I520d1120b1f17522601e628eb2588eb2d0aee074
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-10 08:48:10 +00:00
Montel Laurent
c343290f63 Add spacer between widget and dialogbox button in filternamedialog
So layout is ok when we resize dialog

Change-Id: I15c338bfb48e4fa3500e4a2d3ebe85d227586c76
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2017-03-10 08:43:10 +00:00
Thomas Hartmann
0822065ed2 QmlDesigner: Fix crash
Change-Id: I3cee292d9567877fb159985dbf837f61ecb83baa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:25:01 +00:00
Thomas Hartmann
ee403cb013 QmlDesigner: Hardcode hints for SwipeView
the hints will be added to Qt 5.10.

Change-Id: I5e9ee09c99376e69c2890923834ee6b4141e48e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:24:51 +00:00
Thomas Hartmann
23d9d05d2c QmlDesigner: Only allow adding TabBar if import is present
Change-Id: Ie6128870943ce3769b7f93ef4cd098fdb331a288
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-10 08:16:32 +00:00
David Schulz
5458edc32f Debugger: Add a deploy python target to the cdb extension project file
Change-Id: I35297633d0703a0132e1632fbbc65368a2279f29
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-10 06:36:14 +00:00
Andre Hartmann
209cc21434 Git: Add input validation to RemoteAdditionDialog
Use FancyLineEdits to indicate invalid inputs for
remote names and URLs.

For remote names:
* Check for duplicate remote names and indicate these
* Remove invalid chars during input

For remote URLs:
* Check if the input matches a valid URL or
  existing local directory

Task-number: QTCREATORBUG-15998
Change-Id: I224e669f16e34e2cd3d075c602b431ce5bbdd391
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 22:03:05 +00:00
Andre Hartmann
b0ac6435b3 Git: Add new class GitRemote
Allows to split a remote URL and performs
some validation checks on the elements.

Change-Id: I048373076b1a1553fdd7bed2986a41cc087138b0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 22:02:30 +00:00
Andre Hartmann
6e7d2a4001 GerritServer: Using namespace Git::Internal
Change-Id: Ibce01855a8dcc2ca9dd3ca0a91b062508d42907c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 22:00:56 +00:00
Robert Loehning
f4c0c78002 Revert "VCSBaseEditorParameterWidget::mapSetting cope with 0 pointer"
This reverts commit b5ce5e9086
because the check already happened two lines before.

Change-Id: Ic230fe767c22dc4747a4ceecedd68fc09c99267b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-09 17:37:11 +00:00
Tim Jenssen
1a822b98ed Theme: remove unused variant map
Change-Id: I33f6418b476f94e7e862bc7f155f9b4242d5f287
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-09 17:20:49 +00:00
Tim Jenssen
1de5bbd378 QmlDesigner: introduce a real Theme class
- rename Theming -> Theme
 - made derived colors as Q_INVOKABLE methods available
 - rename registerIconProvider -> setupTheme
 - inside *.qml files use a singleton import instead of a context

Before this change, every request for a theme value copied the map into the
Qml context including the convert of values QVariant -> QJSString

Change-Id: I1c483fb591336b519d5adab8ad37b42bc5a06720
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-09 17:20:36 +00:00
Tim Jenssen
e6e71e385e Theme: enable inheritance without private knowledge
Change-Id: Id0ff90a92964fb213db50d11df832333cfb56716
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-03-09 17:20:16 +00:00
Serhii Moroz
0e4b233685 RemoteFilterOptions: Add ability to re-order items in the list widget
Change-Id: Iada4b63f13ba1e6875b414eb6ee710209b0b75df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-09 15:38:10 +00:00