Commit Graph

32962 Commits

Author SHA1 Message Date
Nikolai Kosjar
65bb5856d0 CppTools: Do not append '/' to fallback header paths
...since this will confuse the completer.

Task-number: QTCREATORBUG-13567
Change-Id: I4172d433f23f3907690d4c00f92fadb68fa354e8
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-15 14:33:52 +01:00
Ulf Hermann
d7206ee3c3 QmlProfiler: Rename qmlProfilerModelProxy to timelineModelAggregator
This makes it much easier to deduct where it's coming from.

Change-Id: Ica85e1df0a03a01c1b319b3523fb5746e6c2d8f8
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-15 14:25:04 +01:00
Christian Kandeler
74ec0c5b7c Update qbs submodule.
To HEAD of master branch.

Change-Id: I42e09c101bb5cfcb170c09570568b88523396ab4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-12-15 14:16:05 +01:00
Ulf Hermann
6239de07a4 QmlProfiler: split notes model in generic and specific classes
Change-Id: I633dc6a862f344a7e5e86c25e44e400e3000f644
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-15 12:57:27 +01:00
Ulf Hermann
67e515aec6 QmlProfiler: remove useless notesChanged signal from aggregator
Change-Id: Ifebd60a24b3e07702ca603425b5133e9a23557c5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-15 12:57:22 +01:00
Ulf Hermann
dcbd4ac1c6 QmlProfiler: Use generic timeline classes where applicable.
Change-Id: I7bab7b20f3467f000a7ba4917919caa8f15ecf22
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-15 12:57:16 +01:00
Ulf Hermann
13c5cee372 QmlProfiler: Untangle QML code
Split it up into some more files and remove all implicit cross
referencing by ID.

Change-Id: I3f829d6701906b1b054d18680d9e670b35b1716a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-15 12:57:09 +01:00
hjk
56a5ac367b ProjectExplorer: More direct update of runconfiguration data
The signal is not needed.

Change-Id: I6dd059fee64438da65cc9a32d42ab0e451763c86
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-12-15 12:24:13 +01:00
Orgad Shaneh
2022a18f90 Debugger: Improve initialization time
* Avoid QFileInfo where not needed
* Use a more accurate filter for QDir::entryList()
* Remove duplicate paths
* Set filters and filter types only once.

Reduces startup time by ~3%

Change-Id: I8896c08da5281e06672b7bdf6e8305ea394122a3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-15 09:26:28 +01:00
Nikita Baryshnikov
0257665901 NodesWatcher remove friendship to all Nodes
Since signals in Qt5 are public

Change-Id: I316105ba0d15efb5a041285f948a0843dd8322f8
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-15 08:33:51 +01:00
Nikita Baryshnikov
74c0409d35 Clean up ProjectTree
Denoise namespaces, remove redudant QObject include access to static
instance in nonstatic method

Change-Id: Ic54cd0da90e72a981394996fccd74053a11352e0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-15 08:27:58 +01:00
hjk
e8396f4c8d Utils: Simplify tooltip architecture and cleanup
This mainly merges TipContents into the the actual
tooltip labels.

Change-Id: I64b576c987bce034842f7e3f324b81595dae0713
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-15 08:24:31 +01:00
Christian Kandeler
ef5a784f95 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I1778a3405963768126ea8ab5535a3fc4b8db5d1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-12-12 16:53:50 +01:00
Eike Ziller
e07f33db93 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	doc/src/editors/creator-coding-edit-mode.qdoc
	doc/src/qtquick/qtquick-creating.qdoc
	qtcreator.pri
	qtcreator.qbs

Change-Id: I46e5e35419d2871f455f1df8094c5438d34e570b
2014-12-12 13:42:42 +01:00
Christian Stenger
49b1fd133a QmlProfiler: Fix compile on OSX
Change-Id: If875b290dcdd2974a7e28dcc37e068e775a986d7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-12 12:42:40 +01:00
hjk
20396d7809 Debugger: Use Python for GDB stack extraction in native mixed mode
Change-Id: I7ca4a080c9b5e5992f44e5f3d8aa5af7296abe99
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-12 12:36:41 +01:00
hjk
bf9b63174e Debugger: Introduce a "Native Mixed" switch
This paves the the way to mixed QML/C++ debugging
through the native backends. Currently this requires
QTC_DEBUGGER_NATIVE_MIXED to be set in the environment.

Change-Id: I126ad945e84806f3b548408318007351628c912f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-12 11:17:58 +01:00
Ulf Hermann
ef064154a4 QMLProfiler: Use scene graph for painting events in timeline
By using the scene graph we can retain the geometry for events in
the timeline on the GPU and potentially speed up the rendering for
large amounts of items.

Change-Id: I2cfbb8ef4ebc7b56f1977ec1facb4f2e7f2002ee
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-12 11:01:51 +01:00
hjk
62d21d123c Debugger: Remove traces of outdated attempt at combined stepping
Has not been usable for a while and will be superseded by
"native" mixed stepping.

Change-Id: I2902a98b7ad4e4b29e389e54fb6488bf711840dd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-12 10:53:43 +01:00
Eike Ziller
27d34cd00b Fix that locator filters filter did not show entries with same prefix
When setting filters to the same prefix, only one of them was shown in the
locator filters filter (i.e. the in the first entries shown when opening
locator without any input).

Change-Id: If409b5d4292d865318747f2a09610652a80757ca
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-12-12 09:55:28 +01:00
Eike Ziller
c126e7075b Find: Avoid warning
1. open a text editor
2. open find
3. close editor
4. move focus between e.g. project tree and empty editor area

It was trying to highlight all occurrences in the empty editor area.

Change-Id: I59e344f977970290c7fd816951c1bdc150dae783
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-12-12 09:40:31 +01:00
hjk
7e8fb3a9e9 QmlProjectManager: Disable by default
It's not the preferred way of operation nowadays and harms startup
times. People who find the plugin useful can still enable it.

Change-Id: I8328f8e8085103d4469bbd7016b86218b4b238b7
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-12 08:32:27 +01:00
Eike Ziller
ed49e1347e Do not switch to design mode from search results
Change-Id: Iae10b8e10707cbc62bbd53109cbfb12ed1540536
Task-number: QTCREATORBUG-12028
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-10 17:26:22 +01:00
Eike Ziller
a6596a6cfb Fix codec that is used for project search.
The project's editor configuration is only used if it doesn't fall back
to global. In that case we need to use the global setting manually.

Change-Id: If31c06f07e80b37fc148ed118a33ed653214ef6e
Task-number: QTCREATORBUG-12693
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-12-10 17:22:27 +01:00
Daniel Teske
5bfd31f09c Fix before exit crash in ProjectTree
When there are 2 top level projects in session, crash happens in
foldersAboutToBeRemoved as currentNode() not properly updated and it
points to previously unloaded dangling node.

Change-Id: Ie3f88bdd03ec042ff1cce6712ed923465c902701
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-12-10 17:16:50 +01:00
Jake Petroules
a57d517202 Fix null pointer dereference in QbsProjectManager::updateBuildActions.
Change-Id: Id7360d123b580d8b819586fb7bcd7f35cfb2b485
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-12-10 16:29:37 +01:00
Eike Ziller
541d00453a Merge remote-tracking branch 'origin/3.3'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
2014-12-10 13:20:02 +01:00
Christian Stenger
f8a68cc69a CPaster: Fix usage of kdepaster
Network protocol changed to use https now and xml api is no more
working - switched to json api.

Task-number: QTCREATORBUG-13580
Change-Id: I9d2b4738db1130b6f123b354095fbb4d89bf9855
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-10 12:06:23 +01:00
Daniel Teske
e815f48f17 Utils: Fix bug in commonPath() with directories
The algorithm expected a list of filenames, but the cmake plugin passed
in a list containing a directory and a filename. Appending a slash to
each entry. (Except root entries.) fixes this.

Task-number: QTCREATORBUG-13606
Change-Id: I518a2601295017636f4c450cc8a9026f4b41689a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-10 11:52:21 +01:00
Orgad Shaneh
1f48f7205d Theming: Remove unneeded QPalette::All arguments.
That's the default.

Change-Id: Icf1749868f9a659b2c8b631b3c40cbde559e9d19
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-10 11:09:56 +01:00
Ulf Hermann
7659159017 QmlProfiler: Constrain the length of painted events to the visible area
When overpainting, some note markers won't be visible.

Change-Id: I7888d43e8b1e3503b7a90e773e9c8138b70070f0
Task-number: QTCREATORBUG-13534
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-09 11:10:35 +01:00
Orgad Shaneh
62b70fb239 Revert "StyledBar: Explicitly set fixed height"
Breaks multirow bar.

This reverts commit cc035a59b1.

Change-Id: Id0e056d9a9736c8700161f81fe9b482c26ec2259
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-09 08:32:55 +01:00
hjk
a06626b28c Debugger: Use mostly Qt5-style connects in debuggerplugin.cpp
Change-Id: If1230268ac558a8d7837d919e122fae4dff7097b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-08 16:56:23 +01:00
Eike Ziller
2825cc7ce1 Locator: Remove outdated internal documentation.
Change-Id: I17bc8f27ad3c79a5520a227fd32636f4849ba99f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-08 15:19:10 +01:00
Daniel Teske
d36c4d87db QtSupport: Fix wrong build directory for examples
By partially reverting 92fbbaea9b

Task-number: QTCREATORBUG-13630
Change-Id: Ia04a224f2a12839d2cf27828009c945383a4c19c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-12-08 13:58:49 +01:00
Rafael Roquetto
b36c399272 QNX: Deploy only *.so.? libs
While on Unix systems, libQt5XYZ.so* are symlinks to libQt5XYZ.so.1.2.3, on
Windows hosts these files are copies instead of actual symlinks. Therefore,
when deploying from a Windows host, all the duplicates get uploaded to the
target, effectively taking a lot of unnecessary space.

Because Qt QNX apps link only agains *.so.? files, we deploy only those when
on Windows hosts.

Change-Id: I8f9f3f3a30d227b907f94f30ca47636dcb345eec
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-12-08 13:57:11 +01:00
hjk
6d6e8de4a0 Debugger: Use Python instead of GDB/MI to retrieve stack
This will be useful to create artificial QML stack frames.

Change-Id: I41cb87f8dea69d88695fea46a1ae2b0270cbec1a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-08 13:04:24 +01:00
hjk
50ad32a25b Utils: Start simplification of tooltip handling
There's a bit too much unneeded flexibility in there, requiring extra
boiler-plate code on the user side.

Change-Id: I34d03838fb1cd3182fcbb93bf65158ebfc7e2bce
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-08 12:56:12 +01:00
hjk
89115df9ba Make BuildManager::instance() return a BuildManager*
Change-Id: Ifc34124e267fc55d73e122a059efe12c3d289dc1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-12-08 12:32:09 +01:00
Daniel Teske
31f993a011 ProjectTree: Initialize bools with false not 0
Change-Id: I4c02763cea1936df931821bd3e9a0a6a62e2abe9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-08 12:13:01 +01:00
Marco Bubke
2ee9a06f4c Debugger: Use Core::AsynchronousMessageBox
Nested event loops can lead to crashes, so it is better to use a dialog
which does not have have its own event loop.

Change-Id: Icd2390c9026bc1ef88e72a570df5813fe5cbdaa2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-08 12:02:07 +01:00
Lukas Holecek
7e8db09c50 FakeVim: Set correct cursor shape if submitted search failed
Change-Id: I508ca523c70846924dc9b869ef105d273892e0bb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-08 11:39:20 +01:00
hjk
ec607055c4 Debugger: Be less eager on breakpoint synchronization
Triggering synchronization too early leads to unnecessary pending
breakpoints and complicates debugger startup.

Change-Id: Ic1c0064f29eaa325a110baf9b22ec6bf66a00a2d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-12-08 09:04:20 +01:00
Eike Ziller
877d482c85 Help: Clean up automatically registered documentation
It would keep documentation registered as long as the files are still
there, but that is actually not what is wanted. If you remove a Qt
version from Qt Creator, or switch between different Qt Creator
installations with different auto-detected Qt versions, the registered
documentation should be updated.
This also reduces the number of open files in these cases.

We keep a list of manually added documentation in the settings and treat
all other documentation as automatically managed.

Change-Id: I542f9aee0e62cab70db5afc5c6d6764d84cb253d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-08 08:31:59 +01:00
Eike Ziller
a1f8be4471 NavigationWidget: Add menu to split button
This is more consistent with the split button that we have for the
editors, and the default split behavior, which duplicated the current
view, seldomly resulted in what was wanted anyhow.

Change-Id: Iaba62151edbf11f6bbfaf45d68371532bff48dd5
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-12-08 08:30:24 +01:00
hjk
6a30fa9f53 Debugger: Fix uninitialized variable
This has caused GDB not to be started in remote scenarios.

Change-Id: I09351e10018cc4052bd80130f2e56ec94ff14965
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-12-05 17:53:53 +01:00
Jarek Kobus
95c13a230e Fix strings
Change-Id: I12e52c7e584d26205b98672a65257af5c55dda24
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-12-05 17:19:49 +01:00
Ulf Hermann
901da05def QmlProfiler: more precise event selection in timeline
Generate a score for each candidate event and choose the one with the
best score in the end.

Change-Id: I463e87d2e6cb4e182f7febda7182ae8abf304e04
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 14:15:33 +01:00
Ulf Hermann
c34ad1dc5b QmlProfiler: Don't modify height of timeline items based on row height
When precomputing all timeline items in advance we cannot react to
height changes later

Change-Id: Ib038fb59581fe8367c1c550839a728f371005ab6
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 14:15:29 +01:00
Ulf Hermann
6b08ff6bc4 QmlProfiler: Use Flickable's pixelAligned property
This is much cleaner than manually casting contentX and contentWidth
to int. Also, it actually forwards the int-aligned dimensions to the
TimelineRenderer.

Change-Id: I7dad8eeabf1f3b70c5e725a82a2926b3db6f1b16
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 14:15:22 +01:00