Commit Graph

55184 Commits

Author SHA1 Message Date
Tobias Hunger
2d84e003ea QmlDesigner: Fix build on Linux
Change-Id: I342a8004f117292cd955530729ae29571094d5cf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-10 14:10:29 +00:00
Thomas Hartmann
45dfa5658b QmlDesigner: Increase size of states editor
Change-Id: I5541214ca8aa518a59d0fa6563e59f69f8048eda
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:19:32 +00:00
Thomas Hartmann
36e80ef142 QmlDesigner: Fix old naming convention in css
Change-Id: I0d73064d18f688d02aa15d13c733b98ee08b74a5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:19:24 +00:00
Thomas Hartmann
654be9b2cc QmlDesigner: Slightly increase size of selection label
Change-Id: I39892bce5a30208fbecc0998405b8d577bc369f0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:19:17 +00:00
Thomas Hartmann
b61abbc45d QmlDesigner: Slightly increase section size
Change-Id: Ifa41cbff552c61cac47f09faf5e96dba8734e3fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:19:09 +00:00
Thomas Hartmann
6f281e844d QmlDesigner: Do not set if high dpi scaling is not enabled
Qt::AA_EnableHighDpiScaling is the default for the puppet and
setting QT_AUTO_SCREEN_SCALE_FACTOR will lead to artefacts in this case.

Change-Id: I6f466559de8daf538dd59975674f6b438e771cba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:18:58 +00:00
Thomas Hartmann
3c08fb2668 QmlDesigner: Adjust font pixel size if pixel density is high
We define some fonts in pixel size and those have to be increased
if the pixel density is high.

Change-Id: I88e932d967aaa9d8757e733048d457e9e7c17f5b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:18:44 +00:00
Thomas Hartmann
a4e9624ce1 QmlDesigner: Allow custom disabling of views
If the document contains errors we disable views.
Since the navigator view contains also the project view it should
not be completetely disabled. Just the item navigator has to be
disabled.
To allow this we move the disable/enable logic to a virtual function
that is overridden in NavigatorView.

Change-Id: Ifb5b44fa19c36712cfebbe53b59c2d431e81cad4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:18:20 +00:00
Thomas Hartmann
c7d0805e17 QmlDesigner: Rename occurrences of mutator to timeline
Change-Id: Icf747c4b8dd11c7fa71902188c6c39e920be401a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 12:33:13 +00:00
Thomas Hartmann
08124310ef QmlDesigner: Rename QmlTimelineMutator to QmlTimeline
Change-Id: I1375fae2a5f100afe59d641cbe58d2fc4fd462a6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 12:32:58 +00:00
Thomas Hartmann
61837d0ca6 QmlDesigner: Rename KeyframeMutator to Timeline
Change-Id: I00f524de5ad5ce4afaeb4d0a8c4e895247291bdc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 12:32:26 +00:00
Ivan Donchevskii
7e89682a97 Clang: Add lexical parent index to token information
This makes easier to build a tree out of tokens data.

Change-Id: Ia2a79f085797869ea2f3799b26dd44b4e051b625
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-10 12:02:02 +00:00
Tobias Hunger
bfe3bdd890 TargetSetupPage: Try to prevent a crash
Try to prevent a crash that I can not reproduce:
 * Use a std::vector of TargetSetupWidgets instead of a map.
 * Double-check that no nullptr will end up in that vector.
 * Make sure widgets are removed from the vector before their kits
   become invalid.
 * Unify removal of widgets.

Change-Id: Ie57c7689033914458ca4d4f3ae11998480008ff3
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-10 11:24:02 +00:00
Christian Stenger
44505006ee AutoTest: Fix output parsing for Quick Tests
Although Quick tests are using the output functionality of
normal Qt tests some output messages are passed encoded
differently which in turn results in failing XML parser.
Handle the different encoding inside the output parser.

Task-number: QTCREATORBUG-20105
Change-Id: Ib65edf46f9becff6f6bdef8b75f7761785bc4ceb
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-10 11:08:51 +00:00
Tobias Hunger
990d26deba SettingsAccessor: Remember last saved state
Remember last saved data and do not save it again if nothing had
changed.

Change-Id: I093859ff5edc8d1d6e7b17ecd97985ca6fb0e579
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 09:41:50 +00:00
Tobias Hunger
5c4abeaffe Abi: Allow for roundtrips enum->string->enum
Add all static methods to turn the various Abi enums into a string
and back.

Use these methods in the Abi constructor.

Add a unit test that does round-trips between Abi enum, string and back
and fix the code to actually handle this.

Change-Id: Icb56cce07d36152dbee7bbf9dd119a753444ada9
Reviewed-by: hjk <hjk@qt.io>
2018-04-10 09:37:55 +00:00
Tim Jenssen
b3a92fc58e QmlDesigner: remove testing code
Change-Id: Idd5670fa0600e4d8d2cf66a03e67bb06a362001f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-10 09:01:33 +00:00
Tim Jenssen
5d98899ffd widget as a std::unique_ptr is bad
- a widget is often used as a raw pointer and in most cases
   the parent will take care of destructing it
 - here the context is also destructing the widget
 - so move back to QPointer and keep deleting to the context

Change-Id: Ief5c4faa08d5e76f723b35d33d09fafc502c2d8a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-10 09:01:15 +00:00
Thomas Hartmann
d745e2fac0 QmlDesigner: Change description of custom local components
Change-Id: I07589f105adf572b05f73bd7f39603612ad49b2f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-10 09:00:24 +00:00
Thomas Hartmann
8f583631f8 QmlDesigner: Fix black bar
The color was not renamed in this inline css.

Change-Id: Ib23977fcc9f3c5925ef5183dba0fc2c0216ab465
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-10 08:55:23 +00:00
hjk
a06514c365 ProjectExplorer: Start unifing visual appearance of run config widgets
Margins and layout style widely differ so far. Start moving everything
to a QFormLayout with the same margin and growth policy.

Change-Id: I0bd1d8b2ec9830be56354be1376a2a24eebb8845
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-10 08:41:16 +00:00
Alessandro Portale
c66f52c065 QmlEditorWidgets: Use a prefix in easingpane.qrc
Since all resources in Qt Creator get merged together at runtime, they
should be prefixed with the library/plugin name.

Change-Id: Iacd2aa748e68ac9f8c61b77a4af1db9d03f3f9d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 08:33:49 +00:00
Tobias Hunger
4ba5e402dc Abi: Fix switch statment when guessing ABI based on target triple
Some entries were duplicated. Fix fallout in gcc toolchain test
caused by this change.

Change-Id: I63c7a5fdba93e903888b2daa99a87e0a07c28acd
Reviewed-by: hjk <hjk@qt.io>
2018-04-10 08:04:56 +00:00
Vikas Pachdha
56b6972994 Android: create a new toolchain when missing target triple
Though it should not happen that a toolchain is missing the triple
but in case the detection fails a new toolchain shall be created and
the misbehaving toolchain should be deleted

Task-number: QTCREATORBUG-20217
Change-Id: Iaa86331730f82b8e5abd37f1184a53d1e1312979
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-10 07:31:59 +00:00
Tobias Hunger
f7a0a3cd26 ProjectTree: Do not use disabled state for disabled nodes
Rendering disabled nodes using the disabled state in the painter
breaks themes as it introduces a discrepancy between the actual
state of the node and its graphical representation.

IIRC this was introduced since there was no easy way to find what
color was supposed to be used for disabled items. That is no longer
the case, so let's clean this up.

Change-Id: Ic5653cd970e07eb680cb1d28d1feefd70aded540
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-09 14:58:42 +00:00
hjk
e760cbdd52 ProjectExplorer: Remove unused functions
Change-Id: Ib35a04e486fb50a0a43c718adb726bee399165d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-09 14:13:30 +00:00
hjk
c5ff80163b QMake: Use new ExecutableAspect
Change-Id: I87af8de1a6bec216ebafaa6d7832e00facc9601a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-09 14:13:26 +00:00
hjk
37f675d9c5 RemoteLinux: Rework RemoteLinuxCustomRunConfiguration
Use ArgumentAspect and WorkingDirectoryAspect.

Use base convenience functions to set up configuration widget.
The RunConfigWidget base is not needed for the main frame.

Make the run config display names consistent.

Display remote exe (which is the main thing) above the local
exe (which is only a helper to get debug info).

Change-Id: I9a47dc9ea27e6abd96bb75a3103ebc8ba35069c0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-09 14:00:27 +00:00
Alessandro Portale
08c90cecc8 Help: Remove several unused icons
Change-Id: I3a8cc0413b728606d79aa36fa0fd45553f204e5a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-09 13:33:28 +00:00
Marco Bubke
42ecd2ed3d Clang: Fix reset for write and execute in the sqlite statement
We were not reset a statement if we got an exception. There are now test
for it.

Change-Id: Ife7b4437fece9369767605ba7387bd0564c1bb8d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:09:55 +00:00
Marco Bubke
9d7225d283 Clang: Cleanup transaction statements in the database
Change-Id: I795248492fe952c230fd3a9cf8bf16f3c831f161
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:09:45 +00:00
Marco Bubke
1b9469aa85 Clang: Use DeclarationName for indexing
Change-Id: Iefb2cb8a21c0f76d935bca56a4e9e02d6626e936
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:09:39 +00:00
Marco Bubke
4335dc7ff8 Clang: More tests for symbol indexing
Change-Id: Ic0806fbf245c9b69f74eaa8e3d52cad90dafedbf
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:09:33 +00:00
Marco Bubke
d4ef90e632 Clang: Filter duplicate locations
An unique index is prevent double locations in the database.

Change-Id: I167cafe1a707dd8a8a9754b8d69790a8382f4eea
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:09:28 +00:00
Marco Bubke
8e9e1af7b8 Clang: Handle warning inside of the event loop
Change-Id: Ic0120beefcba209c572ce0a03b21d30e764c2ad3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:09:20 +00:00
Oswald Buddenhagen
bb027e10a8 fix llvm libdir handling wrt RPATH, more or less properly
we must not add the llvm libdir if it's a system path. this was already
done in some places, but not in others.

while we're at it, re-shuffle some pre-existing conditionals to make
things consistent.

Task-number: QTCREATORBUG-20178
Change-Id: Ib7e5a81705494e4cf2f83a4782ecd0832b91e511
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-09 12:54:53 +00:00
Alessandro Portale
639df58287 Utils: Remove the unused and invalid Utils::Icons::DARK_CLOSE
The icon is not used anywhere and the :/utils/images/darkclose.png it
depends on does not exist.

Change-Id: I3f2bd5e4cd13ad4d19baf9e691897b81cd3b0629
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-09 11:38:23 +00:00
Alessandro Portale
0789c5485e TextEditor: Remove unused "finddirectory" icon
In case such icon will be needed at some point, we will recreate it
themable and HighDPI-able.

Change-Id: Icf34617fa71eb35406bbc10daaa700a823671061
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-09 11:38:12 +00:00
hjk
0df9d6dda9 ProjectExplorer: De-qobject-ify RunConfigurationFactory
Some translations moved over to the corresponding RunConfigurations,
one setParent() replaced by direct deletion.

Change-Id: Ib5e527b71353a6be70b332ac2dfd2f5cd2499a60
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-09 10:57:36 +00:00
Christian Stenger
51cc3957b4 AutoTest: Replace expensive function call
Depending on the underlying project manager it can be
pretty expensive calling PE::canRunStartupProject().
AutoTest plugin used this to determine whether its
global actions should be enabled or not and updating
these actions is triggered for too many causes.

Replace this function call by some simple checks that
have almost no cost to avoid blocking UI.

Task-number: QTCREATORBUG-20175
Change-Id: I0e3cce683f33abe82bf1354ec5276250f5e30068
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-09 10:38:23 +00:00
Orgad Shaneh
9053cd7515 SettingsAccessor: Support user file without EnvironmentId
Let the users forge a user file without injecting their environment.

Task-number: QTCREATORBUG-20097
Change-Id: Ia481f0f6d7c704d26b5f7d0f985f38dd39027f95
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-09 09:32:13 +00:00
Jarek Kobus
e806ea40cc Pass this context object to the connect()
Otherwise when "this" instance
gets deleted and the sender still exists, the lambda
expression is still invoked for the deleted object.

Task-number: QTCREATORBUG-20223
Change-Id: Ifd5c9e6ce1fe7fde71698c6683cdfcd7566e8d35
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-04-09 09:31:40 +00:00
Orgad Shaneh
eea6a7c3b3 Utils: Purge qtcfallthrough.h
No longer needed.

Change-Id: I9b0bee014df89d4c567f1d2431b5ff9404f5f925
Reviewed-by: hjk <hjk@qt.io>
2018-04-09 09:04:13 +00:00
Orgad Shaneh
7d3a79c696 Utils: Purge asConst
Replace by qAsConst.

Change-Id: I3301366f73c066c86f08df7188d70dc3b613c55c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-04-09 09:04:00 +00:00
hjk
11336fb604 QmlProject: Move RunConfigurationFactory close to RunConfiguration
No need to have a dozen lines of code in a separate translation
unit and more in line with what others do nowadays.

Change-Id: I765535d1484805bc3005fe23bfd4992a96a80e9c
Reviewed-by: hjk <hjk@qt.io>
2018-04-09 08:49:09 +00:00
Tim Jenssen
18ad5653d5 Wizards: fix crash when index is wrong
Task-number: QTCREATORBUG-20193
Change-Id: I20da636a3db478c6ff0d812b1b3dc3405f73cb8e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-09 08:28:10 +00:00
hjk
ef79078db2 RemoteLinux: Move RunConfigurationFactories close to RunConfigurations
No need to have a dozen lines of code in a separate translation
unit and more in line with what others do nowadays.

Change-Id: I029cac3d96b6a318be2cc4efad08badfae68fc20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-09 06:54:31 +00:00
Orgad Shaneh
8183809846 QmlJS: Update gen-parser.sh
Try to minimize differences on sync

Change-Id: I9af325911b1a6a7635099cb3a5c778305e5e6223
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-04-09 06:37:27 +00:00
Orgad Shaneh
b67ad62cac ProjectExplorer: Avoid casting to const value
Detected by GCC8.

Change-Id: I01b7dda2c8304986dae88f30c753221661c32207
Reviewed-by: hjk <hjk@qt.io>
2018-04-09 06:18:34 +00:00
Vikas Pachdha
e6898fd863 Android: Fix app_process not being copied for 32bit cpu abi
Task-number: QTCREATORBUG-20084
Change-Id: Id06cfb6250030851211c7c170f8d0c8b0491b3d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2018-04-09 05:54:23 +00:00