Commit Graph

32962 Commits

Author SHA1 Message Date
Tobias Hunger
b1a71f7b96 DiffEditor: Fix line number forcing
Change-Id: I876c8ca6bc442cec853c41c48eb2be83def4558c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-11 12:26:43 +00:00
Tobias Hunger
f4a1f7460e DiffEditor: Fill in file combobox on new splits
Change-Id: Ic444a9544e3c032a1908673c349e00bec95891dd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-11 12:11:30 +00:00
Kai Koehne
2d3f9d62f9 Remove dead file
Change-Id: Ibe1b43379e9ac6ccf280d35ce9605591d720dc0a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-03-11 10:16:11 +00:00
Tobias Hunger
25c663da44 DiffEditor: Remove dead code
Change-Id: I7d29bfc944e32ad03f237946b4bea08d1a9502c5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-11 10:04:28 +00:00
Tobias Hunger
a168a5a448 Git: Remove assert
It is save to remove this assert as runCommand handles another command
being in flight already.

Change-Id: I8b7f1a9b8f3418def1a97f165ef6bdb9b03de04e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-11 10:03:48 +00:00
Tobias Hunger
1842cd7793 DiffEditor: Fix sync toggle
Use more QActions in the ToolBar. Those seem to work better
than the bare widgets.

Move "ignore WS" after the Context Lines spinbox so that we
can make the editor smaller while keeping the pop-up menu working.

Change-Id: I00d707c6ee1fb8d90fef5aa5ec5abb7149d4e6a0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-11 10:03:41 +00:00
David Schulz
b201c9be2b Cdbext: version bump
Change-Id: I78655f7da3d414f80e7cdffb3e415549bc0a38ad
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-11 07:32:01 +00:00
Orgad Shaneh
eb35a8bfbe QmlJSEditor: Export QmlJSCompletionAssistInterface
Requested in the mailing list

Change-Id: Ica71665f72dbe448fbe5a0fe82c4113c22d06324
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-03-10 15:28:56 +00:00
Tobias Hunger
3d360653cf Clean headers of the DiffEditor plugin.
Change-Id: I1c49527f010acbece31849127fc4d182678b6f37
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-03-10 14:28:13 +00:00
Orgad Shaneh
478a2e86f9 Git: Support Log for selected commit in git editors
Change-Id: I5081471b3be65de1948d9bfdd52fd812df5e6a7a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 13:53:16 +00:00
Orgad Shaneh
690a545f8e Git: Enable different reset types for commits in git editors
Change-Id: I0eafbd3db04a7da4ea85457ae67a940c71b49e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 13:53:14 +00:00
Eike Ziller
1eeca66c29 Get rid of Gitorious links
That service is discontinued, and we have our own mirror anyhow.

Change-Id: I8a45401e2c0c889d87c675a79ae16684d7c69a7a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-10 13:50:48 +00:00
Daniel Teske
ea1977c446 QmakeProjectManager::availableSetups: Don't consider kits without a qt
Change-Id: I62526d0e60749999a52413d9d02b3b03ea9d83eb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 13:17:50 +00:00
Orgad Shaneh
94cf79f895 VCS: Add accelerators to context menu entry in editors
Change-Id: I57b89670999d1f4857dcbdf94d8dc1f480e337c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 12:55:29 +00:00
Tobias Hunger
dbe535b3c7 DiffEditor: WS only change
Change-Id: I845f492c27d2149ed01e175af5f974f86c7bd1d6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 11:51:37 +00:00
Libor Tomsik
4a5cea7c99 BinEditor: Showing error when opening file bigger than 2GB
Adding check if binary file is bigger than 2GB (MAX_INT)
and then reporting an error message instead of leaving
editor content empty.

Task-number: QTCREATORBUG-10149
Change-Id: I96f70631f11f59199e5acde4cad57a0b0efa12af
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-10 11:32:11 +00:00
Tobias Hunger
b2b8b867d6 DiffEditor: Refactor the user-facing parts
* Move all data handling into DiffEditorDocument
* Move much of the logic of how to update views into the
  DiffEditor.
* Introduce a base class for the different views on the diff
  to implement.
* Remove DiffEditorGuiController
* Make DiffEditorController smaller and merge the DiffEditorReloader
  into the class
* Simplify communication between the classes involved
* Make much of the implementation private to the plugin

Change-Id: I7ccb9df6061923bcb34cf3090d6d8331895e83c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-10 10:25:52 +00:00
Christian Stenger
59640aa7aa Debugger: Fix debugging using older lldb (less/equal 310)
Task-number: QTCREATORBUG-14033
Change-Id: I5b65de442eca525ceffadd4d4667283a276b6af8
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-10 09:55:32 +00:00
hjk
31b2ac85f4 Debugger: Split CdbCommand into CdbCommand and CdbResponse
Move it closer to the GDB/LLDB setup.

Change-Id: Ifcada93ba9abff56c5523963c3ef9382277387e2
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-10 09:30:15 +00:00
hjk
a37e30eb23 Debugger: Remove unused struct ConditionalBreakPointCookie
Change-Id: Ib2eeba127780a80953dc128f844fda7a48b1dd0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-10 07:10:24 +00:00
Christian Kandeler
7f2a440b9d Update qbs submodule to HEAD of 1.4 branch.
And do the necessary API adaptations.

Change-Id: Ic0d48ea12e08c5f2709c2371264ddb7d15c5a539
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-03-09 17:05:37 +00:00
Orgad Shaneh
c1ef8edaf9 Core: Use a document subclass for restored documents
Enables name disambiguation for restored documents as well as "real" ones.

Change-Id: Id9c97fa03647e2724612b732091fc92c183c1a17
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 16:14:45 +00:00
Thomas Hartmann
7c192f6490 Adding more zoom levels
Change-Id: I61f313477821e87c1f2234953caa922e9105ad41
Task-number: QTCREATORBUG-13951
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-09 16:14:22 +00:00
Orgad Shaneh
17f2af5082 Fix parsing of filename with position when -client is used
Instead of transforming to absolute paths in the client, pass the
working directory and leave it to the target.

Change-Id: I4f8724c8857e89a7ee77116c78cf8b25c56795fa
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 16:10:03 +00:00
Daniel Teske
facc89fafd Optimize ProjectTree for adding folders/files
Instead of searching the whole tree for the current node,
only check the newly added files/folders.

Change-Id: I015a955815223767367c4cad476d0620f69abd71
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-09 15:47:00 +00:00
hjk
159f4e4f39 Debugger: Replace LocalsUpdateForNewFrame enum value by a bool
Change-Id: I4e7f6ec14a4c40a7d402e6a57f1b14fc37651747
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 15:17:56 +00:00
Thomas Hartmann
0ebbcc5615 Add combo box to change the background of the form editor
Task-number: QTCREATORBUG-11352
Change-Id: I73cca4ff86005d929a26af83a1765e9b7a313952
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-09 15:13:32 +00:00
Daniel Teske
fa5d4b92a7 QmlProjectManager: Fix initial state
Change-Id: I1b06e2b3f787671b18feef9bd85d971f7e5a27c0
Task-number: QTCREATORBUG-13970
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:48:14 +00:00
Sergio Ahumada
2c876f7443 Update some more links to qt.io
Change-Id: I043cf78f128dc8d99e3316b951cf91d2f6d6524a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 14:30:39 +00:00
Eike Ziller
09a16cf223 QNX/MimeTypes: Do not open empty xml files in bar descriptor editor
In case of doubt the mime type alphabetically first is taken, so make
sure application/xml comes first.

Change-Id: I52d0aded3f4cc3f428c797cf6d97c070ce5495b8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:20:28 +00:00
Eike Ziller
ba64a7bb1b MimeDatabase: Fix that xml files were opened in bar descriptor editor
Fix MIME detection issues with magics in MIME hierarchies

Assume two MIME types A and B are registered, both with the same glob
pattern, A being parent of B, A with some magic rule, and B with another
magic rule. Given a file that matches the glob pattern and the magic rule
of A, the resulting MIME type depended on the order of registration of A
and B, because it would just check if some glob matching MIME type was
also a subclass of the magic matching MIME type.

The patch prefers the the MIME type that matches by magic if that
matches by glob pattern as well (i.e. A in our example).

The "recommended checking order" of the spec does handle that case.

Change-Id: Ia914aa7b6d0fb52f6c833897a5be69eb59fca6ab
Task-number: QTBUG-44846
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:04:02 +00:00
Eike Ziller
6ecde4cdf0 MimeDatabase: Fix leak on invalid magic
Introduced by 673be1a3f8

Change-Id: Ia937b3607d6a709b86185f428a6e3ff1202e0869
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 14:03:52 +00:00
Orgad Shaneh
220882128a Utils: Fix parentheses parsing in arguments iteration
Opening parenthesis is stored in the value, but closing parenthesis
is not. This makes the value unbalanced.

Since the parenthesis unconditionally unset m_simple, the value is
cleared anyway and is never read.

In case that math (or other) expression will ever be evaluated, this
needs to be reworked to include both parentheses.

Change-Id: Ie56f5a5d9cec5a47649751db4245888bee8e85d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-03-09 13:41:49 +00:00
Orgad Shaneh
dbb9891f43 CppEditor: Support implicit pointers in Qt5 connect conversion
Task-number: QTCREATORBUG-14104
Change-Id: I157dbcb0e06ed1bf49d2df01bdbad215e35a4c3a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-09 13:27:12 +00:00
Orgad Shaneh
683540bee7 CppEditor: Expand templates for Qt5 connect conversion
Fixes at least explicit data() calls for templated pointers:

QPointer<QAction> action;
connect(action.data(), SIGNAL(triggered()), this, SLOT(slot()));

Change-Id: I7f76c1f556c0f271936728d611751424969916a7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-09 13:16:06 +00:00
hjk
ef894f21e2 Debugger: Rename WatchHandler::remove{Data->ItemByIName}
That's what it does.

Change-Id: If1a1bf91220630ad09e5ec8636ccb9d67c8d0947
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 11:52:52 +00:00
hjk
915bb5413c Debugger: Remove unused WatchHandler::removeChildren()
Change-Id: Ieef352db04978ad48dfe47178edaec7702dc373b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 11:52:45 +00:00
Orgad Shaneh
7e66dc2cbe QmlDesigner: Fix dead store
Change-Id: Ie9a0beffe770fc2cf9f8172b23660f10b56dcbd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-03-09 11:40:34 +00:00
hjk
3e02f8ec2e Debugger: Fix format switching for char[]
Task-number: QTCREATORBUG-14094
Change-Id: Iea1f59d5af2fb453ead7e0cef9e04293a698794e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-09 11:17:25 +00:00
Daniel Teske
74f67ffef4 Remove support for !shadowBuild
In ancient times we needed to support some qt versions that didn't support shadow
building. This code has been unused for some versions now, so remove it completely.

Change-Id: I311f255d6bfed6841e94c9c383bd9929d0d55520
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-09 10:45:31 +00:00
Daniel Teske
357d01817b QmakeProjectManager: Rework run qmake action
Relied on some broken magic.

Change-Id: I1641f4b135e825ef60d57e99741def018ab9b55a
Task-number: QTCREATORBUG-13700
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-09 10:45:10 +00:00
Orgad Shaneh
e93484d480 QmakePM: Fix crash when Qt version is not set
Reported in the mailing list

Change-Id: I111f66cdff99e7b9ee5bbfe887e87546377a137f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-09 08:41:04 +00:00
Tobias Hunger
6b5bf41188 SubmitEditor: Add scrollbars when necessary
Task-number: QTCREATORBUG-5579
Change-Id: I013f08de15317b02eda3b64ea4ac2fe58e919db0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-09 08:39:22 +00:00
Orgad Shaneh
7dd4093b18 Debugger: Remove dead store
Change-Id: I162d8db39755df1fe4b94b2dedfa83680f87a786
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-09 08:36:12 +00:00
Orgad Shaneh
0831b0c2ca Core: Remove dead store
Change-Id: I3388751d8b68747afbdc75354430be744736b8e7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-09 08:00:44 +00:00
Przemyslaw Gorszkowski
c9cc5156e7 ClassView: removed dead code
Change-Id: Ifda4eea91f6007a0b16d03f31e54be92c1afd70a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-09 07:15:45 +00:00
Orgad Shaneh
10b4936038 Valgrind: Fix memory leak
Change-Id: Ie2e3104a71dcb0bff6fff7d2989517cc3ca5de2b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-09 07:09:08 +00:00
Orgad Shaneh
9a1c382273 VCS: Remove dead stores
Change-Id: I998e523c76bdc0b76cbc6089092a0dda4812ca16
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-03-08 08:20:28 +00:00
David Schulz
7db238c116 Cdbext: Discard old watches when syncing...
... to make sure everything is new evaluated.

Change-Id: I256e044e0095c0c4d2e4563474768ba2fdc3c85e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-06 14:13:48 +00:00
David Schulz
bc124ff97f Cdbext: Optimize Qt detection.
Now supporting fast look up of linbinfix builds and
adding support for static namespace builds.

Change-Id: Iea234902e915b9a9d08ccf804ea4a37810aaa0d8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-06 14:13:40 +00:00