Commit Graph

39053 Commits

Author SHA1 Message Date
Ulf Hermann
db5131d1ad QmlProfiler: Remove most of timelinemodelaggregator
Change-Id: If56940133b54905700fd51feac61d097677002c2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 13:14:26 +01:00
Ulf Hermann
b1f4f56e99 QmlProfiler: Reorganize timeline into rows
This potentially allows us to use different views for different
categories and reduces the reliance on TimelineModelAggregator.

Change-Id: I486481599d1517abc0087c565358f27405e4108b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 13:14:18 +01:00
Ulf Hermann
3780afc1e0 QmlProfiler: Fix timeline range selection
The timeline did not jump back to the selection when the selection
range detail window was clicked and an error was triggered when it was
closed.

Change-Id: I2de5788a184f2958a07ad39a3a0f298667d9783f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 11:45:04 +01:00
Kai Koehne
aac92c84d4 Use systemProxyForQuery() everywhere
For generic Unix, Qt automatically picks up http_proxy since
Qt 4.8 (commit 2ec929a2b). It also picks up e.g. https_proxy etc,
so it's better to rely on it.

On OS X we want to use the system proxy settings, that allow
also more advanced configuration like different proxies for
different services, passwords ...

Change-Id: I72de5e576e4d34d87f4c787bb597db0ca59a70e1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-05 08:51:02 +01:00
Alessandro Portale
cd76a574b1 Qt Quick Compiler Support: Warn if no compiler is available
If the Qt Quick Compiler binary is not present in the binary tools
directory of the Qt version, display a warning.

Change-Id: I739b1f71dc53aca9cf00e6ffd15246184d89816b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-04 16:58:12 +01:00
David Schulz
8f9e74b93c Debugger: Re-enable the Remove All Expression Evaluators Action.
Also adding a confirmation dialog that prevents accidental
triggering of that action.

Change-Id: Ib1c496e34edfa0f869737559aff5b0b24da9ae64
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-04 11:11:33 +01:00
Eike Ziller
f5933839ee HelpManager: Use QTC_ASSERT
We have many conditions where we return empty default values when the
help engine is not yet set up. These deserve a warning.

Change-Id: Ib7235d344f93ab7a6e2e0ee126c3593818b8a8b0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-04 09:55:26 +01:00
Christian Kandeler
1a24007a7b ProjectExplorer: Fix qbs build.
Change-Id: Id475d451637a387734d1943ec651d8ec8054443e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-03 17:20:28 +01:00
hjk
d9a527f8ad Debugger: Fix QV4::Value dumper
Only 64 bit for now.

Change-Id: I622ff5ab8632a73901e83f5331dcd2c3ea129d3c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-03 15:57:36 +01:00
Daniel Teske
4943510b60 Completely rework currentNode/currentProject handling
Centralize the handling inside a new class ProjectTree.
React to moving focus and remove most special handling.

This properly fixes the linked task.

Task-number: QTCREATORBUG-13357
Change-Id: I6b06aa32b1e4305ec8a6d432857b302585d8734b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-03 12:36:20 +01:00
hjk
042ef1aec0 Debugger: Make "debug last debugger command" available for cpp+qml
Change-Id: I0fe8025efc519def5cdd837a18928474ce7229cd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-02 10:41:09 +01:00
hjk
a4a7a4b25f Debugger: Add command for simpler dumper reloading
... to facilitate shorter round trips in dumper development.

Change-Id: Ie457293fd137528d74008fc11137b47d92f3859d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-02 10:40:10 +01:00
Eike Ziller
d341c48246 Merge remote-tracking branch 'origin/3.3' 2014-12-01 15:44:30 +01:00
David Schulz
d93afdeda5 Debugger: Add MSVC runtime module name for VC 12.
Change-Id: I856ed20ad1df493dd430ebf1d0043e57bb9f14f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-01 14:02:35 +01:00
Cristian Adam
34a48645c5 Perforce: Nicer repository log
Use "p4 changelists" instead of "p4 filelog" to get the
repository log.

Task-number: QTCREATORBUG-13526
Change-Id: I86e596b6fa7cf24df33a809ab9b44d3adae42ff5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-01 13:42:51 +01:00
hjk
762a3e6e4c Qnx: Introduce QnxDeviceProcess
This is helpful for more selective and direct process killing.
Previously, all processes with a given name were killed, and
in some cases stale awk and grep processes were left over.

Change-Id: I4fb3999818062b8c1fdf7dca8a337ef9c158be9b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-12-01 12:56:14 +01:00
hjk
b28d1525eb ProjectExplorer: Move environment "Batch Edit" button up
It was often enough below the visible area of the view
and people did not notice it exists.

Change-Id: Ie1427c3cb90b6d4a200a17cf51402aabc51de7e7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-01 12:03:33 +01:00
hjk
8fdce7cdac Debugger: Disable QVariant(KeySequence) dumper for LLDB
This triggers errors in LLDB
  error: main.o Parsing a die that is being parsed die:
      0x00001ddf: DW_TAG_subprogram operator void *QMetaObject::Connection::*
  error: main.o Parsing a die that is being parsed die:
      0x000100fa: DW_TAG_subprogram operator QObjectData *QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::*

Change-Id: Iae6a8ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-01 12:03:17 +01:00
Leena Miettinen
95afdf6c38 Doc: QML_PUPPET_MODE env variable
The variable was added for checking whether a QML plugin
is run in Design mode or by an application.

Task-number: QTCREATORBUG-12439
Change-Id: Iad99b7279c8191cb8b17ca81ff24fb9db731fdc9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-12-01 11:31:37 +01:00
Kai Koehne
47f9622e72 Fix QML watch expressions for v8
Fix syncing of watch expressions with Qt Quick 2. For v8/v4 we're
utilizing the 'evaluate' command, which we have to re-send on every
change to get updates. We therefore now call synchronizeWatchers()
whenever the stack changes.

Task-number: QTCREATORBUG-13473
Change-Id: I7356e9518a719839c5cbb6e518be18e665078e85
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-12-01 10:03:43 +01:00
Alessandro Portale
245ea90817 Qt Quick Compiler Support: Only allow valid settings
If the Qt Quick Compiler binary is not present in the binary tools
directory of the Qt version, disable the checkbox. A warning will
be added in the next minor version, sind we already have string
freeze.

QML debugging does not work when using the Qt Quick Compiler. So,
in case the Qt Quick Compiler is checked, let's disable the QML
debugging checkbox.

Change-Id: I739b1f71dc53aca9cf00e6ffd15246184d89816b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-12-01 08:45:22 +01:00
Robert Loehning
06a47dd56c Version bump
Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-28 16:55:15 +01:00
Christian Kandeler
35e3616d6f Update qbs submodule.
To HEAD of master branch.

Change-Id: I6e62d9a192a69c7a7c259dfc14fea0bb1a79008f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-28 16:41:41 +01:00
Christian Kandeler
b1dab65340 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I633185f4c62a2290367f5a232c5ca7f818a36377
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-28 16:17:41 +01:00
hjk
bf9a3b2020 Debugger: Fix LLDB reference display for LLDB 320.x
There is seemingly still no proper API for that, and
the old hack broke. Use a new one.

Change-Id: I9e638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-28 14:55:03 +01:00
Ulf Hermann
55a6050f37 QmlProfiler: Use ClosedHandCursor for dragging categories
It fits better to the OpenHandCursor we show when not dragging.

Change-Id: I6d3d635b4d56dc0b6e5baa502722cac045e2e6e2
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-28 14:29:01 +01:00
Leena Miettinen
16c3745da4 Doc: update QML emulation layer options
A check box was divided into two radio buttons.

Change-Id: I0439e038be2508a62811a5200c10a07367e85576
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-28 14:25:58 +01:00
Nikolai Kosjar
9ccb6b81c9 CppTools: Fix include hierarchy for clang code model
This makes the editor document snapshot accessible through
BaseEditorDocumentProcessor since we need it for the include hierarchy
if the the clang code model is activated.

Task-number: QTCREATORBUG-13553
Change-Id: I7214cc578d05fe5cad6e12b4d29fe6f840a88e8d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-28 14:20:29 +01:00
Nikolai Kosjar
488bf91797 CppTools: Always check for a valid BuiltinEditorDocumentParser*
This fixes a crash if the include hierarchy sidebar is invoked with the
clang code model. BuiltinEditorDocumentParser::get(editorFilePath)
returns 0 in that case.

Task-number: QTCREATORBUG-13553
Change-Id: I9292691c8156bdaaffcac1c3864201ba8a6cbdef
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-28 14:20:23 +01:00
Nikolai Kosjar
2fc4acbc35 CppEditor: Avoid duplicate "Add #include XYZ"
Task-number: QTCREATORBUG-13422
Change-Id: I3648bf44760fdac4e8e1e79652519136af6032c8
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-28 14:01:10 +01:00
Nikolai Kosjar
c58b029319 CppEditor: Tests: Refactor out BaseQuickFixTestCase
We will add another type of test case that allows us to test the list of
offered operations.

Change-Id: I528b3844181c139c8955091ac0bbcf6475fd8a4f
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-28 14:00:58 +01:00
hjk
315fb0372e Debugger: Add more reference related autotests
Change-Id: Iae638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-28 12:48:28 +01:00
Christian Kandeler
6595c0a9d1 Catch exceptions by const reference.
Change-Id: Ic537fd123478a4f8fe4e54736d444fa64fd62d9c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-28 12:01:41 +01:00
Ulf Hermann
f8e8d14bd4 QmlProfiler: Don't draw note markers for hidden categories
Change-Id: I6a2104522896fafb70d09c5872cb9641f45db5f4
Task-number: QTCREATORBUG-13533
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-28 11:24:05 +01:00
Christian Kandeler
ee45dc6db5 QbsProjectManager: Put internal classes into the Internal namespace.
Change-Id: I5fa1ce2ed709b7904a0b2701133794751e5e2119
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-28 10:44:33 +01:00
Christian Kandeler
c547af4dad QbsProjectManager: Use tr() for translatable string.
Change-Id: I90bea6d1ef3e4584db5b5140d7ccb7b7c7ca529f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-28 10:40:31 +01:00
Friedemann Kleint
1adb88d2bd Introduce environment variable pointing to shared location of .user files.
Query variable QTC_USER_FILE_PATH for the path and store .user files
there under a tree replicating the project path excluding root.

Use cases:
- Developers working with nightly, clean builds of Qt / Qt Creator.
- Keep the  .user files out of the example directory when creating
  examples for bug reports.

Change-Id: Ib80c5fab3cc943317ec080eba8a6b92c16fc1aed
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-28 10:25:00 +01:00
David Schulz
796fdb82cb Editor: Fix highlighting of xml values.
Do not use the hardcoded value in the xml highlighter file.

Task-number: QTCREATORBUG-13538
Change-Id: Ie79f46e2ab31caf01c0ab58097756141691761f0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-28 07:16:14 +01:00
Daniel Teske
b871b901ba ProjectExplorer: Fix crash on deleting kit from new dialog
Task-number: QTCREATORBUG-13499
Change-Id: Ibcd591620469abf56270cc512de1583900ce78e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-27 18:43:29 +01:00
Thomas Hartmann
da3b7a6c4a Theming: Fix styling of TargetSettingsWidget
If using the flat style also the TargetSettingsWidget should be flat.

Change-Id: I16147c9868e3e949a4d9aa0fedf85358504bde9e
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-27 17:19:23 +01:00
Ulf Hermann
e0d06f8681 QmlProfiler: Make TimelineModel usable from QML
Make the relevant member functions Q_INVOKABLE and properly notify
about the height change when data is loaded or cleared.

Change-Id: I7c1ee70942617af2045b84a2d8f0ab2adef72f52
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 16:09:34 +01:00
Ulf Hermann
0464c87773 QmlProfiler: Don't change row count if a model is hidden or empty
This reduces the complexity involved in making the row count a
property. Empty models do have rows like this, but don't have a height.
It doesn't get much more consistent than that. Before empty models
didn't have rows but you could still query the row heights. Having
height == 0 is very helpful for assembling the UI, rows == 0 not so
much.

Change-Id: I38ee9f46751a4beb288578d5cd1f0a17ea08814a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 16:09:27 +01:00
Ulf Hermann
7f7ebadae1 QmlProfiler: Move timeline prev/next functions to models
That's where they belong. Having them in the view makes no sense.

Change-Id: Ia2a6c8b02804ed8a1e10b0731cd62b6fd6489b0c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 16:09:19 +01:00
hjk
0dc99f568a Debugger: Handle remote setup failure in remote state transitions
Change-Id: I72886a309f1531c652186d529111d90ff3f98c37
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 15:27:01 +01:00
hjk
f2e7ec6e3f Debugger: Fix parsing of single-shot breakpoints from GDB response
This can be manually triggered by entering e.g 'tbreak file.cpp:1'
in the debugger input pane.

Change-Id: I8212e82d258bb488fc1848e7d7e3e9ff5a3cae88
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 15:14:10 +01:00
hjk
804497c32c Perforce: Limit log length even further
... and cut at the right end.

Change-Id: I89905baa86c89946d6d56aac82bca539bc705f55
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 15:14:02 +01:00
Nikolai Kosjar
c7c8f88303 Valgrind: Do not put html links in clipboard
...but plain, canonical and absolute paths if possible.

Change-Id: Ib559f00a55646929b2e548e7e671c1cb5e1d4a79
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 15:06:08 +01:00
hjk
c5d86757a1 Debugger: Fix engine state after "unreasonable jump requests"
After attempting to jump to an inaccessible location, the
engine was still expecting a ^running, while in fact GDB
was stopped. Add the right state transition.

Change-Id: I69aec785a1e9d2a23771f74ae35064ae61405fa5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 14:52:20 +01:00
Christian Stenger
28fb4cc015 Qnx: Fix plugin unit test
Change-Id: Ia5a16eba656190ee904f00290b23b5108e27d8b3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 13:58:27 +01:00
Marco Bubke
c53a8da3a1 Honor Rule of three (or five) in the class wizard
It is very often a mistake to define a destructor without a copy (and move)
constructor and assignment operator. In C++11 no move constructor and
assignment operator will be generated if a destructor is defined. So it is
better to omit a lonely destructor in out template.

https://en.wikipedia.org/wiki/Rule_of_three_%28C%2B%2B_programming%29

Change-Id: If911556f872d878939f0f2fcaa974494a4df8a8a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-27 13:50:35 +01:00