Commit Graph

40514 Commits

Author SHA1 Message Date
Orgad Shaneh b9ea484305 TextEditor: Fix unused variable warning on release build
Change-Id: Ia773f4cc69f9554caeb78c1380ddf69095684000
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-13 05:42:56 +00:00
Orgad Shaneh 18a5d019c0 Git: Fix suppression of git status command
Missed in 808f4492c5.

Change-Id: I8760ab9fa897d708423b21c34771d5275f87d1d7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-04-12 11:35:48 +00:00
Nikita Baryshnikov 1d23de641f GitClient: fix diff when committing
When a commit has several files, opening diff for the first file
works, but trying to open another diff without closing the previous
one doesn't refresh the diff editor.

Change-Id: Ia973cb70f2355a89b70787dd97042ef9f751d9d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
2015-04-12 09:56:56 +00:00
Christian Kandeler 7da95de7b2 QbsProjectManager: Take the file type into account...
...when rebuilding the project tree.

Consider this product:
CppApplication { files: ["form.ui"] }

Now change it to this:
QtGuiApplication { files: ["form.ui"] }

The qbs file tags will now include "ui", so the Qt Creator
file type must change from "UnknownFileType" to "FormType". Therefore,
we need to replace the respective file node in the tree.

Change-Id: I6aa7e66d1af584e8ded2ffbb9b1215e8fc1135b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-10 20:52:51 +00:00
Ulf Hermann 941356be76 Timeline: Don't delete the models from TimelineModelAggregator::clear()
The aggregator doesn't own the models. They may live in separate
plugins and should be cleared from the code where they are created.

Change-Id: Icbde117561e530bd83fe752acd483e2c42692a1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-10 16:40:37 +00:00
Christian Kandeler 8ed3973aad Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I989d723fcaf718d3502ee9047e9dd6048013244f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-10 16:10:55 +00:00
Daniel Teske f978f6a54b Custom Executable RunConfiguration: Esc should close dialog
Change-Id: Ifaa4d87c73d2597a018d867f3c081113132e76ee
Task-number: QTCREATORBUG-14202
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-04-10 14:57:58 +00:00
Daniel Teske 763c4267e0 CMake: Tweak detecting of right project part
Don't consider targets that end in _unittest or _automoc. Also don't
read CMakeDirectoryInformation.cmake as that doesn't work with
add_subdirectory.

Change-Id: If06af60e1637e94cccd32d09fc26c6b87488671b
Task-number: QTCREATORBUG-12183
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-10 14:57:45 +00:00
Christian Kandeler 511436e60c QbsProjectManager: Emit the fileListUpdated() signal...
... after adding and removing files. We need to do this for qbs because
in contrast to other build system managers, we have optimized away the
re-parse step.

Change-Id: Iec217819621696081d6e8b87ef48be0be681372c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-10 14:36:32 +00:00
Leena Miettinen 7980538ef4 Doc: sidebar view context menus
Update the screenshot, because the icons have changed.

Change-Id: I55e46f8f01d293021914fd28c1e7f7d83d8bde11
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-09 13:59:52 +00:00
Ulf Hermann 153a57ce80 Timeline: Test parenting of equal start times
If you insert events with equal start times in a way that the model can
not reorder them by their end times the parenting follows the indexes,
not the end times. This has caused confusion multiple times and it's
good to test it.

Change-Id: I3e9ba212ff377dc2afa2a2893637bb55edebafea
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-09 13:41:51 +00:00
Leena Miettinen e112647397 Doc: fix capitalization of BAR Descriptor
In the Issues output pane filter.

Change-Id: I3283628f74dd48c2e95eeedad93ce28f1686c25f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-09 13:17:55 +00:00
Christian Kandeler bcc4ab301f ProjectExplorer: Fix FolderNode::addNewInformation().
We should use the actual display name of the node there, not some
hardcoded value.

Task-number: QTCREATORBUG-14240
Change-Id: Idf0fc4cdaab52d7f838d3d48d834a89b55ee593f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-08 15:12:47 +00:00
Leena Miettinen db48c49af9 Doc: add a "commercial" icon to commercial-only topics
For purely commercial apps, this is done by using the
template, but Qt Creator is mostly open source, so an
image is used.

Use a \commercial macro with a tooltip and link to the
image.

Change-Id: I5e3df953821551331afef2ec642b482b52ff909e
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-04-08 10:45:50 +00:00
Leena Miettinen 8c472f2074 Doc: experimental Auto Test plugin
Commercial only.

Change-Id: Id2ee9a7765f226c32ec1595e32f4b53ee94d1207
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-08 08:13:08 +00:00
hjk d15e4ff2c9 Debugger: Replace block access to array data by plain loop.
This makes the GccExtension dumper test pass with GDB

Change-Id: Ia1319e878416bea8b162a1a9eef1271cb7bebc63
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-08 05:31:27 +00:00
Orgad Shaneh 67e8d3689e C++: Remove unimplemented function in LookupContext
Should have been removed in fbb756cd.

Change-Id: I86e0fd556ac031e6a88e9397a039d67ded5f7bd7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-07 14:48:24 +00:00
Raphael da Silva Couto a2c770f324 Android: Increase timeout running android.bat
At some cases, android.bat on Windows running longer.

Change-Id: I53ae90e4d7fea69b603cf8cca8c1f8ee5aa36a6a
Task-number: QTCREATORBUG-14223
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-07 12:52:40 +00:00
Christian Kandeler 96c78e6221 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: Ib37e757f5b90db01fdc6d77a21556f214e776aa0
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-04-07 10:04:11 +00:00
Ulf Hermann c185a15c28 QmlProfiler: Make message boxes always 300 pixels wide.
Sometimes the text would not fit and constantly resizing them is ugly
anyway.

Change-Id: Id1136ae3b2d2f339ff6f4302b45794201221e6c4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-07 09:13:43 +00:00
Nikolai Kosjar f0d891758a CppTools: Update project part structures consistently
When the configuration (defines and includes dirs) did not change, we
only updated the m_projectToProjectsInfo data structure, but not the
others (m_projectFileToProjectPart, m_fileToProjectParts).

Change-Id: I0ca235ea4bbe4556bd8b6d36897dedd6482f86a0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-07 08:03:15 +00:00
Nikita Baryshnikov 27aad7dfca DiffEditorManager fix typo in assert
Change-Id: I8582fdb790f5541263eb17d1fa9418c3a48f88f6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-06 12:44:03 +00:00
hjk bfac365ebb Debugger: Fix parameter passing to LLDB dumper tests
Change-Id: Iae342ffe68385de877c7a1e9a7e61e7d4889f731
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-02 14:56:32 +00:00
hjk 3417ffad83 Debugger: Make QHash dumper pass again
Failures were due to version specific reordering. This is still
checked in cases h1, h7, h8. Simplify maintanance by removing the
check in the other cases.

Change-Id: I481672e693f6370c75bc4739d6cca937b9f027ea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 14:07:30 +00:00
hjk e6f73164c3 Debugger: Adjust QVariant2 dumper test
Take new QPolygon{,F} dumpers into account, also make QUrlPrivate
field accessible,

Change-Id: I2b5c122895c3ee389ba939eaeffcd613fa206009
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 14:07:24 +00:00
Christian Stenger 4deadb5f8b Dumper: Test: Fix execution of dumper tests for LLDB
Change-Id: Id4f437fe17d7989c15ad223c20605773411a1142
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-02 13:57:27 +00:00
David Schulz 28c06b5b58 Test: Dumper: Adjust QVector test to cdb output.
Change-Id: I2da7f4b21251e1417efaf20813ce260ea286b1f2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 13:24:37 +00:00
Robert Loehning 02b521a8ff Squish: Fix reading tooltips in tst_qml_editor
Change-Id: Ie65752d2c8c87c3802c810b98ffe7b122549c762
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 13:09:03 +00:00
David Schulz 8548343ef4 Test: Dumper: Fix Compilation and adjust cdb output of "BigInt" test.
Change-Id: I8ecfd77cd72e155e291acdc96fcbfd49572c91e3
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-02 13:07:30 +00:00
hjk 3658bdac89 Debugger: Use primitive internal widget instead of matplotview
This practically removes any functionality beyond plain plot display,
but does that at least reliably, cross-platform, without dependency
on 3rd party python packages.

Change-Id: Iaff2f78595394522f32264c642df20dd48b83f8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 12:25:04 +00:00
David Schulz 3e82dcad44 Cdbext: Dump "(null)" for an uninitialized QTimeZone.
Change-Id: I13c0541bad047aa872bdb04f50e6cd0557a40f1a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 10:43:58 +00:00
Christian Stenger e152e06f42 QmlProfiler: Fix missing declaration
Change-Id: If783fe330bccd19140dd916c42dfe7f424b68a85
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-04-02 10:36:29 +00:00
hjk 879bb9adcf Debugger: Remove comment on broken GDB 7.2
We require 7.5.1 now, so the case is uninteresting.

Change-Id: I40bf1c3d531b83998a45e7476ed48397b23b4ae6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 10:34:02 +00:00
Ulf Hermann b1ee6ee80c QmlProfiler: Show a message when V8 profiler is not supported
People frequently wonder why the V8 pane is empty and disabled. This
change makes it more explicit.

Change-Id: I381bff072840dde1fdd038b3d00dd3a400261bc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 10:16:19 +00:00
Ulf Hermann ccbe4ee0f8 Timeline: Properly position range detail window titles.
This way they get elided correctly.

Change-Id: I924679bd0f985f621fc62b152f3a4536e48e4492
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 10:16:12 +00:00
Ulf Hermann 14eb13e995 Timeline: Enforce a minimum width for detail windows.
We don't want to resize them to absurd dimensions.

Change-Id: I7f824919052c6740f291d2b0266fd009da99fd53
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 10:16:07 +00:00
Eike Ziller 4b6c5536d7 Add change log entry
Change-Id: I1298cf303d05cf59d3f21da6c602af4e0abe8e3f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-02 10:15:43 +00:00
Eike Ziller fd0b383932 About Plugins: Fix sorting by "Load" column
Change-Id: I705a717ff13e23bafcffb0d41edceab95d3607e6
Task-number: QTCREATORBUG-14107
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 09:53:06 +00:00
Kai Koehne 46fc33d914 Don't mix iterator and const_iterator
This avoids unnecessary detaches of the Qt container data.
The mismatches where detected by defining QT_STRICT_ITERATORS;
however, this define violates the ODR (causing linker errors),
and therefore is not added permanently.

Change-Id: Idd336a9c8b394214a820437ef1b92d2101f6101c
GPush-Base: 62b0848b9c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-02 09:40:24 +00:00
Leena Miettinen 87e01423c9 Doc: Add documentation for CPU Usage Analyzer
Change-Id: I306a009dceba74707b5802b18451c7ae912adac9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-02 09:05:19 +00:00
Marco Benelli a212b1f745 Fixed wrong behavior of "Move Component in Separate File" for qml.
The dialog accepted/rejected value is now checked.

Task-number: QTCREATORBUG-14175
Change-Id: I9a39c0cf87b7e11613a333b2d3a63b77e39b6d97
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 07:10:09 +00:00
Christian Kandeler 7aa8ae54ae Device support: Serialize SSH options.
We forgot to do the serialization when the options member was added to
the SshConnectionParameters class.

Task-number: QTCREATORBUG-14205
Change-Id: Id79a2b585d8e00abd5389ccf40821af342a30c30
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-01 15:02:04 +00:00
Robert Loehning 1d0e61a52c Squish: Work around items not expanding
Task-number: QTCREATORBUG-14210
Change-Id: I64e5b53c5cb82b961ec100d73f0987d79d68f5b4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-01 11:12:29 +00:00
Orgad Shaneh 0501efdcd9 CppTools: Add a failing test for explicit template base typedef
Task-number: QTCREATORBUG-14218
Change-Id: I1cccc522f0d484e966f97bea86236e83caec754a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-01 09:45:24 +00:00
Orgad Shaneh 55ed8b861b CppTools: Add 2 failing tests for double pointer indirection
... when resolving specialization

Change-Id: Id3b673fa0c85b13f9a3b4bda022ef2ff18d4c2ac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-01 09:42:42 +00:00
hjk c12593efc4 Debugger: Show unsigned chars as unsigned values
Task-number: QTCREATORBUG-13809
Change-Id: I5dbb85c44cdc801edee1f33bc0c0cf47ec9916a3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-01 09:30:56 +00:00
Nikolai Kosjar d4abde4cba Clang: Offer snippets only for global completion
Task-number: QTCREATORBUG-14181
Change-Id: Ib9eee53f5398cb13643871d862876f329a2fd9ae
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-01 09:26:12 +00:00
Eike Ziller 841046aeda Version bump
Change-Id: Ie12f7ab510b6d9857772df9f36c99e72b8766520
2015-04-01 11:24:41 +02:00
Thomas Hartmann e3c941e285 Fix indentation for reparenting
If nodes are reparented this can have side effecs on otherwise
untouched nodes. Before this patch untouched lines were not indented
and the indentation was messed up.

With this patch we indent the complete file if nodes get reparented.

Task-number: QTCREATORBUG-14014
Change-Id: Ib6e20bb9e31444e81428d25d39c431de2dc632de
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-01 09:18:23 +00:00
hjk d66e063165 Debugger: Make C array data plottable
Change-Id: Ib4519f0e64504ec0e3dccd89978acca5134b2932
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-01 09:09:43 +00:00