Commit Graph

44349 Commits

Author SHA1 Message Date
Ulf Hermann
55c26025f0 QmlProfiler: Move bindingLoopsDest() into QmlProfilerRangeModel
It's the only class that overrode it.

Change-Id: I15aa8177571e2eda6016e3aa16302fcbe94c3f11
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-14 12:00:15 +00:00
Ulf Hermann
25b9989749 Add wizard and mime type for SCXML
This allows us to easily add scxml files to a qmake project.

Change-Id: I2b5b21683f3e76062e6858fb8d0bceaa699a5569
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-14 11:41:05 +00:00
Nikolai Kosjar
72cf0d4a3b Clang: Fix warning about unused function
Change-Id: I6fe25ae507af5df0d555141b1e067e483592715b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-14 10:48:48 +00:00
Nikolai Kosjar
dd1c664b20 Clang: Increase timeout in test
Might fix a fail on loaded test machines.

Change-Id: Ieb9e8426f760e2257ececa0b53c564d68992c3fa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-14 08:04:16 +00:00
Thomas Hartmann
f30b0cdbbf Remove unused icons from qmleditorwidgets
Change-Id: I80160a6fe8e1ba76b93bf1b9660348d220310c84
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 16:45:21 +00:00
Thomas Hartmann
c44945032d QmlDesigner: Adding icons for property editor to icon provider
Change-Id: I0869138783230fe3ff54e59e4d9094d23f5d42cc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 16:42:39 +00:00
Ulf Hermann
7c4542c43c QmlProfiler: Clean up binding loops render pass
Remove some unreachable code and avoid compile warnings about floating
point precision.

Change-Id: Ie38613a2631e0c3007580778f35009ad47ff00bf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 15:04:13 +00:00
Ulf Hermann
262270251a Timeline: Move scenegraph test runner into libTimeline
It's built only if TESTS == 1. This way we can use it from qmlprofiler
tests, too.

Change-Id: I170af41341c15c388046d843406e6651114c209a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 15:04:04 +00:00
Thomas Hartmann
56d786a492 QmlDesigner: Register icon provider for item library
Change-Id: If40369b88d42cbefffddc0d0d6d9d2d59c346175
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 14:28:11 +00:00
Thomas Hartmann
bb162b5a77 QmlDesigner: Make the IconProvider available anywhere
Now the IconProvider can be used in the property editor.

Change-Id: Iaaa2674e7dc0955d91f7699090340c4646e723a0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 14:26:45 +00:00
Thomas Hartmann
cdcdde4dc1 QmlDesigner: Remove outputpane-style.css
There is no need to style the ouputpane apart from
the scrollbar.

Change-Id: I3dcd98e403dace1de243c0254408c353ebcb3db2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-13 14:23:55 +00:00
Ulf Hermann
468521b062 QmlProfiler: Add test for attach dialog
Change-Id: I040ef23f780e361037386a92444fcf45aded7a3f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 14:00:29 +00:00
Ulf Hermann
6361152de2 QmlProfiler: Add test for animations model
Change-Id: I0227d9c97b2b61d68ae5ed9e3f2f7e3776075338
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 13:59:36 +00:00
Ulf Hermann
b03bdf6302 QmlProfiler: Update QmlNote test
Change-Id: I3735e70429e67dca9b8f02ef13174bef8530abf6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 13:59:05 +00:00
Ulf Hermann
48395b0e43 QmlProfiler: Rename registerProfilerStateManager()
... to follow the convention for setters.

Change-Id: Id471a93a1be1beed0438fed710fa09afa5ee2832
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 13:58:55 +00:00
Nikolai Kosjar
580c7606c4 ClangStaticAnalyzer: Fix analyzing qbs projects on macOS
The system clang on macOS is aware of the header paths, but not our
shipped clang.

Task-number: QTCREATORBUG-15869
Change-Id: Iabb56d9443808be2822a21b48bb111a6a8a8c604
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-13 13:41:01 +00:00
Tobias Hunger
498934cfe8 ProjectExplorer: Add option to stop applications from the same build directory
Creator can stop running applications when a build starts. This prevents isssues
on windows where the running application locks files in the build directory, which
in turn will make the build fail.

In addition to the current options to kill all applications or just those from the
current project, add a new option to kill all applications of the current project
that live in the same build directory.

Task-number: QTCREATORBUG-16470
Change-Id: Ib4a74e2452055eaf5f9e384555be5ef14de1cd40
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-13 13:30:30 +00:00
hjk
3f5e79075e Debugger: Robustify GDB attaching
In some cases GDB output seem to get stuck/not flushed and there is
no proper ^ response in time. Force a flush by running an extra
dummy command afterwards.

Change-Id: I2293dcea0877572a68f37253e60f2a99c03d443f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-13 11:56:03 +00:00
Vikas Pachdha
b023bedfb0 Fix for showInGraphicalShell. The api fails to open a dir if the path contains ..
Change-Id: If38b23563395509c61d9ec2e6b771bf4d2c54527
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-13 09:52:47 +00:00
Vikas Pachdha
148d7636f1 Starting AVD in run step. Before this change AVD was started only in deploy step.
Task-number: QTCREATORBUG-10237
Change-Id: Ic99cc84013e53ddc60ed05c7983e141ecfc75169
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-07-13 09:50:45 +00:00
Eike Ziller
602f8e72be Revert "Revert "Algorithms: Simplify Utils::transform implementation""
This reverts commit 52f1fe7033.
Revert the revert, which was done because we still support
compilation of 4.1 with GCC 4.7, and that crashes with this patch.
For master/4.2 we require GCC 4.8.

Change-Id: Ifd0b8b4641fe3dd658f9bde62b9e4f888d998ee7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-13 06:12:13 +00:00
hjk
6897dfa164 Debugger: Remove 'nopass' on SIGSEGV GDB handler
This has been used since the dawn of time but seems to cause problems
with JVM code.

Task-number: QTCREATORBUG-16565
Change-Id: Iae8a2949671d162f84b9dfe954c8dfbbd743a8de
Reviewed-by: Sandro Mani <manisandro@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-13 06:05:10 +00:00
Thomas Hartmann
0016d54ee3 QmlDesigner.Rewriter: Add QQmlComponent to isComponentType()
The <cpp> prefix is not always there.

Change-Id: Ibf8485c91dc98a02d9f750ac37b787c3eb9de711
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 14:59:13 +00:00
Thomas Hartmann
a5cc7e3c7b QmlDesigner.MetaInfo: Resolve properties using the CppComponentValue
If the type is still "unknown" use the CppComponentValue
to resolve the type.

Change-Id: Ib404faa89a06d93f34189abfc7427122567ff25a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 14:59:08 +00:00
Thomas Hartmann
2cbd4ed0dd QmlDesigner.MetaInfo: fix lazy initialization
The lazy initialization was missing for NodeMetaInfoPrivate::propertyType()

Change-Id: Ic2251df30de2187aea44fe7a48df9e5e0d635ab8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 14:59:01 +00:00
Thomas Hartmann
a017138e58 QmlDesigner: Adding theming support for Qt Quick Designer
With this patch the Qt Quick Designer supports:

*Flat
*Flat Dark
*Flat Light
*Classic

I did not test the dark style.

I added a template engine for the .css files. The syntax for the .css
files
is identical to the QML syntax.

Known issues:
* The icons in the property editor do not play well with the
  Flat Light style. We have to get proper Core:Icon support for the
  icons
  and most icons have to be simplified/flattened to fit the new style/
  theme.
* Some colors in the connection editor are still dark and hardcoded. But
  this looks ok together with all themes.
* The highlight colors are not taken from the theme, yet.

Change-Id: I94f2b75f92db8e131c2b15867dbabe9ae4b2f25a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 14:23:29 +00:00
Christian Stenger
ec77eb6720 ClangStaticAnalyzer: Tests: Exclude <cstdalign> also for libc++
Change-Id: I4104d9ad2b41e0f5e8833f2ba8c94f8b9d38ca63
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-12 13:43:22 +00:00
hjk
e6069d8b03 TreeModel: Introduce a recursive TreeItem::updateAll() function
Useful in cases where e.g. siblings are affected (e.g. font
changes to indicate active items).

Change-Id: Ib2f8018688d00bd682bb6aaff08156f0be04f5dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-12 12:02:03 +00:00
hjk
20ec978b56 TreeModel: Initialize root item with proper type in LeveledTreeModel
Current usage is to use setRootItem() manually when needed, but
since the type is known in a LeveledTreeModel this can be automatic.

Change-Id: I511acdf9b9b3f4b67cf87d07b5446baa329a6a77
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-12 11:57:12 +00:00
Eike Ziller
5f4284e64b Merge remote-tracking branch 'origin/4.1'
Conflicts:
	README.md

Change-Id: I21f96ebb85b8a2b55b4d8066f3c9d4aba5e9b7ee
2016-07-12 13:35:47 +02:00
Christian Stenger
13bdf29688 ClangBackend: Fix compile on OSX
Broke with 2c698dff86.

Change-Id: Ie1d5779ffa23fbb75e882d37813900b003266398
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 10:35:08 +00:00
Thomas Hartmann
2c22cd0e4c QmlDesigner.PropertyEditor: Cleanup imports
Change-Id: I728ba1f8d9095bc31e11f507f11cdadc04e16285
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 10:18:00 +00:00
hjk
1650166552 Debugger: Expand variables and send extra attach commands in one go
No need to split them on the Creator side.

Change-Id: Ie23b12c537a7375b3bfae56a30291e5971e03e81
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-12 09:34:55 +00:00
Marco Bubke
2c698dff86 Clang: Make ConnectionServer adaptable
The server and client are adaptable by template parameter.

Change-Id: Ia28e2863ca73b633689964ea1df6df08f8358ac1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:47 +00:00
Marco Bubke
ae9962c60c Clang: Remove ClangCodeModelClientDispatcher
We always use one client and the dispatching is removing to possibility
of moving commands. Moving the client to IpcServerInterface improves the
code sharing.

Change-Id: I5f102ab7907239572534b7d4c2848abbaade69b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:28 +00:00
Marco Bubke
c5e79f6269 Clang: Decouple ConnectionClient and ClangCodeModel*
We want to reuse the connection client in other plugins. This is the first
step, the next step is refactoring the IPC mechanismn and move it up to
the IpcServer- and IpcClientInterface.

Change-Id: I6eb6db1e9bc18232c8df350a6303afd2edc68da8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:23 +00:00
Nikolai Kosjar
e6fa92e58c Clang: Adapt to async starting/connecting to backend
Change-Id: Iaa01a68b161efc80e69ee671c62e2e5b007ae0f6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 09:08:02 +00:00
Marco Bubke
cda6e3c15a Clang: Start ConnectionClient asynchronously
The connection client can block main thread at start up. This patch is
removing the wait functions and using signals instead.

Change-Id: I847c98b095752f6a875c0365bc27361bc5bdd051
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-12 09:07:39 +00:00
Thomas Hartmann
b03c80f9e3 QmlDesigner: Fix calculation of anchor margins
Fixing calculation of anchor margins for all cases.

Change-Id: I124efe2e72f822779b7fc7c6671a3c51fea505ad
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-07-12 06:49:29 +00:00
Ulf Hermann
eae76df140 QmlProfiler: Don't reorder events in trace client
We stash the ranges until we receive RangeLocation and RangeData. In
order not to send other messages before the range they belong to, we
need to keep them around, too, until we send the range.

Change-Id: I0ce4ced68ee343c54638ce262216c4bf1e4ddc13
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-11 15:28:44 +00:00
Ulf Hermann
0d698d6b70 QmlProfiler: Properly handle very large ranges when restricting
Previously, a range starting before the restriction and ending after
it would not be recognized as belonging to the restricted range.

Change-Id: I4d387f8964362635cc2bc89a6a082a4a5bfeddcb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-11 15:28:31 +00:00
Ulf Hermann
d2c9466d79 QmlProfiler: Always dispatch memory and pixmap events
These events carry state which needs to be tracked even if they are
outside the current range.

Change-Id: Ia4bc34010f81cec29cd934ce2fefa0c337aef11f
Task-number: QTCREATORBUG-16552
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-11 15:28:27 +00:00
Christian Stenger
52f1fe7033 Revert "Algorithms: Simplify Utils::transform implementation"
This reverts commit ab070f8f7e as
it crashes still supported compiler gcc 4.7.3.

Change-Id: I74d8b0b94715fc9da59f35d0119081f5cacb6b53
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-11 13:06:22 +00:00
Christian Stenger
b4c263c974 AutoTest: Give some hint about the warning's origin
Change-Id: I4e26eea953d3e4e840678bd45eb2e4961e270eb2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-11 13:03:58 +00:00
Tobias Hunger
d6603365c3 Open Documents: Always show vertical scrollbar
This stops the 'x' icon from changing position when the scroll bar
vanishes.

Task-number: QTCREATORBUG-16566
Change-Id: I90f35ff34baec0a34e881797cfcc98be383a3f35
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-11 12:26:01 +00:00
Tobias Hunger
ca52ed159e MSVC: Re-detect compilers if detected ABI changes
Old creator versions detected MSVC 2015 with the 2005 ABIs. Upgrading
from those to a current version of Creator will keep this detected ABI,
effectively breaking MSVC 2015 for users upgrading from settings where
it was mis-detected.

Force re-creation of MSVC toolchains if the saved toolchain ABI and
the currently detected ABI differ. This will break kits (as the MSVC
toolchain's ID will change), but it will make sure a usable MSVC 2015
toolchain is available.

Change-Id: If7d9ab0d414bb33781243bcdf5112b411ecf5c13
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-11 12:25:52 +00:00
Christian Stenger
26799926cb AutoTest: Add qInfo handling
QTest can use qInfo() to print out additional information
which was ignored (with an internal warning).
Handle these messages the same way as qDebug().

Change-Id: I84106ab232580ec9066ea5fe0c03f3be8c6d0bfd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-11 11:03:18 +00:00
Orgad Shaneh
2b08faab83 Utils: Remove QLatin1{Char|String} in string utils
Not needed anymore. Easier to read without it.

Change-Id: I08c10e9da9b105cecc66bad876dd5e8862f821fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-11 10:46:40 +00:00
Alessandro Portale
d40c4f2797 Core: Fix the FancyActionBar color for Classic theme
Task-number: QTCREATORBUG-16562
Change-Id: I1738f25ee93831ecbc4958e25099c97c707d7bca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-11 10:25:35 +00:00
Eike Ziller
ab070f8f7e Algorithms: Simplify Utils::transform implementation
Change-Id: I2c59254c3457d1e1f5152a779509069861d22543
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-11 10:24:46 +00:00