Commit Graph

44349 Commits

Author SHA1 Message Date
Marco Bubke
22b5bbbff3 Clang: Add defineName to ProjectPart
We need them later to find out if the defines have changes.

Change-Id: Iaaa14df3dc6f50cb286c2dac37db13c975063c1e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:54:49 +00:00
Marco Bubke
8beb205ee0 Clang: Fix statement names for symbol storage
Change-Id: Ieb242baf70ffedbdcfdbdbff2b780a1ffb810cc2
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:52:16 +00:00
Marco Bubke
b247c4fdeb Clang: Store UsedDefines in the symbol database
We write the new defines in a temporary table and then write every new
entry in the usedDefines table, followed by remove of every entry in
usedDefines which are not in the temporary table but have a file entry in
common with one of the entries in the temporary table. At last we clean up
the temporary table.

Change-Id: Idf11ce8d17ad9ccef490578059fac08409fcc5d9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:51:06 +00:00
Marco Bubke
5cd64e8049 Clang: Add usedDefines table
Change-Id: Icbffb8a0450cfdff5d4958b5cc890114aeb0d794
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:50:29 +00:00
Marco Bubke
5877342123 Clang: Fix typo
Change-Id: I525459bd9e28b34912960bc43eca1b776da98344
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:50:17 +00:00
Marco Bubke
8a280129ff Clang: Update or insert used defines in the storage by the symbol indexer
Change-Id: Id8af85976be391e17886c9947863b81d206bb575
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:49:44 +00:00
Marco Bubke
30143650b0 Clang: Add default constructor for UsedDefine
Change-Id: Ib980f35df96a95076a92382711c23e3cee15621a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:48:22 +00:00
Marco Bubke
7bd2f805d0 Clang: Make default constructor of FilePathId constexpr
Change-Id: I1bb4c56ccb470def5cf2d1c4536cb99f47c5f7ed
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:48:10 +00:00
Marco Bubke
2f8c075a01 Utils: Make default constructor of SmallString constexpr
Change-Id: Ibf381c9f18de878b1f67e28498cd28270e9220c7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:47:57 +00:00
Marco Bubke
4f0c17bc5d Clang: Improve Macro collection
Now undefined macros are added to used macros but we filter out header
guards and dynamic libraries export. The export is quite simple but
without we would think that exports change the AST.

Change-Id: Ic16f60a6675e397dfd769c53caf77056708d8459
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:47:46 +00:00
hjk
effa4d830f Core: Remove the now-unused ICore::optionsDialogRequested() signal
Change-Id: I5b712c8f01170d406b2a1e5cb969ff2e4ffe16d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-01 14:17:30 +00:00
Ivan Donchevskii
eb1f85a971 Clang: simplify column convertion calls
Pass QTextBlock directly into clangColumn call.

Change-Id: I3410a82ed9a84da66e7b430e2aefce64ec459db8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-01 14:14:15 +00:00
Nikolai Kosjar
4f20c0d4ed Clang: Highlight invalid declarations as text
...instead of the corresponding declaration color.

Task-number: QTCREATORBUG-18686
Change-Id: Ice4d84816351af79efa286f49516c392bd80da86
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 14:12:58 +00:00
hjk
e712c8b7e2 Core: Replace an in-Core connection by a direct call
Change-Id: Ic219a992658e080467a18d38121a41990cc377ce
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-01 13:31:04 +00:00
hjk
974022c77b Core: Reduce code path ping-pong between ICore and MainWindow
Public entry points for displaying settings dialog were in ICore,
diverting to MainWindow, and back in some cases.

Move implementation to icore.cpp instead.

Change-Id: I02cbf1dcfe6241c665d7d701b4b4af1a8a242af5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-01 13:29:58 +00:00
Ivan Donchevskii
fbbdfd2444 Clang: Add commentary about column convertion
... to/from utf8 byte offset used by Clang.

Change-Id: I294d6cd61b416e5f2d64206ee2f3f1b4a91fb1d3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-01 12:22:45 +00:00
David Schulz
9d8abd9352 Update examples after documentation has changed
Change-Id: I33f944240ccc1618d2fb9f88d133d67b7d77c20e
Reviewed-by: hjk <hjk@qt.io>
2018-02-01 12:20:03 +00:00
Orgad Shaneh
e05d2d9dc8 Modeling: Fix unused argument warning
... when QT_NO_SVG is defined.

Change-Id: I916c39caece0eea1c0497801cdbaf588c90aed77
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-01 12:15:54 +00:00
Eike Ziller
e7316c9fe7 Help: Workaround overrideCursor issue with WebEngine based viewer
QWebEngineViewer never sends a loadFinished signal (but a loadStarted
signal) when only the URL fragment changes (QTBUG-65223). Work around by
logging the last URL and recognizing that condition.

Task-number: QTCREATORBUG-19649
Change-Id: I7b96fe60f5c76ebffb36c23e8d62c6cb1aa515aa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-01 12:08:37 +00:00
Eike Ziller
9c68afa08c ModelEditor: Remove code duplication in action handler
Change-Id: I7d4beff0c0408c0ef8655953434c9d324fb452cc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-01 12:08:01 +00:00
hjk
5405fc98e7 ProjectExplorer: Remove a use of ActionManager::instance()
The used function is static nowadays.

Change-Id: I12ccd3429b1b377f004d56585b48ed286ab0edeb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-01 12:07:53 +00:00
Eike Ziller
ebc975e4a4 ModelEditor: Remove unused methods
The zoom out and reset actions were even wrong.

Change-Id: I718e024cc2483c47ac3046b22c2526746288b6db
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-01 12:07:53 +00:00
Christian Stenger
b039026214 Debugger: Handle double click of sub break points
Double clicking on a child break point (e.g. multi location
break point) now jumps to the respective parent break point.

Change-Id: I93497f8eec78408909dddd159002e171805814d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-02-01 11:30:17 +00:00
Ulf Hermann
c1a5494594 QmlProfiler: Preserve statistics sorting order across model reloads
Task-number: QTCREATORBUG-19660
Change-Id: I19e20cbeddf91790a4aec056a438e97c96f57735
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-02-01 11:14:21 +00:00
Ulf Hermann
a91aa317ee Accept qmlproject runconfigs on remotelinux
The qmlproject run configuration will figure out which qmlscene to use,
so this is correct in any case.

Change-Id: I9c6b11606e1edfe60dcf6652c1f22124d50336f2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-01 11:14:02 +00:00
Ulf Hermann
0f32727097 Timeline: Bind to Flickable's width for scrolling
The setup of ScrollView and Flickable will otherwise generate a spurious
contentX change that messes up our range position.

Change-Id: I04f41b206a7ef4f0a889448f36103f427d1330d7
Task-number: QTCREATORBUG-19656
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-02-01 11:13:32 +00:00
hjk
1b87d19a64 Debugger: Modernize
Mostly nullptr instead of 0, but also a few bits of collateral damage.

Change-Id: I921991272aca921dcdecf302dfff3716e79dfc24
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-01 10:28:54 +00:00
hjk
7c41720479 Debugger: Allow disabling individual breakpoint locations
... for breakpoints that resolve to multiple locations, like templates.

Toggling is done via the the breakpoint view context menu, for now
only available with GDB and not persistent.

Change-Id: I098ae13a5518e9f671c647680f8bd4413e7e5ccc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-01 10:20:33 +00:00
Eike Ziller
46ad21a796 Merge "Merge remote-tracking branch 'origin/4.6'" 2018-02-01 10:13:42 +00:00
hjk
ae28c1bd67 Debugger: Avoid using addAutoReleasedObject
Not needed anymore for normal operation.

Change-Id: I9e167d28bb45afd8f98d8b0fed6fce183fea32ad
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-01 09:59:15 +00:00
Christian Stenger
0bd6f712f0 AutoTest: Access plugin singleton through static functions
It's the more common pattern nowadays, and cheaper.

Change-Id: If6217b2a820fbfa6f088fd9349225f5f8488f593
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-01 09:51:54 +00:00
Christian Stenger
56fbeb8a68 AutoTest: Avoid global object pool
Instead of adding internal objects to the global
object pool keep them to handle their destruction.

Change-Id: Ie6217b2a820fbfa6f088fd9349225f5f8488f593
Reviewed-by: hjk <hjk@qt.io>
2018-02-01 09:23:14 +00:00
Ulf Hermann
e984e5eacb FileInProjectFinder: Fix caching and project dir search
- Check the cache first, also for absolute paths in the project
  directory. Those paths are not guaranteed to exist and we may have
  found the file somewhere else before.
- Cache everything we find and remove entries from the cache if they
  have become invalid.
- When finding files in the project directory by absolute path, check if
  they exist before indicating success.
- Unify the checking and success handling.
- Pass QString by reference where applicable.
- Avoid double lookups in the cache.

Change-Id: I28e5a2979e0c78e84f42115a64acbd4eb06ffb0c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-01 09:02:07 +00:00
Eike Ziller
ecb9fae785 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
2018-02-01 09:58:36 +01:00
Ivan Donchevskii
b30643c4fa Clang: fix CINDEX_VERSION_MINOR for clang_getFileContents
Change-Id: Id546906fb119be2415500ae13f64c2c0e1e6a81b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-01 08:22:22 +00:00
Christian Kandeler
d3f5f63a33 Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: Ia1bbda6c57efb8bbc8b313ed842dea92f403f412
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-02-01 08:15:54 +00:00
David Schulz
ab9cce7fe7 Utils: use system case for environment variables on windows
Match case of user changed environment variables to the
already defined variables.

Change-Id: Ic012d35faa0822df3523ab642491c9f19051853c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-02-01 05:36:32 +00:00
Eike Ziller
88d65af7d3 ModelEditor: Do not needlessly add objects to the global pool
Change-Id: I27e0d0fbab934ba8effe78c8617c6f2305b4047f
Reviewed-by: hjk <hjk@qt.io>
2018-01-31 19:06:37 +00:00
Thomas Hartmann
f2e6fc9560 QmlDesigner: Add keyframe support to property editor
This patch allows to insert key frames if a timeline is present.

Change-Id: I39c8281e5e559a838ad61939d3f2db7c6abcf76b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-31 16:42:05 +00:00
Tim Jenssen
e61ec82b09 QmlDesigner: improve setupContext calls
There was a massive slow down if the clippboard
contained a complex qml element.

Change-Id: I7b17cc9eab39bade6f2a0ec2f66c2dd2a6279e2d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-31 16:20:01 +00:00
Christian Kandeler
6b29198874 SerialTerminal: Add qbs project file
Change-Id: Ic9b65d09424f0f28f58181d3da526127800c4d45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-31 14:57:36 +00:00
hjk
a728b790ad Debugger: Allow breakpoint items to be collapsed
Change-Id: Ia525e0c0259d6ea9578734c6ce12ed4178685ddf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-31 14:53:30 +00:00
hjk
8ce6fffa0f Utils: Let tree items request collapsing
In addition to the already existing expansion request.

Change-Id: I5a60a2ae6d71bdd1fcf44af5554ca45212d9d5bd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-31 14:12:37 +00:00
Vikas Pachdha
61511cd06b Android: Fix crash when creating new project
enableChanged is redundant for updating gradle settings.

Task-number: QTCREATORBUG-19652
Change-Id: I3352d3b56caf742f7f034b3bf106cfb361c1f869
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 07:54:38 +00:00
hjk
4c52129ea7 Make serialterminal plugin compilation depend on QtSerialPort presence
Change-Id: I49b7efba96f220924d493a45fd076f12a9465e31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-31 07:35:30 +00:00
hjk
406f964993 Debugger: Fix typo leading to wrong settings behavior
Change-Id: I352346c5b1c644ccba46fd573e31f3f03877de26
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-31 07:19:52 +00:00
Christian Stenger
b0b2859fe8 SerialTerminal: Fix compile for Qt less than 5.8
Change-Id: Icaa48d92d75bdd669bc6e4184568bfcf92cc768c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-01-31 06:33:04 +00:00
hjk
4c285f957b Core: Move left navigation view toggle button back to the left
Change-Id: I3f2070c6f6633b851c88d9179a4a97be1c944a7a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-30 15:30:14 +00:00
hjk
be3f5123d6 Core: Use a ModeManagerPrivate::appendMode(IMode *)
... instead of adding-by-index. This amends 3d2db474.

Also, simplify the shortcut setting, the loop is not needed
anymore as the mode order is fixed now.

Change-Id: I87959f8b5bc5c3a0cd0ca240fb8709db75aed105
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-30 13:39:51 +00:00
Benjamin Balga
b386eae888 Plugins: new serial terminal plugin
Plugin adding serial terminals in the output pane.

Change-Id: I75d0f69f8d90268ff774e4eae30e36eda022d3aa
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-01-30 13:35:19 +00:00