Commit Graph

36659 Commits

Author SHA1 Message Date
Fawzi Mohamed ef54a29c7b qmljs: add possible exports given by its path if no other exports found
Change-Id: I23c99aacf0c76fe9ceca0c7c05c17102b90244cd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:05:16 +02:00
Nikolai Kosjar 04d655dee0 C++: Fix preprocessor line offsets
In TranslationUnit, the "normal" lines are based on utf16char offsets,
but the preprocessor lines were based on byte/latin1 offsets.

The preprocessor lines are now based on utf16char offsets, too.

Task-number: QTCREATORBUG-7356
Change-Id: I3c41d1dcee8e9e487210f36da806b0229d3f4cd0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 14:03:44 +02:00
Fawzi Mohamed fa24266972 qmljs: improve handling of relocatable dumps
Change-Id: Ie329911a3f7f9266ead41087cbc7d78b95c1497a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:03:30 +02:00
Fawzi Mohamed c44cffa49d qmljs: eagerly import library typeinfo
Change-Id: I599b84e9938d021343cca1cdb7d54d53155eaf91
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:00:20 +02:00
Nikolai Kosjar 26a9f01d72 CppEditor: Check for a valid document
...from the semantic info before trying to use it.

Just after opening a file and using Follow Symbol the semantic document
might not be yet calculated.

Change-Id: I62deaf86415a2e2b0d7f1285f90bdcd9b5925a2e
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 13:53:04 +02:00
hjk 26f98097cd Bookmark: Save after internal changes
Task-number: QTCREATORBUG-10687
Change-Id: Ie2cb0b990d7dd419f27469612cb422e55e7d322f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-04 13:52:34 +02:00
Erik Verbruggen 3d33886e53 C++: fix include/framework path handling.
Instead of having two lists of paths, now only one list is used where
both include paths and framework paths can be mixed. This reflects the
way the compiler is invoked, and retains the (correct) search order.

Task-number: QTCREATORBUG-11599
Change-Id: I373953e3e305df5b7a0d10920e12d146584adf9f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-04 13:51:36 +02:00
Christian Stenger 76152088e9 Debugger: Fix race condition
When getting debugger finished after a device disconnect it might
re-enable the 'Start Debugging' button although debugging is
not possible.

Task-number: QTCREATORBUG-12585
Change-Id: I8901b440bb3e90e5f29cdeba2f6629d157c2e335
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-04 13:46:08 +02:00
hjk c898fff111 CppTools: Compile fix for namespaced Qt
Change-Id: I21b0af020938db77e92661d6c481e60df3e87bef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-04 13:28:21 +02:00
Nikolai Kosjar 8ff225d9d6 C++: Fix (Find)LocalSymbols for lambda parameters
Change-Id: I5cb69749b4f15e4f70dea410aa6f943c4189c502
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 12:35:13 +02:00
Nikolai Kosjar 995d1f777f C++: Add basic LocalSymbols test
Change-Id: I199e912203f329ec9b8bed2eb105e4a56f729e7d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 12:35:05 +02:00
Nikolai Kosjar d4ce510974 C++: Fix completion for lambda parameters
Change-Id: I6db51aeba328dbb69ec59082a70be7bc2d95699b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 12:34:57 +02:00
Nikolai Kosjar f5cad52a09 CppTools: Remove unused members
Change-Id: Id8402ac62ea73b98a6ab1d641d45dff621a096c4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 12:34:47 +02:00
Nikolai Kosjar 06e2c3309e C++: Fix "duplicate data type in declaration" for lambdas
The "_type" wasn't reset.

Task-number: QTCREATORBUG-12521
Change-Id: I0d38cb38e270260065313d1235d42f2689385850
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 12:29:28 +02:00
Oliver Wolff 80dd1dd263 WinRT: also add INSTALLS to mapping file if targetpath isn't set
Change-Id: I2a57065d08eb909f19020942506843f606ec736c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-04 11:08:07 +02:00
Marco Bubke 1214ed8fb5 QmlDesigner: Make section more customizable
Change-Id: If3a02c083a075c2b53a8ae97ba1602603f999844
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 10:45:46 +02:00
jkobus cb0e1d040e Fix double click in left view of sidebysidediffeditor
Task-number: QTCREATORBUG-12493
Change-Id: I008cae61ce2a32f1abce56c66ee09387768fbeb8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-04 10:27:27 +02:00
Eike Ziller ac31d3c67e PluginManager: Remove hardcoded list of plugins that cannot be disabled
Instead add an optional attribute "required" to the plugin spec. Since
the locator plugin and find plugin are gone, and I don't see a reason to
prevent disabling the text editor plugin, only Core plugin gets the new
attribute set.

Change-Id: I7a380026ea46173cf00afff4213ca1b3a2578434
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-04 08:51:39 +02:00
Eike Ziller 9c6f559156 Editors: Add "Open with" to open editors and combo box context menus
Change-Id: I67e75220ac86c7fd4d5005424f8b1922e2cbacfd
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-07-04 08:51:03 +02:00
Eike Ziller db918592ec Fix "Open with" for multiple splits
It was closing all existing editors and opening a single new one in the
"current" split.
Instead, open new editors in all splits where the file was open and
visible.

Change-Id: Iac7238077b2e42937ce54eea65fa1b61dcd07df1
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-07-04 08:50:28 +02:00
David Schulz 4971de7ccf Core: Sort document model in a locale aware manner.
Task-number: QTCREATORBUG-12608
Change-Id: If0b9507d31a17cbebfb9fe83fde44738b6e7dcf9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-04 08:48:33 +02:00
Orgad Shaneh 72e878a126 Debugger: Improve detection of debuggers in legacy configuration
There is a wrong assumption there that ids start with '{'.

Change-Id: I8d753c1b67cfe250435711eab8db9f6dc576195d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-03 18:51:35 +02:00
Orgad Shaneh ddf344a534 Debugger: Use normal separators for debugger settings
This is internal data, uninteresting for the user. Other settings use normal
separators as well.

Change-Id: I8607810c6fa7e6a464ee95fa57178276b730ddba
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-03 17:40:36 +02:00
Eike Ziller d553222b25 Remove the find and locator plugin stubs.
Change-Id: I3559d8d5b86dcd0b97b765564bc48dc1b4e60e19
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-03 17:29:49 +02:00
jkobus ee36b04963 Fix a crash on session switch
Done by Daniel

Task-number: QTCREATORBUG-12613
Change-Id: I716c1b73cd7e0c934b8b2e3090af1de4d987a191
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-03 17:12:07 +02:00
Fawzi Mohamed 1fc03107f3 debugger: compile fix
change QStringRef+QLatin1String to QString+QLatin1String
to compile with Qt 5.3.1 (on mac) and Qt 4

Change-Id: I37da7bdbb6185639f90232bc8554c79535692d07
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-03 17:05:08 +02:00
hjk e368699999 ChangeLog: Add baremetal, fakevim, debugger
Change-Id: I5e2555158a9b24593b79a41c52c0b7a5139971ae
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-03 17:05:03 +02:00
Orgad Shaneh ff1d6efca3 SdkTool: Use 1 as default origin in add device
Origin corresponds to enum Origin { ManuallyAdded, AutoDetected }

Change-Id: I18416351de729bf2bdefbba4134c9d50c01e98fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 15:43:14 +02:00
Fawzi Mohamed 28e9824e61 ios: increase simulator timeout to cope with slower machines
Change-Id: Idfb5da8dfd0be6bada2b7d318703b0d1b8d4b6b9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-03 15:07:13 +02:00
Nikolai Kosjar 919f26a488 Todo: Fix thread safety issue in CppTodoItemScanner
Replace the not thread safe Project::files() with the thread safe
CppModelManager::projectPart() to find out whether a file belongs to a
project or not.

Task-number: QTCREATORBUG-12556
Change-Id: Icf443b5b31c818fc15738aa365562db12439d8d7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-03 14:56:31 +02:00
Leena Miettinen b552cfba1f Doc: adjust version information about VCS support
Add supported Gerrit version.

Remove information about since when VCS features are
supported, as we don't do that for any other features,
either.

Change-Id: I6a6e69a971f9f0ddecbe67b3d13cd88c85c1fedf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-03 14:29:02 +02:00
Tim Sander f058970321 update stale memory view after debug step/stop
Change-Id: Ib31a813b324b098e3278b9761f62e59e9ff9fc21
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-03 14:26:10 +02:00
Eike Ziller dfb4f8aaf6 About Plugins: Disable plugins that are not available on platform
Change-Id: I8e64b363a74823001f5ca65d9174e2a403bc3dca
Task-number: QTCREATORBUG-10570
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-03 14:03:45 +02:00
hjk dbbddd9fde Debugger: Shorten function signatures in break and stack views
Especially useful with std:: types.

Change-Id: Iee7ae26b25ac162ac31944cd2a9c16ca4bf63f1c
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-07-03 13:22:42 +02:00
hjk ca9e2dd9d7 Debugger: Show base class names simplified
Especially for highly templated code it's awful to have the
name column populated by 'std::basic_string<...' gibberish.

Change-Id: I7344bed77a0e29cf88f031e1a663ed6c4c1c7b51
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-07-03 13:22:21 +02:00
Christian Kandeler 977db80425 Update qbs submodule.
Change-Id: Idc9e86b7ce8034b2ac0d1c1fe9422c6e49f979a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-03 12:41:08 +02:00
Tim Jenssen 11284f0179 QmlDesigner: don't ignore unknown component
Task-number: QTCREATORBUG-12442
Change-Id: I0855644bb359ba9cee0ee71df679ef59ffac2da0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-03 12:24:55 +02:00
Marco Bubke 5c551932b4 QmlDesigner: Always test if there is a instance for an id or object
Change-Id: I90ff8861de8879e300932bd61afb29f8ec3b9fc4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-03 12:17:55 +02:00
Marco Bubke 7178a4740f QmlDesigner: Check if model has parent property
If you compare the parent property you must check if there is one.

Task-number: QTCREATORBUG-12599
Change-Id: I6033a7572f307d2fd11e90c95cbb7515ef8dcca0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-03 12:16:37 +02:00
Ulf Hermann 4ecefc6857 QmlProfiler: Fix crash in range model
The first element in the expandedRowTypes is always -1 as that is the
empty row. Don't try to retrieve its type.

Change-Id: I1a4b59e0de6638201485d503e3be05afddf625fb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-03 12:07:01 +02:00
Ulf Hermann 981bb850e9 QmlProfiler: Rename Qt5 "Painting" to "Animations" and always show it
"Animations" is a much better name as that's what it actually shows. It
also serves to distinguish from the QtQuick 1 only "Painting" category
that really does show the time QPainter took to paint the scene.

Hiding the "Animations" category when profiling QtQuick 1 makes no
sense as we also don't hide the JavaScript category or any of the
commercial addons which are only available from QtQuick 2. As QtQuick 1
is deprecated we keep hiding the Painting category when profiling
QtQuick 2 to reduce clutter in the UI for the more common case.

Change-Id: I0e14fab8abf427dc1abb6d00874e7e4af0fa30e5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-03 12:06:40 +02:00
hjk 1fd24aa8b7 Debugger: Maintain slider position in watch view
Setting column width seems to reset slider positions, needlessly.
Work around.

Change-Id: Ifa6c6a204dd2fbd7ad3dada0c386b697ae7a4100
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-03 11:13:44 +02:00
Orgad Shaneh 0544f9dd05 Git: Replace findRepository with VcsManager::findTopLevel
Take advantage of its cache

Change-Id: Ibf3b3b59821a92cd4475c6f8d6dd8212983d5c96
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 11:04:49 +02:00
hjk 166c1f51a4 TextEditor: Pimpl TextEditorActionHandler
It's "exported API"

Change-Id: I9830ff4637a2b3191bb8a3ea83c9ce532e5ab0d9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-03 10:51:06 +02:00
Tobias Hunger 98576d86b9 SDKtool: Remove duplicate condition
Change-Id: Icf44c2069b593bb3289b55510f51733d53e7507c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-03 10:47:16 +02:00
Orgad Shaneh a0c7b208cc Git: Factor source directory resolving to a function
Change-Id: Ica2f6ad01052fb7130397740fcf2396de7cbbf9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:46:39 +02:00
Orgad Shaneh 9b11b0ef39 SdkTool: Do not create additional path
Passing "-s test" created test/test

Change-Id: I9cf5635596ea3361cde9142df6524dd684e062de
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:46:29 +02:00
Orgad Shaneh 1e8047877f SdkTool: Fix capitalization
Change-Id: I1085dc89216ad37019227c967ddddbe999486cb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:43:13 +02:00
Orgad Shaneh ea63b2a6fc Debugger: Make doctype consistent with other settings
i.e. "QtCreator" + filename

Change-Id: I797f86d2266b3e0a612f1b377edc8bdf90914776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:40:10 +02:00
Christian Kandeler 631dd3af6b Core: Add missing gui-private dependency to qbs file.
Change-Id: Ifc452492735ee69f3f242a2cbe6eaa164ea2dfe5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-03 10:33:20 +02:00