Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
939f19f3e3 Nim: Fix warnings about inconsistent use of override
Change-Id: I73d9c08544b1c0b3fa2bb05189ac0c95b749a038
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-13 09:36:55 +00:00
Christian Kandeler
44c5c6ac58 Add static library for qmake project file parser.
This is needed to build plugins "out of source".

Change-Id: If842cde86e1eb54daa3daf7f9d6f27751f657d9e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-13 09:34:10 +00:00
Christian Kandeler
f085cb2236 qbs build: More steps toward creating a "development installation".
Namely:
    - Install header files.
    - Install imports and modules.
    - Create modules from products and install them.

This is most of what we need. The main thing still left to do is
dealing with paths in Export items. These have to be translated
somehow. (Currently we only copy the Depends items out of the
Export items and ignore everything else.)

Change-Id: I12d49fa31d1c1e05bc77a0e0ce3ec9c78c27192a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-13 08:36:26 +00:00
hjk
44771d245b Utils: Remove now unused type-unsafe TreeItem child iteration
Change-Id: I128b2230e58c5a84ff9c018978ff31fc02171771
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-13 07:38:32 +00:00
hjk
6cd4d682b3 Debugger: Make the BreakHandler a LeveledTreeModel
Change-Id: Idcf61d63318b8a1ab768b298f1b789de13ed91b2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-13 06:55:01 +00:00
Orgad Shaneh
517dd9ae43 TextEditor: Remove dead code
Change-Id: Id2211d3f1f34a25ce2d9dc466fbac46850a70f1e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-13 05:08:41 +00:00
David Schulz
9bacb3e33e Editor: Highlight automatically inserted text
Keep the highlight as long as the cursor is directly behind the closing
character and the editor is the focus widget.

Change-Id: Ic1d4bac263e9d2f395791dad7ecdceb9d69635c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-06-13 05:08:07 +00:00
Thomas Hartmann
6a2e9a1f06 QmlDesigner: Allow alias properties as dynamic properties
Change-Id: Ifd6c6b01eee67de7d1de94b035a8b73901a9cefc
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-10 15:28:10 +00:00
Tim Jenssen
0a67076ef4 QmlDesigner: remove unused code
Change-Id: I4c888f69d3bedc510f0f0a9f67d96caf17c4bcee
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-06-10 14:31:45 +00:00
Thomas Hartmann
178d12280b QmlDesigner: Fix combo boxes in connection editor
Change-Id: I6b7cab45268d726edea64d502cf16b8c6207a05a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-10 14:26:22 +00:00
Thomas Hartmann
184a9d1544 QmlDesigner: Hide items in the item library which are not a QtQuick.Item
Typically this is the result of a bug in the QML code model.
There is no reason to show those items in the library.

Once we start support pure QObjects we can add a flag to the .metainfo
file which shows pure QObjects.

Change-Id: Id3688ff23161a410dde421406eada3be4982151e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-10 14:24:18 +00:00
BogDan Vatra
26dd602785 Don't show wait cursor when doing lots of fast operations
Change-Id: I430530d78cadb09a2445ad146a7c644414e64587
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-10 14:10:18 +00:00
hjk
bf3c3d4ff8 ProjectExplorer: Use LeveledTreeModel for ToolChainModel
More typesafety. This also reveals recently introduced mis-counting
of levels.

Change-Id: I8d90bab57c7122ca08ec2980f4a35fd80db802b3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-10 14:09:42 +00:00
hjk
164b8acf41 ProjectExplorer: Use LeveledTreeModel for KitModel
More typesafety, more compact code.

Change-Id: I7da6925d4dd04a84d2b8a305217ba87f622d8edc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-10 14:09:33 +00:00
hjk
b8b56659ed CMake: Use a LeveledTreeModel for settings page
Change-Id: I4ff30c260f7b106f65f070d83f929e901ec287d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-10 12:56:50 +00:00
Eike Ziller
42f81503ac QmlProfiler: Fix warnings
Change-Id: I028261a7ceb876e48e6947d518fb5dae0fdcd7d3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-06-10 12:53:18 +00:00
hjk
639b372b3e CMake: Prevent creation of duplicated entries on apply()
Hitting 'apply' after adding a custom cmake in the setting
duplicated the entry.

Change-Id: Ibfaf35b4c9b44d98e90b812269c464da2019cea1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-10 12:48:22 +00:00
Ulf Hermann
5101a504b3 QmlProfiler: Clean up statistics view
Fix some misnomers and remove an unused declaration.

Change-Id: Ia5e30ccc7c465a10c5214b7fe025aa0f578cdab4
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 12:43:33 +00:00
Ulf Hermann
b326060da8 QmlProfiler: Add tests for QmlNote
Change-Id: Ida4a3ad0adf59d9c21d6405ea6dcbfea5d41ba71
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 12:43:28 +00:00
Ulf Hermann
f9dcf28921 QmlProfiler: Add tests for QmlEventType
Change-Id: Id2ee8250c0e89637733a1454de4a60df42612904
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 12:43:14 +00:00
Ulf Hermann
69832a22d3 QmlProfiler: Move qHash and operator== for QmlEventType
It makes more sense to have them in the same location as the actual
type.

Change-Id: Ia27970173d14cfe361d4fc007cb461f788350b21
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 12:43:10 +00:00
Ulf Hermann
e10bc709bc QmlProfiler: Provide a sane ctor for QmlEventType and use it
... in turn, make its members private, so that we don't accidentally
change them.

Change-Id: Ibc65b406ee341d33f69647ed1b19e1e34f5cd535
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 12:43:05 +00:00
hjk
5718f12af5 Qbs: Fix build after build step factory changes
Change-Id: I1706bb886cdf224be6c81f212201ff317b7912e6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-10 12:14:16 +00:00
Thomas Hartmann
ea19d8b56b QmlDesigner: Fix crash in tests
This is a behaivour change and the crash seemes to be never
triggered by application code.

Change-Id: I25d986139c47fd1acd0989220942e6e7ec69ef5d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-10 11:57:49 +00:00
Thomas Hartmann
568e80b591 QmlDesigner: get tests compiling and running
105 passing, 1 failing, one test seems flaky
I skip many nodeinstance/puppet related tests,
because the tests/test framework cannot deal with the qml2puppet/emulation
layer being out of process.

Change-Id: I5b254c7e6e944b8fbd8ba490c1e8bb43d0eb38c3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-10 11:57:06 +00:00
BogDan Vatra
ec80aa80bd Android: Skip empty lines
Otherwise AndroidConfig::connectedDevices will return unexisting devices.

Change-Id: I85e87ff48784bfeb37b591507408ace2656b08dc
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-10 10:39:36 +00:00
hjk
519cc8ded6 ProjectExplorer: De-duplicate code in IBuildStepFactory derived classes
This removes 900 lines of duplicated code, some duplicated checks at
runtime and some (minor) quadratic behavior when gathering display names.

canClone(), canRestore() and canCreate() and restore() use the same
pattern. Handle that on the core side once. Leave retore() virtual to let
the ios code unmodified (which is likely not needed, later...). Introduce
'Unclonable' and 'Uncreatable' flags to keep Android package installation
and WinRT deployment (non-)functionality unchanged.

Change-Id: I0325479aff818a4038b2f241ca733b8d8cd66f2f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-10 10:34:51 +00:00
BogDan Vatra
4ce0494284 Android: Fix adbShellAmNeedsQuotes
Regressions was introduced by ddefe062c7

Change-Id: I0bc3f75b788472db78998c32d0007d4250a62f5a
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-10 10:19:49 +00:00
BogDan Vatra
19b513c7a2 Android: Initialize m_handShakeMethod
Change-Id: I016c98669c7a361e0d4a6c0da0cba8e3b8feccf6
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-10 10:19:42 +00:00
hjk
90137a54c4 FakeVim: Parse <AltGr>
Change-Id: Ib8412b02b2cf7b82b34bbdbae10560b6f8dd34e2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Lukas Holecek <hluk@email.cz>
2016-06-10 09:52:20 +00:00
Ulf Hermann
ebab4eb406 QmlProfiler: Remove references to binding types
They don't exist anymore.

Change-Id: Id8650dbba15e90f7cd4c485471792bfc8f40674f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 09:13:36 +00:00
Ulf Hermann
7be3713bde QmlProfiler: Drop some useless QVariant ctors
Change-Id: Iadaa9378536cbf3fdc96ea7f7b9cd61b71f1d75e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 09:03:31 +00:00
Ulf Hermann
52ee1141a8 QmlProfiler: Make members of QmlNote private
The only member that can change after initialization is the text.

Change-Id: I6958f510e67c9fd6fe1f109c2676f80d93e7fd0c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 09:03:08 +00:00
Ulf Hermann
0c0cb4b043 QmlProfiler: Add tests for QmlEventLocation
Change-Id: I3d35c87f194e298a57d361053ad5a35efedd67dd
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 09:02:44 +00:00
Ulf Hermann
472745fb2e QmlProfiler: Make members of QmlEventLocation private
You should not change them independently as that is error-prone.

Change-Id: I07890a29b045492fe804b9537094dea763bc1b8d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 09:02:37 +00:00
Ulf Hermann
a41593c395 QmlProfiler: Run flamegraph view context menu test on a timer
Apparently the popup window is not automatically activated.

Change-Id: I12e952568630d5ffe5d5dab9012b617a28ef9285
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-06-10 09:02:22 +00:00
Ulf Hermann
98207ae020 QmlProfiler: Give test processes some more time to start and stop
Change-Id: I144ee2201feba2d635d1b8af4f6afac78aecdf3a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-06-10 08:55:11 +00:00
Alessandro Portale
fd3d5d30d8 TextEditor: drawFoldingMarker fixes
- Correct marker position for QFusionStyle
- Don't repeat the "s->metaObject()->className()" call
- Re-use existing triangle drawing code for OxygenStyle

Change-Id: Ie203571a9053e115ab51ea9bdbf1b7376951e771
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-10 08:29:18 +00:00
Alessandro Portale
bc5071df93 TextEditor: Simplified "Collapse" rectangle
The original implementation had several issues with HighDPI.
Also, the gradient looked a bit dated in the now flatter UI.

Let's just fill a rectangle.

Change-Id: I80c3d5f1f8be89e81ea07113a691e69b01ec6272
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-10 08:29:00 +00:00
hjk
d88e75ea9a Debugger: Fix thinko to avoid accumulating outdated items
Only first level items (.local, .watch, ...) are meant to stay,
so all items below the first level needs to get the outdated
marker, not items below the second level.

Change-Id: I78097905fce1898e16f297982eec5974b2465b0c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-06-10 07:37:03 +00:00
hjk
e2ba0aca9b Utils: Introduce a class template TypedTreeItem
For better typesafety on the user side (and optional) for items with uniformly
typed children.  Use it for UniformTreeModels, and consequently WatchModel
to get rid of some of the static_casts there.

Change-Id: Ic20e507036e180c24997b236230f0f71b285202c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-10 06:56:55 +00:00
Marco Bubke
a823caa396 TextEditor: Improve speed of hash function for font settings
The size of the array is fixed so we can simply use the memory patter as
a hash value.

Change-Id: If86a58b111a07b2bd9cecc12a03d74b93a914159
Task-number: QTCREATORBUG-16419
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-10 06:27:19 +00:00
hjk
57042da683 Utils: Introduce a UniformTreeModel::itemForIndex function
In uniform trees the type of the items is fixed and known,
no need for user code to cast around.

Change-Id: Id20e507036e180c24997b236230f0f71b285202c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-06-09 13:37:59 +00:00
Christian Stenger
e4ff33e622 AutoTest: Move function into framework related class
TestTreeModel::testCaseNamesForFiles() is a helper that is currently
needed only for handling the Qt test framework.
Move it down into Qt framework's helper class and make it static.

Change-Id: I03c377a76402593584870cbbdaa4621d19278443
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-09 11:52:19 +00:00
Christian Stenger
5ef85949a8 AutoTest: Add test frame work handling
Mainly a preparation for enabling/disabling test frame works.

Change-Id: I0bbea7e055a607517ef8193587c229cadf0de027
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-06-09 11:50:26 +00:00
Eike Ziller
1681066c37 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/debugger/watchdata.cpp
	src/plugins/debugger/watchdata.h
	src/shared/qbs

Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32
2016-06-09 12:07:01 +02:00
Erik Verbruggen
ae7e03d51f Fix compilation.
There is no + operator that takes a QByteArray and a QString (or vice
versa).

Change-Id: I8734923cbbb0360bc20f9775d57801803782716f
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-09 09:47:15 +00:00
David Schulz
a9066f30f0 Debugger: Display error when debugger ABI doesn't match toolchain ABI.
Currently restricting the ABI check to desktop devices, may be extended
to all device types.

Change-Id: I90df4b35bda5b6c59dc8b057994b23b0ae8a49d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-09 08:29:09 +00:00
Nikita Baryshnikov
15ea5aa7fe QmlDesigner: do not activate qml mode
for QWidget ui files

Change-Id: I4876235caa2d2d2da818ec6fa798666c5adc1456
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-06-09 08:24:34 +00:00
Orgad Shaneh
e043741fe8 Git: Enable buttons by default on commit actions
Do not wait until the commit description appears. If the commit is
invalid, disable the buttons.

Change-Id: If9d28ae742433f453f4147af46dec81cbef902c4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-09 08:23:09 +00:00