Commit Graph

54418 Commits

Author SHA1 Message Date
Robert Loehning
1fcd494cc7 Clang: Remove dead code
Change-Id: I609929ca7723c60e108e30b7789c4482ebff7228
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 11:06:53 +00:00
Robert Loehning
9f06af8dc2 Clang: Don't pass large object by value
Change-Id: I419d1bebb063a5c20fce1dbed17f2249acea71f9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-14 11:05:38 +00:00
Robert Loehning
3e4dd72c92 Clang: Initialize member
Change-Id: Ic04acb0ded01ffbd01c83b8eb7f17c9b163ccaf7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-14 11:03:22 +00:00
hjk
b0b4022470 Android: Some code cosmetics
The naming scheme of the internal object was changed
to the usual pimpl pattern.

Also setup device update connection in the device constructory

Change-Id: I5cbb7a9d870a7d1f0e91e54f2ad6dfb95ea63e37
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-14 10:12:07 +00:00
Friedemann Kleint
cbed562175 ImageViewer: Fix QBS build after adding the SVG multiexport feature
Amends cd85d3aba5.

Change-Id: I8acdb94ee4b1f6a30aee2644230b4b9e297a53fb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-14 09:51:22 +00:00
Ulf Hermann
da8fc2573e Timeline: Don't restrict scales to 32bit integers
The JavaScript bit shift operators are 32bit only, and the QML "int"
type is "about -2G to +2G", so use multiplication and division instead
of bit shift and store the results as double.

Change-Id: If13c264e9e8a09ddc37675850b107411ee0b120f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-02-14 09:48:48 +00:00
Friedemann Kleint
cd85d3aba5 Add SVG multi export
Add a second SVG export option that allows for exporting
a series of icons of various size in one go. A dialog is shown
that allows for entering a file name pattern with place holders
and a list of sizes.

Change-Id: Ic644a9d402aa44af5899c29cf83051fdd7bba3d1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Diana de Sousa <diana.desousa@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-14 09:37:16 +00:00
Eike Ziller
43936b1e86 Merge "Merge remote-tracking branch 'origin/4.6'" 2018-02-13 12:38:29 +00:00
Eike Ziller
c7fdb93865 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I2445882a270731b866b04f28ff87d161224c539a
2018-02-13 13:37:37 +01:00
Tobias Hunger
3167c98e6e SettingsAccessor: Use optional for return value of BackUpStrategy::backupName
Change-Id: I70aacd5804b10ee51c81c3e3d877f7c142d618b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-13 12:21:40 +00:00
Tobias Hunger
23bb717101 SettingsAccessor: Extract handling of backups
Extract the code that handles backups from the SettingsAccessor into
a BackingUpSettingsAccessor.

Move code up from SettingsAccessor into UserFileAccessor where it belongs.
This became possible due to the extraction.

Change-Id: Icacaa4e7231b3c0c520154c76f9338227f96a614
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-13 12:21:33 +00:00
Ulf Hermann
a2581a2a89 QmlProfiler: Use EngineControl to hold engines until we're done
Holding the engines with EngineControl makes sure we always receive the
full trace before the connection drops.

Change-Id: I32e7d17886cdbc4749e3e54719e198d45169cbfe
Task-number: QTBUG-66269
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-02-13 12:16:42 +00:00
Eike Ziller
6ffe04bc40 Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: Iea598ba7f789f6176e90f26c7858e8c783eb2716
2018-02-13 13:04:39 +01:00
Eike Ziller
e6e7f8015c Use constants for settings keys
Change-Id: I81449a208840b4b00442e197501f13a0986fa1c5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-13 11:21:32 +00:00
Ulf Hermann
89a6611e9e QmlProfiler: Test that server recording changes only clear events
... and not event types.

Change-Id: Ic6c4ac3ef52bf07678d1ff0c0aaaf15242ea472e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-13 10:55:34 +00:00
Alessandro Portale
cebb667023 Valgrind: Use OPENFILE_TOOLBAR in toolbars
Change-Id: Ib154f6352006b827b771d033eddc939ac4dc6dfe
Reviewed-by: hjk <hjk@qt.io>
2018-02-13 10:55:04 +00:00
Alessandro Portale
89053aca81 Utils: add a toolbar variant for the OPENFILE icon
Change-Id: I745e47b6bfe5cce8e04014f2666c3388fafeea3c
Reviewed-by: hjk <hjk@qt.io>
2018-02-13 10:54:57 +00:00
Christian Stenger
cafb0760f6 Tests: Fix compile with Qt5.11
Function to convert char[] into QString has been deleted.

Change-Id: Iedf5db322b907d4ea1a20cc5c70394388d54f214
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-02-13 08:47:45 +00:00
Tobias Hunger
3874b6b6ec KitInformation: Improve robustness to nullptr passed as kit
All the KitInformation methods need to gracefully handle a kit that is
a nullptr. Ensure this is indeed the case.

This might fix the actual trigger for QTCREATORBUG-19469.

Change-Id: Id78ac8a26c1be908f41a425ff1935b86888e4b8b
Reviewed-by: hjk <hjk@qt.io>
2018-02-13 08:46:35 +00:00
Nikolai Kosjar
d5c449575e Clang: Remove unused functions
These are left-overs from refactorings.

Change-Id: I0cfe3a6de8a19e09fde06c3dee9bde243f3bc52c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-12 18:10:59 +00:00
Andre Hartmann
8d1a592d16 FancyLineEdit: Remove property initialText
The same can be easily achieved by placeholderText nowadays.

Change-Id: Icfe0652ae8536c8077cf45a03844275aa1eddad6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-12 16:15:11 +00:00
Christian Kandeler
ae20deb3a7 qbs build: Use project-global destination dir for libs and plugins
The autotests' rpath settings expect them there.

Change-Id: I13e3b8fb9a65be16e980b8465ff2e89b9e01ec6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-02-12 15:34:18 +00:00
Ulf Hermann
76c12becad Debugger: Properly handle spontaneous stop on InferiorRunRequested
We need to transition into InferiorRunOk first.

Change-Id: Iea4770f70979a4700a3bb350376526bbe8c07952
Reviewed-by: hjk <hjk@qt.io>
2018-02-12 15:28:26 +00:00
Ulf Hermann
2132ed8c96 Debugger: Accept transition from InferiorStopOk to InferiorRunOk
This can happen if we continue after an automatic break point at
application start. Set the state to InferiorRunRequested first, and then
to InferiorRunOk.

Change-Id: I0c4094ef0b335f31099cceb49b23aa3bc1a9a7af
Task-number: QTCREATORBUG-19712
Reviewed-by: hjk <hjk@qt.io>
2018-02-12 15:28:14 +00:00
Leena Miettinen
b2909c1648 Doc: Describe new model editor features
- No longer experimental
- Scratch models
- Deployment and sequence diagrams
- Aligning elements in the editor
- Adding related elements
- Exporting selected elements (now from the File menu)
- Flat role
- Creating new package diagrams
- Updating include dependencies for packages
- Toolbarbuttons for zooming (the menu items were removed)

Change-Id: If951e55188572fd6af86b9c32ae6ee50b77d8b8e
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-12 11:47:37 +00:00
hjk
310a2bf96f Core: Simplify MainWindow::init() signature
And adapt its only user.

Change-Id: Ifc1f6c7857951d6e1a68f5bc909146e9689c5428
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-12 11:21:14 +00:00
hjk
56e8752a29 ResourceEditor: Remove unneeded use of global object pool
Change-Id: Ie293314c034d679dee82fc15f7d4a71a5bdbacb7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-12 11:15:08 +00:00
hjk
7fea244019 Core: Remove a few explicit uses of the global plugin pool
Change-Id: I8627af8fa132b727450ee703910a39485eea58ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-12 10:41:22 +00:00
Robert Loehning
2109f3573f Wizards: Add missing spaces
Change-Id: If4bb6a48b1da1433c36e367c700d18a10fabe45d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-12 10:07:48 +00:00
Ivan Donchevskii
d01b474b46 Clang: Refactor TokenInfos
Remove code duplication.

Change-Id: Ib1859f2c3a04f66d0f0b669b4e93a7fc06ab8e61
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-12 08:03:47 +00:00
Orgad Shaneh
8e43a51a33 GenericHighlighter: Update from KSyntaxHighlighting
ini.xml was also changed, but I disagree with this change
(which removed ; and # as comments in ini files), so I left
it untouched.

Change-Id: I203b0d9382ed404623ea8ba6545970230f0e50ca
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-12 07:14:57 +00:00
Christian Kandeler
ac1d3b6583 Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: Ief55ebcaab4ecee6be78df447f965cebfc5d981c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-09 19:49:11 +00:00
Colin Duquesnoy
2a016d05b2 Add support for nested namespaces (C++17)
Task-number: QTCREATORBUG-16774
Change-Id: I3de3ac65810213e21c9a3bafef2474d252e191f7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 17:54:30 +00:00
Robert Loehning
43947fb868 Clang: Compile fix
Partially reverting 7282e05554

Change-Id: I114cd7d5da9905cd6ce7e1044f848aeac369be37
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 17:13:10 +00:00
Thomas Hartmann
0e6bed71cf QmlDesigner: Allow priorities for resource handlers
Change-Id: If9e9ad3ebc57ba2d80f3b1e89d0643223a00fe72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 17:03:38 +00:00
Robert Loehning
7282e05554 Improve translated strings
Change-Id: I7a45c6f8dcbb0e1b3c17a60823664fe1943c5654
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-09 16:36:54 +00:00
Christian Kandeler
8c7567c447 QbsProjectManager: Fix uniqueProductName() and productDisplayName()
These still assumed we can only multiplex on profiles.

Change-Id: Ice3dfe06c1be732ecae42db75155e930b0554b6f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-09 16:25:39 +00:00
Thomas Hartmann
7bca91cd23 NewDialog: Add setting to blacklist categories
Change-Id: I307ae05f08bf3bdbfc1b1a69bb10d8201ecf8436
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 16:23:06 +00:00
hjk
7cf1ba2855 RemoteLinux: Remove RemoteLinuxRunConfigFactory::canCreateHelper()
It's only called from RunConfigurationFactory::create() in a context
where the possible option are restricted to availableBuildTargets(),
i.e. the check always succeeds, and that's what the base implementation
does.

Change-Id: Ie05abb64da9e9c765afc8a61d83095a709bc5c68
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-09 14:30:16 +00:00
hjk
e5a3a8d189 ProjectExplorer: Remove BuildTargetInfo::displayName
This was previously intented to be used in the RunConfig Add... menu,
but this role is now taken by RunConfigurationCreationInfo::displayName.

This fixes also a regression for setups that relied on
QmakeProject::buildTargets() and a fix up empty display names later.

Change-Id: If75fc79efbdedc918a126e50c962fc188d7a3ebc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-09 14:15:54 +00:00
hjk
68526cbd19 Qnx: Remove run-time dependency on QmakeProjectManager
This re-uses what work in RemoteLinux. There's still a compile-time header
dependency due to the QmakeProjectManager::Constants::KIT_INFORMATION_ID
constant.

Change-Id: I6d6b8bbaed8ec2e80d54afe62a5a6b7f84eb37ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-09 13:35:37 +00:00
Ivan Donchevskii
7698d95576 CppTools: Get OverviewModel from model manager
Move ownership and add the placeholder for future clang based
OverviewModel.

Change-Id: Ia44d2c1d0db59b40239d1f7934bf37a02e4b14e6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 13:29:37 +00:00
Ivan Donchevskii
8389aa144a Clang: Use more generic methods in OverviewModel
Do not return Document or Symbol. Instead use Link
or LineColumn directly as return values.

Change-Id: I1863d7c3b4985ffe2ae5454622227075ebdc2de7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 13:29:10 +00:00
Christian Kandeler
d595896ea4 QbsProjectManager: Do not map QML debugging setting to Qt.declarative
QtQuick1 is no longer supported by Qt Creator.

Change-Id: I684ac12bca29779a18cc870e94071412edd29985
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 13:18:22 +00:00
Christian Kandeler
60a3fd59d4 QbsProjectManager: Use sensible default for enabling QML debugging
Task-number: QTCREATORBUG-19655
Change-Id: I2c330909c86c48f7c79fd2c016c41d82388e3c32
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:47 +00:00
Christian Kandeler
f5856f4bbc QbsProjectManager: Give build step a "linkQmlDebuggingLibrary" property
The DebuggerRunConfigurationAspect uses this property to decide
whether to enable QML debugging by default.

Task-number: QTCREATORBUG-19655
Change-Id: I71cc1127ee9d470a7cfedd424f8487f83d38db67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:31 +00:00
Christian Kandeler
a343e83ba8 QbsProjectManager: Provide a FileType for QML files
This is needed later to auto-detect whether to enable QML debugging.

Task-number: QTCREATORBUG-19655
Change-Id: I9f33119c20299cd0a2e77727bbe4396fb6eb9b12
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:15 +00:00
Christian Kandeler
18277e7ea1 QbsProjectManager: Fix QML debugging support
The module property override needs a "modules." prefix these days.

Task-number: QTCREATORBUG-19655
Change-Id: I4d6025c479a65cf94968338884f80b0ffa5ac141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:17:17 +00:00
Christian Kandeler
e463873d62 QbsProjectManager: Fix display of QML debugging warning icon
Due to a typo in the code, it was almost never shown, except initially
when it shouldn't have been.

Change-Id: I8d5ab3f28fddde7b996d3ca74bc69f2f549bedc1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:16:44 +00:00
Ivan Donchevskii
c6d4308ccd CPlusPlus: CppEditor: refactor overview model
Introduce abstract model to be able to use clang
based version of it in follow up patches.
Fix warnings and modernize source code a little.
Move OverviewModel to CppTools.

Change-Id: Idcc9bf03cad047026a456bd01063597a1eb95147
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 12:03:18 +00:00