Commit Graph

32962 Commits

Author SHA1 Message Date
hjk
011ddc09c4 Debugger: Fix async tooltip handling
For now, only the gdb engine can handle complex tooltips
requiring async re-evaluation, cdb and lldb will show
and expand only items that are available in the Locals view.

This patch disables also the save/restore feature for
pinned tooltips.

Task-number: QTCREATORBUG-13255
Task-number: QTCREATORBUG-13052
Change-Id: Ic25616fede0f5c4343a92b631f01e60bfc5e9d81
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-14 12:58:05 +01:00
Christian Kandeler
620ded8093 QtSupport: Fix mkspec detection for Qt4/MinGW.
This is a workaround for QTBUG-28792.

Change-Id: I6a6de3a44569563e6013a388875035bda9772bed
Task-number: QBS-703
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-14 12:32:16 +01:00
Orgad Shaneh
8cfb167a56 Theming: Apply theme settings
Missed when the widget moved from its own tab to General.

Task-number: QTCREATORBUG-13396
Change-Id: Ic43194d54b8ff747f198ea0666fe78e403449448
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-14 08:34:18 +01:00
Christian Kandeler
4e932d6b07 QbsPM: Do on-demand profile setup when profile name is requested.
This is necessary because the profile setup also entails putting the
profile name into the configuration we pass to the parsing step. If a
Kit has never been used to set up a qbs project, "qbs.profile" will not
exist in that configuration and the project cannot be parsed.

Task-number: QTCREATORBUG-13400
Change-Id: I32d767c36bd0ff33521137604a7826d9242a8712
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-13 17:33:59 +01:00
Tobias Hunger
c4fb13a652 Qbs: Make pass on cpp.defines correctly to the C++ code model
When passing -DFOO to the compiler it will treat that as similar
to "#define FOO 1". Do the same when passing FOO on to the code
model.

Task-number: QTCREATORBUG-13384
Change-Id: I236d4731435e0559f75a3435dad9a8d935d42042
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-13 16:55:13 +01:00
Tommi Asp
fae505193a Fix building with system botan
USE_SYSTEM_BOTAN=1 didn't include ctr.h
which commit 45de9ee23f
requires

Change-Id: Ifab3c494753ca039ae15b1a02211b1502ba2d3d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-13 16:37:17 +01:00
Eike Ziller
3a8564c1f5 Fix reloading documents when they are changed fast, multiple times.
This can for example happen when doing interactive git rebases.

* When a file was changed after we reloaded it, but before we removed
+readded the watcher, we wouldn't get a notification for these changes.

* When we got a file changed notification while we were in checkForReload
(because of event processing of the dialog, or file loading), the
notification was dropped and only processes when a check was triggered
again (e.g. at window activation, or when some (other) file changed)

Change-Id: Iab1861a8f05c739a3405bc1afe90ae6f2145057b
Task-number: QTCREATORBUG-9745
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-13 15:26:51 +01:00
Fawzi Mohamed
7cb9b0cfaa qmakeproject: set qmljs language preserving other languages
Change-Id: Ifebe972a20359841d99e6a892776811692c8d092
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-13 13:43:49 +01:00
Orgad Shaneh
c7042e7031 InfoBar: Fix wrong value used for text color
Change-Id: Ib127889c96892c2c744a97992e4fc1faae23316d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-13 12:16:59 +01:00
Friedemann Kleint
f268d0f8e1 DiffEditor: Make it possible to paste snippets.
Add property "plainText" to DiffEditorDocument which
is queried as last resort by the code paster.

Task-number: QTCREATORBUG-12546
Task-number: QTCREATORBUG-9669
Change-Id: Iea9cd0d296bcc8e8a7300072c1a4a9068c2ab102
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-13 11:14:18 +01:00
Friedemann Kleint
9605244f6d DiffEditor: Save description along with diff.
Save complete, git-applicable patch when saving the result of
for example 'git show'. Strips some Creator-specific tags
off the description and reformats the description such
that it is accepted by git.

Change-Id: I739d85a7263f97e2149a2794974ba026f2eca067
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-13 09:10:22 +01:00
Friedemann Kleint
e123f5a4d9 Limit length of file names in DiffEditorDocument::suggestedFileName().
Change-Id: I168831b24bcece5ef825825c448edf684f4f536d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-13 08:33:38 +01:00
Friedemann Kleint
e01496122d Implement DiffEditorDocument::suggestedFileName().
Try to derive a git-format-patch type file name from
the description.

Change-Id: I581f4ba87a5ac4b82ca6519be8aa13fb4b4ebe43
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-12 16:21:02 +01:00
Friedemann Kleint
8fbd8c4105 Fix warning when saving documents with empty file names.
"QFileInfo::absolutePath: Constructed with empty filename"

Change-Id: Ib5d82681aafee54c309c2beb31c534a26e791737
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 15:49:34 +01:00
Lukas Holecek
72c5253a3b FakeVim: Fix target column when leaving insert mode
Change-Id: Idb9d6b70815d7212f677d68b3d5d268abdf4f44f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 15:25:52 +01:00
Lukas Holecek
dfce1be17b FakeVim: Set correct target column for "|" command
Change-Id: I5d3465a8b4e58fb2e56429cdd0b33a940211485f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 15:25:43 +01:00
Lukas Holecek
a588af8049 FakeVim: Fix target column for visual movement commands
Change-Id: I90fb87c06d623736d506c570b77c92666fab4170
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 15:25:35 +01:00
Lukas Holecek
b96e9c6115 FakeVim: Added tests for cursor target column
Change-Id: Iac3a3153783530ac8a0d40cc9a37a50982afe9ae
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 15:25:28 +01:00
Lukas Holecek
a0540182aa FakeVim: Remove default escape key press from tests
Change-Id: I737a532e981db5659478836810a2dfb76c0627ef
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 15:25:22 +01:00
Daniel Teske
69a3b0ee54 OutputPanes::hasFocus() needs to check the window's focus widget
QWidget::hasFocus() returns false if the window isn't active.

Task-number: QTCREATORBUG-13361
Change-Id: I7152ec2139bbb255c2a722e378a111dc4bc2ed62
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 13:25:47 +01:00
Eike Ziller
2d03b59f53 Merge remote-tracking branch 'origin/3.3'
Change-Id: I0ab4982e229d475b8e3575414b4bebbfea07498d
2014-11-12 12:55:10 +01:00
Nikolai Kosjar
e3419dc5ac C++: Save a Symbol::asScope() call
isScope() calls asScope().

Change-Id: I9ffe3bf2b9cff567b32a59cf27727097642b560b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-12 12:29:58 +01:00
Nikolai Kosjar
69504c25ca C++: Document::functionAt provides line information
Needed for the debugger.

Change-Id: I6465f6dc53017df212e403ea8a9a1c7977ac1671
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 12:29:51 +01:00
Ulf Hermann
fd3f544bb2 QmlProfiler: Avoid numerical overflows in calculation of event width
We must not keep intermediate values in 32bit integers as they can
easily get too large for that. This change restores the behavior from
before change 10a14ced36, which coaxed
the compiler into using floats by stating the minimum constants as
"1.0".

Task-number: QTCREATORBUG-13391
Change-Id: Ie83337b7e2b09b37d94a31a07813de14b85152ee
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-12 12:29:15 +01:00
Ulf Hermann
673cc77dd0 QmlProfiler: Disable loading of trace files while recording data
Change-Id: I32f1c6640bdde278e8342886f30e50a78c61b120
Task-number: QTCREATORBUG-13321
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-12 12:29:06 +01:00
Ulf Hermann
6264f7cb4d QmlProfiler: set the client recording state correctly
If a change was triggered from the profiled application we still need
to update the client recording state for the UI to stay consistent.

Change-Id: I2955bd9f2da27a2c32ac93e33742ee5fefbd2751
Task-number: QTCREATORBUG-13322
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-12 12:28:56 +01:00
Ulf Hermann
99f4b6353d QmlProfiler: show a warning if unsaved notes are to be discarded
Change-Id: I5152f0eefd1f0beec2b0f4fc9e27fedeb3bf7a14
Task-number: QTCREATORBUG-13318
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-12 12:28:20 +01:00
Nikolai Kosjar
55c24db5f8 CppEditor: Fix crash in CppCodeModelInspectorDialog
We assumed there is always a BuiltinEditorDocumentParser::get() object,
but that's not the case if clang is used.

Task-number: QTCREATORBUG-13306
Change-Id: Ia48f95a32bf8fd1d208c2a5e70a1af41193d1fd1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-12 12:19:12 +01:00
Daniel Teske
a8918db5f7 Make project dir default
The project dir defaults to the home directory.

Task-number: QTCREATORBUG-13366
Change-Id: I5a34ae458cacde9e12df50e0796ca7d236bb123e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2014-11-12 12:00:54 +01:00
Ulf Hermann
1d483cd352 QmlProfiler: Fix location for QtQuick1 events before using them
If this is not done multiple event types with empty locations are
regarded as equal which leads to confusion later. Also, it's not a
good idea to change the "location" member for already inserted event
types as that prevents us from looking them up in the eventTypeIds
map.

Finally, preprocessing the filename and stripping certain parts
from the URL prevents a proper lookup later on, so this is removed.

Change-Id: Idbe87e0b16444291bb13ff604ae65e1d7e74c3a5
Task-number: QTCREATORBUG-13382
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-12 11:30:06 +01:00
Eike Ziller
f554c5f5c0 OS X: Fix menu roles
Never use TextHeuristicRole because it doesn't work as expected with
translations.
Also remove some unneeded OS X scopes.

Task-number: QTCREATORBUG-13101
Change-Id: If53ac36d9bee1782343e65d01a875b7e5434ff39
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 11:26:55 +01:00
Orgad Shaneh
9891eec019 Find: Fix display of Replace & Find button
Change-Id: I91674de50a18883baa4fe2014e5589a7f4dd08fb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 10:04:24 +01:00
Orgad Shaneh
e742fd26bf Utils: Replace && with & for button tooltips
&& is used to prevent the following space from becoming a shortcut.

Change-Id: I8143b8ee193a2f2ffc391375e75d8a0fb26e8e09
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 09:43:58 +01:00
Alessandro Portale
6f91d7772a WelcomeScreen theming: Fix button border color
This change adds an additional color role for the border color of a
pressed button.

Task-number: QTCREATORBUG-13356
Change-Id: Ibdbd330f60063961dbf27dbe2fb90f32089d7b34
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 09:23:18 +01:00
Orgad Shaneh
4cfa58638e QmakePM: Remove wrong argument
Second argument is fileName, not message.
This was wrongfully left there in 
88a4421a84

Change-Id: I140fc9921d07df0d4214b54abcc0733aa0a60f4b
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-11 12:06:23 +01:00
Christian Kandeler
081bf51848 QbsProjectManager: More fine-grained profile setup.
Setting up a qbs profile, particularly for Qt, can take a measurable
amount of time, so we should not do bulk changes via the kitsChanged()
signal. Instead:
    - For the initial kit loading, delay the profile setup until
      the kit is needed for the first time, i.e. the user attaches it
      to a project.
    - Handle adding, removing and updating a kit separately; in
      particular, do not do anything to other kits.

Change-Id: If09d3c40b21e9a1356dc96089b92a60186a9bcdb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-11 11:59:57 +01:00
Nikolai Kosjar
cefd1832ce C++: Include class name for inline functions in functionAt
The code that constructed the fully qualified name used
enclosingNamespace() which skips classes.

Use LookupContext::fullyQualifiedName() instead.

Change-Id: Ic03a91c0fe120c52dc69f3e78e82a574458d8314
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-11 11:50:46 +01:00
hjk
a7763fcfcb QmakeProject: Fix regression after 65dbd73a
Task-number: QTCREATORBUG-13323
Change-Id: Ic560cc563187740927ea475b0f1f6d5432384324
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-11 10:42:59 +01:00
Tobias Hunger
7db9c37b2d JsonWizard: Allow the summary page to change to the file list
Change the JsonWizard interface:
* generateFileList now does no longer change the state of the JsonWizard
* commitToFileList added which is used to commit the wizard to a final
  list of files.
* Trigger generateFileList when version control is changed in the
  SummaryPage
* Commit to the file list once the SummaryPage is done

Change-Id: Ieb7b7abbf428d96596526c01946ecf0852f65744
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-10 16:29:03 +01:00
Tobias Hunger
8c228443be Add a way to query the VCS used from the ProjectWizardPage
Change-Id: Ice0fe952d03bea6dd95dbd48d2228a64d524400e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-10 16:26:33 +01:00
hjk
a2ebc8adbd Debugger: Make most of tooltip label a handle for dragging.
Previously, the actual text, not the free space, was usable.

Change-Id: Ib33990def16e48826505c45b6b764dc4c9fbb314
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-10 16:00:56 +01:00
Tobias Hunger
02e3adcc25 JsonWizard: Introduce a JsonWizard pointer into SummaryPage
This stopps us from qobject_casting all over the place.

Change-Id: I703ebb48aea7d00546e48ffb7a7fda21dc28d2cf
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-10 15:58:29 +01:00
Lukas Holecek
dfae736505 FakeVim: Handle more commands as aliases
Change-Id: Id7eb81ccb87b89c4c164119147b2d854d2fca9d4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-10 15:47:21 +01:00
Lukas Holecek
ffe956ad3a FakeVim: Test some sub-modes in functions
Change-Id: Ia5434b0e3dc56ad1657b5113279f8656c27ccfa7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-10 15:47:17 +01:00
Lukas Holecek
cb29cd6c6c FakeVim: Added helper functions
Change-Id: I01ac58625370b7f01b9b87a15afbf6c32549e6f8
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-10 15:47:09 +01:00
Christian Kandeler
9d677e3302 qbs build: Remove unneeded import statements.
The respective items are available without it.

Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-10 15:45:14 +01:00
Daniel Teske
5b00bf9a6c Android: Fix starting the emulator on 32bit linux
We need to pass -force32bit on that platform.

Change-Id: Ib2e205c7147fc573ad20467429a08f47b774b94f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-11-10 15:28:43 +01:00
Orgad Shaneh
5ee019f266 Perforce: Cleanup all actions enable/disabling
Change-Id: I0da22e5ddc18f0cb11f44bdaf6aafbe83907bee3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-10 14:14:34 +01:00
Orgad Shaneh
e154e0f513 Git: Disable all actions when inactive
Except "Create Repository"

Change-Id: Ie012c3af349e0706e95b1cf09466a4f23c82c4d0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-10 14:14:22 +01:00
Orgad Shaneh
a43f162d0a Mercurial: Disable hidden menu entries
To avoid shortcut ambiguity

Task-number: QTCREATORBUG-13364
Change-Id: Ibce1701be72376845624856b5de097332aaaccae
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-10 14:14:18 +01:00