Commit Graph

43591 Commits

Author SHA1 Message Date
Tobias Hunger
61e590a971 JsonWizard: Expand repeatedly when filling out templates
This makes macros work that expand to more macros.

Change-Id: I44770fb59cec6cd80606cd341a92938c50e9e1fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-22 09:16:11 +00:00
Tobias Hunger
9324ef6eb1 JsonWizard: Allow object or list of objects for "options"
This is compatible with the existing wizards and makes writing a wizard
a tiny bit simpler and more consistent.

Change-Id: I72c6f858f337552fe2495a16beff17cdf0cce66d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-22 09:14:46 +00:00
Tobias Hunger
ed74b03d1a JsonWizard: Allow to set file-specific replacement
Using options: [ { "key": "a", "value": "b", "condition": "true" } ]

Change-Id: I36692d4e8506c02759674922ee05197de3a5c4c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-22 09:14:37 +00:00
Maurice Kalinowski
ae09de4340 WinRT: specify argument for winrtrunner
Starting with Windows 10 the application manifest does not specify the
target device anymore. Hence winrtrunner cannot automatically detect which
profile to use.

Instead, use the device information from the kit and explicitly set it as
additional arguments.

Change-Id: Id2f747a270620b6a6e7d0ae578adfc4373d80266
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-09-22 07:25:57 +00:00
Orgad Shaneh
67b208a40f Git: Replace accelerator for Checkout in Gerrit dialog
C is already used for Close.

Change-Id: I7094519ca21d71d2a3c8f39e831374960be298fa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-09-22 06:49:17 +00:00
Montel Laurent
54eabfb0c1 Port to new connect api
Change-Id: If9948ced45095546f37f9f397b65f922dc925b6a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-22 05:54:01 +00:00
Montel Laurent
451a03a4cb Allow to clear text in replace line.
Change-Id: Id73a0b18f9c0eb54da4e7e9f685e2203f56caf5a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-22 05:53:46 +00:00
Marco Bubke
87baaee78d Clang: Add environment variable to disable alive timer
Change-Id: I558ff0fe83cce9ee921819c6fd9c18534fad9bcf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-21 13:28:45 +00:00
Marco Bubke
a272d93fcd Clang: Change name to registerCurrentCppDocuments
registerCurrentUnsavedFiles was misleading.

Change-Id: I5a2444d81d141ced4b8a0fae7236484c9e919d8d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-21 13:28:35 +00:00
Robert Loehning
335f6e4363 Squish: Stabilize tst_cli_output_console
Skip frequently failing qDebug output from Qt 5.4.1 MinGW.

Change-Id: I20d0fed184e3935484179e9509c902eb94e48ead
Task-number: QTCREATORBUG-15067
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-21 12:27:00 +00:00
Tobias Hunger
3f1b622fb7 VariableManager: Do not try to expand Prefixes
Resolving "Prefix:<value>" does not make any sense, so let's not
do that.

Task-number: QTCREATORBUG-15072
Change-Id: Ia9741f9b48d269a7be31163ad73c3bc232856419
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-21 12:01:31 +00:00
Tobias Hunger
39e8a3abf3 MacroExpander: Fix variable descriptions
Task-number: QTCREATORBUG-15072
Change-Id: I176f2404509fd6be87dd8db98f5f1f5ef5e34dd6
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-09-21 11:08:59 +00:00
Robert Loehning
e087ed2452 Squish: Fix tst_default_settings
Change-Id: I136d93e7b698dcda5388bc24b9bcaaae482fb861
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-21 11:01:43 +00:00
Leena Miettinen
fb5bdb0abf Doc: update info about Beautifier options
Uncrustify now also provides the "Format Selected
Text" command.

Change-Id: Ifb30fc0b0b706cc8d06d24727556d0e98b863098
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
2015-09-21 07:31:11 +00:00
Christian Kandeler
897d3d6615 Analyzer: Fix qbs build.
Change-Id: Id9b7300673bdb22f3ef8b793b0101ebb5bc437d2
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-21 07:26:00 +00:00
Daniel Teske
1c38aa287a Simplify logic for showing UnconfiguredTargetPanel/TargetPanel
This doesn't change when the those panes are shown.

Change-Id: Ie5a2d27321e5268f59775892198999a8414a0adb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-18 17:44:33 +00:00
Ulf Hermann
90279e6d2b QmlProfiler: Use QmlDebugStream for communication with server
The server does the equivalent and using different data stream versions
for encoding and decoding will lead to problems, eventually.

Change-Id: I9e97525b4ba7f40b65b914c7f282e008435772a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-18 15:35:58 +00:00
Thomas Hartmann
beb424d209 QmlDesigner: Registers new views and tools
Change-Id: I9709ec28623d7cecb4167d41f5f69b4791359e22
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 15:10:19 +00:00
Tim Jenssen
b297e88535 removed unnecessary class forwards
Change-Id: I1e5e6f83c1e9676bf211d6d3132409ddc98d6f89
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-18 15:01:21 +00:00
Tim Jenssen
8d88138f87 use Constants values and refactor a little bit
Change-Id: If14ee4840040ce088340990d6291cfd0bbd47771
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-18 15:01:09 +00:00
Tim Jenssen
201abfe5f1 remove class forward for not existing class
Change-Id: Ie0c160eb5d259acb1626d53e6e78dc9e0bb2aa3d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-18 15:00:49 +00:00
Thomas Hartmann
3236d146a1 QmlDesigner: Adding formerly commercial features
This patch adds the formerly commercial only features
to the open source version of Qt Quick Designer.

The license is GPL v3.

Change-Id: I8f04e626766088298f2e827e7ef136e3c850fd78
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 14:44:29 +00:00
Daniel Teske
897718be05 CompileOutputWindow: Tweak clicking on "links"
Change the cursor to a HandCursor if hoovering over a link, and
make it single-click instead of double click.

Task-number: QTCREATORBUG-7542
Change-Id: I606510141eceece1f2b65f6ec1c6fffa838f2788
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-18 13:18:10 +00:00
hjk
e298500379 Debugger: Remove remains of QmlEngine live update feature
Change-Id: Iaa77f9d9af103046841637862b8aacdc6b0342c7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-18 13:04:52 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 12:12:57 +00:00
Ulf Hermann
eee4927d68 Analyzer: Only load a random first tool if none is selected already
Change-Id: Ia0ece94a8ef8d8f86d08400594744552c7a77242
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-18 11:54:23 +00:00
hjk
14f607e04d Debugger: Use DebuggerEngine::checkState also in core adapter
... instead of plain asserts. Less clutter on the user code side,
more information if it triggers.

Change-Id: I621e8adc168ceea64df6e39e0c95df4218f58d34
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-09-18 07:04:43 +00:00
Orgad Shaneh
d85979f269 ModelEditor: Minor cleanup
Replace a dummy local var with nullptr

Change-Id: Ieea27fe894b141233b657a056cf3954f96649b03
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-18 06:59:09 +00:00
Ulf Hermann
66774a8bdb QmlProfiler: Load notes after timeline models are finished
Otherwise the notes cannot be associated with timeline events.

Change-Id: I9a2f039fddd36c9a6bbaca3c0864c75e33cc479d
Task-number: QTCREATORBUG-15077
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-17 12:52:43 +00:00
Tobias Hunger
41e5c750fd CrashHandler: Link against utils library
This is what QBS does, too, and it spares us having a self-contained
sub-set of libUtils that can be compiled into the crashhandler.

Change-Id: I94e93192c058fc34e1838aeac536db52a3932157
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-17 12:48:46 +00:00
Tobias Hunger
dfa2bc5b71 Wizard: Do not set c++11 for the plain C project wizard
... when building with qmake. All other buildsystems do not
have that problem anyway.

Task-number: QTCREATORBUG-15064
Change-Id: Ie7d5b1b8a497db841c340229dff577de9e580171
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-17 12:44:28 +00:00
Alessandro Portale
15227b970a Analyzer: Rename mode icons
The other mode icons are named mode_foo.png. Where foo is a verb.
Renaming this icon makes it easier to quickly find all mode icons.

Change-Id: Iae7a58758c068f14e0c6887b3f18502fc3b086f2
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-17 11:36:09 +00:00
hjk
eb4d98e178 Debugger: Remove virtual layer of sendMessage() calls in QmlEngine
Change-Id: I7a5f335e8401d01bb3085b9512a878b67109feae
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-17 11:26:15 +00:00
Marco Benelli
e69bb933e3 qmljs: set cpp object to the latest version exported
m_objectsByQualifiedName did not prefer the latest meta object
revision, as consequence at type exported both anonymously and with a
name, would pick up one version randomly.

Change-Id: I91baf2729d0a0bda61205a62d9a38d04b4da058e
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-09-17 10:59:59 +00:00
Marco Benelli
68f6eec47a Added newer QtMultimedia version to bundle.
Change-Id: I553684b6a45a7112ea630997c440237d3e40459f
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-09-17 10:59:30 +00:00
Orgad Shaneh
ab80f512a0 VCS: Fix encoding for editor-related commands
For example Git Log.

Change-Id: I1d838f86dc70f000e66443eece60adc07310c8b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-17 10:52:47 +00:00
Tobias Hunger
76ffbbd43c ActionManager: Small cleanups
No code change

Change-Id: Iaceebaa1dccbd3667f1736a7167aedecabc9d4a2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-17 10:51:33 +00:00
Orgad Shaneh
cfa69dbbcc ModelEditor: Fix MSVC compilation
QStringLiteral does not work with split string literal and MSVC.
Only the first part gets a 'L' prepended, and an
"error C2308: concatenating mismatched strings"
is generated.

Change-Id: I3edf1259103ea5168aef06c0a81aab4a381d0f83
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-17 06:37:19 +00:00
Jakub Golebiewski
0b5b7ef67a FakeVim: Fix caps lock in macros.
This fixes the bug that while recording a macrom, hitting caps lock
(scroll lock, num lock) inserts some key into the buffer (for caps '$')
so when you replay the macro you get incorrect output.

Other keys that are not in vimKeyNames may behave similarly but It is
important that macros support those three (especially caps lock).

Change-Id: I2854266f86a22e9d38fb1c6c5d923b11a56a5995
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-17 06:36:06 +00:00
Tobias Hunger
6e8a72b17f Bookmarks: Remove hack to special-case the disassembler view
Change-Id: Ifd79b44fc879be6a1451401967cb894ca03356d1
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-16 15:00:58 +00:00
Tobias Hunger
77782ce79a DisassemblerAgent: Mark document as temporary
Change-Id: Ie61f6bc281392abfa9c485f1819e903551ddc422
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-16 15:00:54 +00:00
Tobias Hunger
39490240a8 LicenseTemplate: End the license template with at least one newline
Change-Id: I9bffcdbfba3c873324e12a8104da5d277259ea31
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-16 14:48:00 +00:00
Tobias Hunger
81b4d70f1e Bookmarks: Fix connect/disconnect mismatch
This was introduced when the plugin was refactored.

Change-Id: Ieffce92a6eac55aa7932f202220d3817c59e6a1f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:47:39 +00:00
Tobias Hunger
4aa8374dde Bookmarks: Make sure we do not end up with empty filenames
... in the bookmarks. The actions should all be disabled if that
is the case, but better safe than sorry (e.g. when a temporary
document is not marked up as such).

Change-Id: I131a870dc30258a8bca3fc57edb4692292ccb2de
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:45:35 +00:00
Tobias Hunger
482b395926 Bookmarks: Do not allow setting bookmarks in temporary files
Those can never get triggered anyway as they point to a file without
any filename.

Change-Id: Id04aa2e63a7e6918269851df0cd41c7334bfc94c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:45:02 +00:00
Tobias Hunger
d2d883ce29 ActionManager: Convert to Qt5 style connects
Change-Id: I058a8530a6c329314d60d77506ca25c6c87d7b88
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-16 14:20:43 +00:00
Tobias Hunger
8380436ce5 BookmarkManager: Remove unused method
Change-Id: I2ae8764bbbbde20e027169564bebb329447f17ed
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:20:23 +00:00
Tobias Hunger
628a0fcaa7 VcsBase: Turn State into a class
Change-Id: I1e0a9e6f4468ad29b70dc1fd78310ccb6a2133f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-16 13:52:58 +00:00
Orgad Shaneh
41feefd670 KitManager: Cleanup
* Deduplicate call to setDefaultKit.
* Replace 2 calls to Utils::findOrDefault with list concatenation.

Change-Id: I9822d34f1eb25447b35f33aad0497756ef46d101
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 13:25:05 +00:00
Tobias Hunger
57765ceb80 GitPlugin: Coding style fixes (WS only)
Change-Id: Icb83354dca6400f81dda0a28ef26861655b7e367
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 13:23:50 +00:00