Commit Graph

55184 Commits

Author SHA1 Message Date
David Schulz
20e67865ea CodeAssist: Store processor state in specialized objects
Change-Id: I19de64b948599c833496ab8caabf3eaafc845658
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-19 05:52:21 +00:00
Eike Ziller
dfd2dcb156 Add Collapse All action to context menu of file system view
Task-number: QTCREATORBUG-19212
Change-Id: Ia8771a27dbcf77c956f013ed001c7890d6fe6e9a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-18 15:12:32 +00:00
Thomas Hartmann
750df6dec5 QmlDesigner: Rename Keyframes to KeyframeGroup
Change-Id: Ib43d892a3319a0c5ef700147b245e2ba5d3a593b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-18 14:53:42 +00:00
Tobias Hunger
f406950ef5 ProjectExplorer: Add toHtml(QList<Task>) and use that in kit.cpp
This makes the code more reusable.

Change-Id: I1b2eebf8673a4a08a2a87a1e9ff1ac845a091467
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-18 14:35:32 +00:00
Tobias Hunger
c77af6bdf3 ProjectExplorer: Only warn about missing compilers
Not having a compiler defined in a kit is fine for e.g. Python
projects or QML projects. So only warn in that case.

Change-Id: Ic2bc30f8b70c804780b65e11915d1f231011a55c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-18 14:35:25 +00:00
Christian Stenger
cc0c7f2ccd Squish: Fix provided test settings for macOS
Change-Id: Idec36e178d448015efa6d0ff73a4d17eba6ba76e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-18 11:57:20 +00:00
Tim Jenssen
c087c4d5a9 fix windows build
A header only file should not use any export macro.

Change-Id: Ia081b9227041cd59de7c0c5c656ad3fc57ac04cc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-18 11:53:55 +00:00
Eike Ziller
0f090890a9 Disable help search widget while indexing documentation
If you try to search while indexing, in the best case you'd get
incomplete results (though with a warning that that is the case), and in
the worst case it crashes because of QTBUG-66816. So just disable the
search widget with info and progress indicator in that case.

Task-number: QTCREATORBUG-20295
Change-Id: Ibec602b1bc0e98f6fef029c6f10c0cdc5197294c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-18 11:11:50 +00:00
Eike Ziller
3309ed8783 Android: Add 'inline' to static function in header
Clang complains with a warning otherwise

Change-Id: Ia833529e4c37bb8c68d5445a04a7602481571a95
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-04-18 11:11:22 +00:00
Robert Loehning
bb0358cc68 Squish: Add expected error message for MSVC2015
Change-Id: Id1ace17486af21c4c0786859178c3a82d6e05145
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-18 05:49:28 +00:00
Nikolai Kosjar
29110b68f7 Clang: Fix qbs build for libtooling components
Change-Id: I320e23ffd8a244a7582b9d4115f6c8616ba44022
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-17 14:25:00 +00:00
Christian Kandeler
c6cd9e8fbe Qbs run config: Run executable from installed location, if possible
It's been like that for a long time, but the behavior was inadvertantly
changed in a recent refactoring.

Change-Id: I2f301c995c1f9bb235718e02326c4c64dea91694
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-17 14:14:24 +00:00
Ulf Hermann
780d4c6a43 Timeline: Move modelId generation into aggregator
The way the notes model works requires every timeline model to have a
different ID. Conversely no other kind of model actually needs an ID.
Therefore it makes sense to have the TimelineModelAggregator manage the
IDs as every timeline model will sooner or later be associated with an
aggregator.

Change-Id: Ib8b2c88ed883351d4e3e156dd13e1dd113c21808
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 14:11:51 +00:00
Ulf Hermann
181ad6671c QmlProfiler: Add some missing override
Change-Id: I79930e6166617d1635d08dade47390ca5ee27268
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 13:19:41 +00:00
Ulf Hermann
7f7fe1a9db QmlProfiler: Avoid some 0 as nullptr warnings
Change-Id: I4763a22c6624eaffbb583bf26bf74a3e282b042f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 13:19:30 +00:00
Alessandro Portale
7293e800e1 Iconlister, a tool to create a catalouge of graphical assets
Change-Id: I39d009c41daaa07a61465ee29b3a5be32a32275e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-17 12:46:12 +00:00
Thomas Hartmann
288af3d27f QmlDesigner: Use native text rendering for textfield
Change-Id: I01aea1d0bceeeb5f8942d79d234d674e3173ccfc
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:44 +00:00
Thomas Hartmann
c77ab19ba8 QmlDesigner: restore auxiliary data when file is loaded
Change-Id: Iacf8ef63d8e841a637fadd5eb78ed8facd2cb5c5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:33 +00:00
Thomas Hartmann
963ffb1096 QmlDesigner: Write annotations if file is saved
Change-Id: I729205715493f65b83e2de6f09d3d968187afe7a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:23 +00:00
Thomas Hartmann
e0ce44cc27 QmlDesigner: Remove annotations if auxiliary data is empty
Change-Id: I1692fbafbac747936e1dbb303f306bef311ca5f8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:13 +00:00
Thomas Hartmann
cedd104009 QmlDesigner: Slightly increase font size on high DPI displays
Change-Id: I8ed2bd45217aa5ff41768048f5fa6627a5895f4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2018-04-17 12:30:46 +00:00
Ulf Hermann
dcd8d37f35 QmlProfiler: Don't expose the vector of event types
We always want either the total number of event types or one specific
type. There is no need to expose the fact that we keep them as a vector.

Also, use int as the type of the "number" methods as that aligns better
with Qt containers, and rename the methods. We don't need to state the
fact that we've loaded the events and types at some point.

Change-Id: Iaf680ec9fa10e1070ddee6bcc079800e401775f0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 12:20:57 +00:00
Ulf Hermann
7ca958fa85 QmlProfiler: Integrate TraceTime into ModelManager
We never use it independently and only a subset of its interface needs
to be public.

Change-Id: I97bbc638270bcbb8fb1a4097fcfeacf37e96c048
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 12:17:23 +00:00
Ulf Hermann
507c2d6b5b Move parts of QmlEvent and QmlEventType to timeline
Timeline will become a generic trace handling library. It needs some
abstract concept of events and event types.

Move operator== and operator!= for QmlEvent into the test as we don't
use them anywhere else.

Move the operators for QmlEventType to QmlProfilerTraceClient. We want
to get rid of the hash there as soon as we can assume that no
application we want to profile doesn't support server type IDs.

Change-Id: Icde4e3e7634e387171dc1d8bef7bbe8e71684a1a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 12:15:38 +00:00
Robert Loehning
3eeaf965e8 Squish: Fix property name in tst_WELP03
Squish 6.2 still accepts both property
names but Squish 6.3 is more strict.

Change-Id: I390af974425242d1f766853b80870dcb1948ef92
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-17 11:57:39 +00:00
Christian Stenger
d21c508b0a Squish: Remove dead code
Change-Id: Ic24c9db0b923409026d92b87b246694dde8968db
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-17 11:52:48 +00:00
Thomas Hartmann
5c8c208f26 QmlDesigner: Add a couple of new theme colors
Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-17 10:34:13 +00:00
Ulf Hermann
32c54dfdac QmlProfiler: Fix some number conversion issues
Qt containers have int as size type, while std containers have size_t.
We can use auto and decltype to deal with this. Also, memcpy and malloc
expect size_t, not int.

Change-Id: Id2942d14978c8a15f72967962d551ddb20905471
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 09:24:08 +00:00
Ulf Hermann
e0ba6f91ce Timeline: Add stash() and restore() methods to notes model
Those are needed when manipulating the model in a way that may change
the indices, like restricting to a range or filtering by categories.

Change-Id: I9f218d269cf23104c306960ef77c0fc41591daa1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 09:14:09 +00:00
Ulf Hermann
1ccd058bdf QmlProfiler: Get rid of processing step
The child models are made aware of possible changes in the details
strings, and in turn, we can do the finalization immediately after
acquiring is done.

Change-Id: Ibe57f158e64e5d01d4c97aa617c9b2bcc8e4e96e
Task-number: QTCREATORBUG-20106
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 09:13:04 +00:00
Tim Jenssen
72e0a6fec5 Revert "QmlDesigner: remove testing code"
This reverts commit b3a92fc58e.
If this is missing some general actions in the selection tab
have an empty clickable icon area then.

Change-Id: I143cc7c4d0e2ac11959ddd3c3a58154e4cb0cb3f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-17 09:10:06 +00:00
Ulf Hermann
e0cab79965 QmlProfiler: Clean up type selection in statistics model
The statistics have one extra valid event type: "Main Program". This
should not be mapped to typeId -1, as -1 is the invalid typeId. Map it
instead to std::numeric_limits<int>::max() and remove all the hacks
around it.

Additionally, optimize the selection algorithm for the statistics main
view: We don't need to iterate all types to select one. We can rather
use the fact that the row numbers in the source model match the type
indices (except for the two special ones).

Change-Id: I7c4dc4f84fd167f9a21c418466ad2bfce56e441f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 09:09:32 +00:00
Eike Ziller
858a178294 Merge "Merge remote-tracking branch 'origin/4.6'" 2018-04-17 09:09:20 +00:00
Eike Ziller
d751427326 Add first changes file for 4.6.1
Change-Id: Id708d396cfbd285b96f07a1cb4f0b95029879ec8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-04-17 08:58:58 +00:00
Tobias Hunger
fefce829ad Qmake: Invalidate contents of QmakeVfs on target change
Task-number: QTCREATORBUG-20113
Change-Id: I13cd3749a942cc06172dd63f163bff88490a44ed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-17 08:35:23 +00:00
Eike Ziller
185fe0c705 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/plugins/android/androidrunnable.h
	src/plugins/android/androidrunner.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
	src/plugins/qmakeprojectmanager/qmakeproject.cpp
	src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp

Change-Id: I68093d44cfd672347eab82459ff70c21a32297ce
2018-04-17 10:09:35 +02:00
hjk
962e980baf WinRT: Introduce a custom UninstallAfterStopAspect
... to handle the remaning bool settings in the RunConfiguration.

Change-Id: Icf5c0994860793c69ebb182fb7a0e15b7245c4ad
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-17 07:59:05 +00:00
Christian Stenger
32a219f5c1 AutoTest: Fix check state handling for filtering
Changing (gtest) filters can result in inconsistent
check states up to the root item.
This patch makes the check states consistent again.

Change-Id: I83b146c8859a352892945312ee2fd183699fc79c
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-17 07:00:38 +00:00
Vikas Pachdha
9a946decc3 Android: Give preference to detected deploy errors
Task-number: QTCREATORBUG-17414
Change-Id: I35171dc8649c9ecd790a1a508ccc3d4f690ee67b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 05:02:46 +00:00
Christian Stenger
8771054060 Squish: Check also for expected clang on macOS
Change-Id: I32d7f5ebf02a559ca854553536874c6ec68f0ec5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-17 04:55:48 +00:00
Tobias Hunger
ca97be6a13 Abi: Add xtensa architecture
Also add an "rtos" OS flavor to baremetal, which is popular with xtensa.

Task-number: QTCREATORBUG-20147
Change-Id: Id4d22ebfc59f123a76dc3de898c7c57bb3be8a38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-16 14:20:35 +00:00
Ulf Hermann
b135306d9f QmlProfiler: Remove now-unused members from statistics
Change-Id: Ibf56f405dc51a82d0f56ab300905b1137375d5c0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-16 14:16:03 +00:00
Robert Loehning
fdc4ac41d9 Squish: Replace Qt 5.3 kit with Qt 5.10
This patch just changes the minimum for replacing the kits while
keeping the tests running. Further updates to the tests should
be done in separate patches.

Task-number: QTCREATORBUG-19440
Change-Id: I25ce60ad0a47678dba4352a4b2601ca1cdd4741d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-16 14:15:11 +00:00
Ulf Hermann
4aa432bb9a QmlProfiler: Eliminate QStandardItemModel from statistics
This resolves the data duplication between model manager and statistics
models, that gets in the way of updating the details strings on the fly.

Task-number: QTCREATORBUG-20106
Change-Id: I1c4881f903402dff936267de03b84d05ab7c39ca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-16 13:35:44 +00:00
Ulf Hermann
495b9aa9c2 QmlProfiler: Make statistics models QAbstractItemModels
This way we will be able to replace the QStandardItemModels in a next
step.

Change-Id: I863fde958d29c8bf8c36aa1f501cb1224720ad7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-16 13:35:33 +00:00
Eike Ziller
42386dbdbc QmlDesigner/ShortcutManager: Cleanup
Remove some unneeded 0-parents, use nullptr, and do not use parameter
actions when they are not needed.

Change-Id: Ia556f83f7f1ce296fc08fa76cced7f41102d110f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-16 13:12:19 +00:00
Eike Ziller
c00c4fc9c2 QmlDesigner: Do not access clipboard if not requested to by user
QClipboard documentation states for X11:

"Lastly, the X11 clipboard is event driven, i.e. the clipboard will not
function properly if the event loop is not running. Similarly, it is
recommended that the contents of the clipboard are stored or retrieved
in direct response to user-input events, e.g. mouse button or key
presses and releases. You should not store or retrieve the clipboard
contents in response to timer or non-user-input events."

So do not request the clipboard data when the QClipboard signals that
the data has changed, because that locks up if the application providing
the data is unresponsive.

Task-number: QTCREATORBUG-20262
Change-Id: Ifd10150e1de62c8153ab2bb93a3e953a36fb243a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-16 13:11:47 +00:00
Ulf Hermann
17d530d60d Make sure we always quote the qmldebug command line arguments
Change-Id: I5ce68c238e0ab05d19715659a9cc2161e51e1a7e
Task-number: QTCREATORBUG-20260
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-16 13:08:45 +00:00
hjk
e50b3c1412 DesktopQmakeRunConfiguration: Remove unused signals
Previously used to signal changes to the run configuration widget,
now handled by the aspects internally.

Change-Id: I10936610037c9df0469f3d6a66a8a3e8609b50a5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-16 13:01:50 +00:00
Tobias Hunger
fa11070977 QMake: Make signalling of parsing state more robust
Move the emitParsingStarted into a location that is called
from both methods that had it before.

Also add an QTC_ASSERT into incrementPending, which is
triggered by the qmake parsing code directly. If something went
wrong before, then the signal will be sent anyway and in the
right sequence -- although the start signal is a bit late at
that point.

Task-number: QTCREATORBUG-20203
Change-Id: I64611e471d1e4959d5cfe0118223594a04238433
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-16 12:43:39 +00:00