Commit Graph

43591 Commits

Author SHA1 Message Date
Denis Shienkov
6e2738af0e BareMetal: Do not use QPointer if it is not required
Change-Id: Ib7162ae6b40d06bfb54705fd4b53bde2ce78083c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-07 08:49:41 +00:00
Marco Bubke
c209aaf22e Clang: Fix highlighting issues
...for macros, typedefs and enums.
	
Change-Id: I926e7238695caefd7f4463dbe0cf5b428aa98c1a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-07 08:41:03 +00:00
David Schulz
ea8665c2e2 CdbExtension: Make sure watches group is initialized.
This fixes a crash that occurs when a debugger was started
without an active watch and a watch were added afterwards.

Change-Id: I0219a750bae7b433240b22f99b2e8fd8655ca331
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-07 08:32:47 +00:00
hjk
2714a7e981 Debugger: Remove spurious quotes in gdbbridge.py output
Breaks the parsing and might trigger an endless loop.

Task-number: QTCREATORBUG-15352
Change-Id: I832d26441d8be3339b4de6d59a33c97f1d7124c5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-07 08:17:01 +00:00
Eike Ziller
b6e4e966f4 Locator: Remove whitespace from start and end
It is not very intuitive, and can easily happen when copy&pasting into
locator.

Change-Id: I51d226b8e834c43eedc042035a9b90aa7ee4844f
Task-number: QTCREATORBUG-15399
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-07 08:05:06 +00:00
Jochen Becher
4a06fc63a9 ModelEditor: Allow relocation of ends of relations in diagrams
Change-Id: I8dbf536731cb24819f70dc6acacc4658fd257259
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-04 19:12:30 +00:00
Tobias Hunger
fb99157abd Core::Id: Handle empty strings passed to fromString()
Return Id() in that case. Currently we can convert the invalid Id
to a string, but when we try to convert that string back to an Id
there is a soft assert.

Change-Id: Iad8443ff65a643030bd47446ec2dcf2889d2e4eb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-04 12:57:00 +00:00
Alessandro Portale
03c07b80fd Core: Unify the close icons
Use the same image file and recolor it as needed,

Change-Id: I914819a53ca05d83ca5b88adf44706b460b48ac0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-04 10:47:32 +00:00
Leena Miettinen
2e341ffdfe Doc: fix QDoc command in a tutorial
Change-Id: Id511edfce884130a7c93dc8f51eb156a10b5b73f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-12-04 10:41:25 +00:00
Robert Loehning
6c4504159a ResourceNode: Fix directory separators
Change-Id: I589397178cf4ad749825f004638a2d9852d7f0c3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-04 09:57:25 +00:00
Eike Ziller
ddc43b7329 Fix that html tags instead of F1 button were for QML tool tips
Regression introduced by 6ed775f56a

Change-Id: Ibef3453339d431dcd7b890d18c27f42f198070e8
Task-number: QTCREATORBUG-15225
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-04 09:56:42 +00:00
Allan Sandfeld Jensen
b2f2b92713 Correct CTRL+wheel zoom on touchpad
When we get fine-grained scroll events we shouldn't zoom 10% on every
event but scale zooming so they add up to 10% for every wheel click.

Task-number: QTBUG-49024
Change-Id: I08ac728bf1421148680de8fbbc76054ba2cce884
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-04 09:47:10 +00:00
Eike Ziller
fb1e9bc785 Version bump
Change-Id: Ibca6fcaf2eeb997179fc9dda0f1dc94dd333d973
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-04 08:58:32 +00:00
Denis Shienkov
cbb3aee076 BareMetal: Kill the GDB server provider when debugging stopped
On Windows when debugging is stopped, the QProcess::terminate()
method does nothing. At least it belongs to the started OpenOCD
process. It is better to use Utils::QtcProcess with setup of a
setUseCtrlCStub(true) instead of QProcess.

Change-Id: I954377dc94de77fbae630e096a252530f12aaf2d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
2015-12-03 22:04:36 +00:00
Martin Kampas
b10b39a6dc Android: Remove dead code related to local libs
The start point is the if (m_useLocalQtLibs) block in AndroidRunner
constructor which seems to be effectless since 8d27ec6 (Android: Fix
debugging applications that link many modules)

Change-Id: I7850c1f53a003553ae1b3fdf0881f4c9fedf7b15
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-12-03 18:35:47 +00:00
Martin Kampas
c5c8618aa1 Fixup "AndroidDeviceDialog: show progress indicator on manual refresh too"
This fixes segfault introduced with 4bdba9c (AndroidDeviceDialog: show
progress indicator on manual refresh too).

Change-Id: I72c7ead9de4abd46098ebf0ee0f8ce260669f088
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-12-03 18:28:09 +00:00
Alessandro Portale
d13ba08f9b Utils: Icons code cleanup
No visual changes

Change-Id: I542adc1546787a9a33fb90d6c03e109bb7a757b6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-03 16:29:06 +00:00
Alessandro Portale
4e54baa840 ProjectExplorer: Themed pause button
Change-Id: I61a678ec3696a5d0a0555e342fb34604fc1a5cdd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-03 16:12:53 +00:00
David Fries
ac8626aa78 avoid None.replace in fromNativePath
This is with gdb 7.4.1 linked with python 2.7.3

Change-Id: Idf921afd37d72056874c7179c899f62f791f9282
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-03 15:31:43 +00:00
David Fries
aba62280ae Debugger: Fix compile for g++ 4.7.2
src/plugins/debugger/gdb/gdbengine.cpp: In lambda function:
src/plugins/debugger/gdb/gdbengine.cpp:3224:30: error: the value of 'this' is not usable in a constant expression
src/plugins/debugger/gdb/gdbengine.cpp:3210:61: note: 'this' was not declared 'constexpr'
src/plugins/debugger/gdb/gdbengine.cpp:3231:13: error: 'incmd' was not declared in this scope
This reverts one code block of commit
2b16b97f19

Change-Id: Iab7f5ec84e59d9f280e0405cdd82705c14bb2064
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-03 15:19:23 +00:00
Alessandro Portale
2404064ea8 Modeling: Fix compilation with MSVC
Change-Id: I6575e366c0733259e779e8dba6556d1c74c79792
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-03 15:14:51 +00:00
David Schulz
5345e05f26 TextEditor: Fix unindent on backspace.
Task-number: QTCREATORBUG-15250
Change-Id: I4d19ad90098dc64f96b1aa7f728d8f30d05bff6d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-03 13:59:27 +00:00
Robert Loehning
8abd9fae80 Squish: Update openCmakeProject()
Change-Id: I21f5e40b2da0b2a9b37752c2f5e15c4efd687ca5
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-12-03 13:43:07 +00:00
Christian Stenger
e793818528 Modeling: Fix compile for gcc 4.7.3
This partially reverts 5f31eee37c.

Change-Id: I5e1150b7535bbd5366d63be5c44fffd2ec3beb5c
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-03 12:56:39 +00:00
Tobias Hunger
b6792f095c QMakeStep: Prevent possible crash
Task-number: QTCREATORBUG-15443
Change-Id: Ibec61938a911e7265fa1f12c4f3c7b60bf514b7c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-03 11:46:35 +00:00
Ulf Hermann
334e4f32d9 QmlProfiler: Show self time in events view
Someone had already prepared it years ago, but forgot to wire up the
details.

Change-Id: I895bf34694f134eb9526cea98fe08f91b6b9d808
Task-number: QTCREATORBUG-15442
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-12-03 11:40:27 +00:00
Alessandro Portale
37c1823974 Flat and themeable side bar icons
This patch adds flat side bar icons according to
http://blog.qt.io/blog/author/didesous/

The flat icons are supposed to be opt-in, via the theme flag
"FlatSideBarIcons=true". It is false by default for the default
theme for now.

Change-Id: I1cbe69d4e138d5d23c0172a374933ac7a4ce8a5b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-03 11:30:50 +00:00
Sergey Belyashov
9a5abd1467 Russian translation update
Change-Id: Ide237337bad6c1642b53ef6ea507605e0cb7f19e
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-12-03 11:21:04 +00:00
Martin Kampas
0f50c41d05 AndroidDeviceDialog: improve defaultDeviceCheckBox text
Change-Id: I9036408d37ec3881acc85b85e272554bfa71226a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-03 10:26:27 +00:00
Ulf Hermann
fdf968debb Debugger: Handle JSON null values when translating to python
Change-Id: I47aaeb564107642543ba8038fc175a2c2203bebc
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-12-03 10:06:26 +00:00
Christian Stenger
696b8e9cc6 Squish: Raise timeout for qml refactoring
As the navigation treeview is updated asynchronously this might
take more time.

Change-Id: I5002fc547158147d921a5d19098f2cfc3a14336f
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-12-03 09:50:57 +00:00
Ulf Hermann
ca3881d357 Timeline: Update overview range mover when width changes
Change-Id: I231eb8fae65e84007a1678070429414b0f98d396
Task-number: QTCREATORBUG-15441
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-12-03 09:24:18 +00:00
Martin Kampas
4bdba9c131 AndroidDeviceDialog: show progress indicator on manual refresh too
Change-Id: I089c2f64e06a3a421177c206faff6a6fe02d01ca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-02 18:04:08 +00:00
Oswald Buddenhagen
100ea30a1a Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/projectexplorer/toolchainmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
2015-12-02 18:42:05 +01:00
Nikolai Kosjar
e4be9edc4d Clang: Reduce document annotations timer
Change-Id: If220ec7c84d41a47fc0f55dcbc55e62f0b7f05bd
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:04:45 +00:00
Nikolai Kosjar
475b11aad1 Clang: Fix recovering on clangbackend crash
The translation unit was updated, but not re-registered.

Handle the editor documents this way:
  1. Reset all ClangEditorDocumentProcessors (this will send an
     unregister message, but that's not problematic).
  2. For the visible editor documents, run their processors so that the
     translation units will be re-registered.
  3. For the invisible editor documents, mark them dirty. Once the user
     makes an invisible document visible again, the processor will run
     and also re-register the translation unit.

Change-Id: I23693ac197bd34a183f3a0020eb5372268636599
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:04:31 +00:00
Nikolai Kosjar
79d1d5b9e0 CppEditor: Reset process document timer back to 150ms
...since the clangbackend has its own timer now.

Change-Id: Icef3ea820da751617a3fe4b6f090ac244d0ddef8
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:04:25 +00:00
Marco Bubke
a08336fcc2 Clang: Don't send multiple completions for the same position
If we send already a completion we should test if there is already one
sent for the same position.

Change-Id: Ie88f89bff0e1da1c5e747827a45154c7ccaecabc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 16:01:54 +00:00
Nikolai Kosjar
03056a6d64 Clang: Make document annotations timer configurable
...by environment variable.

Change-Id: If20589e84dea2366fd9b6b273259ce29eddb965b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-02 15:56:18 +00:00
Tobias Hunger
f86ebcbf22 VcsBase: Add a button to reset VCS information cache
Task-number: QTCREATORBUG-14454
Change-Id: I958f58b8b19a8a9453e869daaf0a25ccf6fe57b3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-02 14:59:31 +00:00
Tobias Hunger
9894f6cf40 TargetSettingsPanelWidget: Use Qt5-style connects
* Use member data initialization as well

Change-Id: Ia8593b6f18dc6158edcdf4b96273cfbef5abfc44
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:41 +00:00
Tobias Hunger
723463e72c Id: Make versionedId QTC_ASSERT that there is a major version
There are no more users that use this without giving at least a
major version.

Change-Id: I4ed3c41eb87811435b9e354aa4b2ae8cc1979681
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:32 +00:00
Tobias Hunger
71b4ce6673 Qt: Remove platformName and platformDisplayName methods
Fix fallout of this in KitInformation/Kit/KitManager and the wizards.

Change-Id: I5cb88cc381dc04409401909b810940ab6dccf86a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:29 +00:00
Tobias Hunger
d323d595b7 QtVersion: Add a method to query the target device type
Add and implement a method to get the supported target device
types to the BaseQtVersion interface. Implement this for all
Qt versions.

Validate that the Qt version's target device type matches up
with the device type set in the kit and warn on mismatch.

Change-Id: I95da42031022663776afe23a50eae3677bdb1dda
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:25 +00:00
Tobias Hunger
eebe44d3cf Wizards: Turn "platform" into an Id
It used to be a string constant.

Change-Id: Ibea34dc52e97a483989e6d628b908231f4e2dc54
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:20 +00:00
Tobias Hunger
4b0a8648e4 FeatureProvider: Remove Feature and FeatureSet
Use Core::Id for Feature and QSet<Core::Id> for FeatureSet.

Change-Id: I12341036bd9eaa82589d92bd3f7d21f2e6b737bd
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-12-02 14:49:17 +00:00
Marco Bubke
f482ad6069 Clang: Use fontsettings in diagnostics
Change-Id: I8438293a37a53532927520106d4ee5346237ebfe
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 13:46:18 +00:00
Marco Bubke
ff913b83ae Clang: Use revision from file container
Change-Id: Ie084677fb910fc6e415afcdf7533369150162f8f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 13:46:10 +00:00
Finn Brudal
ea278cdf34 TextEditor: Fixes crash when double clicking virtual function proposal
Ensures that the DeferredDelete event is posted from the outermost
loop level.

Change-Id: Ib74d49d35811f35659ef272d6f0e0a4508f93076
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-02 13:18:16 +00:00
Marco Bubke
133b50ed13 Clang: Don't update the translation unit for changing the current editor
It is generating reparsing steps.

Change-Id: Ibbdb2f5dceffdf940bbdf0c9a9f0a706124078f9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-12-02 12:38:25 +00:00