Commit Graph

54432 Commits

Author SHA1 Message Date
Marco Bubke dfb9e4355f Sqlite: Transaction catch exception in destructor
Fixes coverity warning. We want to throw an exception in the destructor
in this case, which is save because it is a RAII pattern and holds
only trivial values. Actually this is the only way to communicate that
rollback was failing. It is quite rare that it will be happen without an
exception is already thrown.

There is a non throwing variant too if you want to use it as a class
member.

Change-Id: Ie71ead19678619465c6ad9334d36ee666225dce7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 15:03:22 +00:00
Christian Stenger f6f11b53a7 ProjectExplorer: Fix compile with Qt5.6 + gcc
Change-Id: Ibb6d00f7d036c996b85800c0baed606188a752e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 14:08:00 +00:00
Ulf Hermann 8e9454010b Android: Make qmlscene command configurable
Change-Id: Ife1dd4ae9fa3bcc822c27d744c3ed626bae99b8f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 14:03:39 +00:00
Ulf Hermann 8b867e88f4 Support QML preview with qmlproject on android
Change-Id: I53a074d2064ddd2a20e745250d9620cd1969928b
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 14:03:33 +00:00
David Schulz b4a1798618 TextEditor: add document content completer
Add completion based on words of the document. This provides basic
assistance for programming languages without a code model.

Task-number: QTCREATORBUG-13869
Change-Id: I3a9c59c741dfd6895442fc0524cfd1bd3b2b0111
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:38:22 +00:00
hjk 24520b9159 QmakeAndroidSupport: Pimpl and remove use of global object pool
Change-Id: I2b893ac8fd72d920a538739de2c0ccfa2a9ba354
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 13:34:15 +00:00
Tobias Hunger 6445fb19bb Settings: Add test to pick right file if several exist
Test picking the expected file when several exist in
BackingUpSettingsAccessor.

Change-Id: I09d346a98a8df13d6cf3ee53ee20ce34e45e8d28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:24:26 +00:00
Tobias Hunger 97cf4bb278 SettingsAccessor: Improve test by mocking out read/write operations
Change-Id: I4d4cf6ff0be3d4b8278a7613c26f2b1752304ad4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:24:11 +00:00
Tobias Hunger b95bbe1d57 SettingsAccessor: Extract functionality to merge settings
Move functionality related to merging settings into MergingSettingsAccessor,
move code specific to the .user-files into UserFileAccessor.

Remove SettingsAccessor class, now that all code has been moved out of it.

This patch changes the merge mechanism a bit: It used to upgrade
the user and tha shared file to the higher version of these two, merge,
and then upgrade the merged result to the newest version.

Now it upgrades both the user as well as the shared file to the newest
version and only merges afterwards.

Change-Id: I2a1605cbe9b9fb1404fcfa9954a9f3410da0abb1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:23:33 +00:00
Tobias Hunger 9ffd52f9c5 SettingsAccessor: Extract upgrading functionality
Extract upgrading functionality from SettingsAccessor into
UpgradingSettingsAccessor.

Fixes surprising behavior in test
ProjectExplorerPlugin::testUserFileAccessor_prepareToReadSettingsObsoleteVersionNewVersion
where the Version was thrown away.

Also adds a error/warning distinction to BasicSettingsAccessor::Issue,
so that the non-critical ones can be ignored later.

Change-Id: Ia38d074f91cd8d8f820f9bec96d3330d748564c7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-14 13:23:25 +00:00
hjk 65078befce IosPlugin: Pimpl plugin class
Also generally follow the current plugin setup pattern,
remove unneeded uses of global plugin pool, move stuff
to the usual initialization phases.

Change-Id: I1eb1d8251be68aa095e07125d42451dae4a3dd06
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:43:56 +00:00
Ulf Hermann 6a964d8d0b Android: Support the extraenvvars and extraappparams options
The Qt/Android runtime does support passing parameters to the
application. We have to pass '-e extraappparams <base64 string>' and
'-e extraenvvars <base64 strings, concatenated by ";">'. This is very
handy and should actually be exposed in the GUI.

Change-Id: I8c84a53ab8f6f07ea5b6e01c902f53385df8b35f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:31:45 +00:00
Ulf Hermann 9771333f9f Android: Tolerate foreign run configurations
The only things specific to AndroidRunConfiguration are
amStartExtraArgs() and postFinishShellCommands(). Those are considered
to be empty on foreign configurations.

Change-Id: Ia0b8381c30225942e8704db04d17a8bdd3d2c806
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:31:15 +00:00
Ulf Hermann b088972a9c Android: Tolerate empty build/deploy configurations
If there is no build or deploy configuration, just skip the building and
deploying.

Change-Id: I8b6f6d14100f366df5683eb77490d7c0dc588f94
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-02-14 12:30:49 +00:00
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