Commit Graph

40362 Commits

Author SHA1 Message Date
Eike Ziller
ca41c24cc6 Find: Show number of replaced items after replace all
Show a fading indicator over the editor, or over the main window in case
of global search & replace.

Change-Id: I84a982bcfed558c0f84c08c3625a0cad4c5409d6
Task-number: QTCREATORBUG-3494
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-13 12:01:57 +00:00
Orgad Shaneh
a320daff86 CppTools: Add a failing test for partial template specialization
Task-number: QTCREATORBUG-14036
Change-Id: I7545bfa40ec3e1399d57bf5ab2486318aa1fcb9f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 11:30:07 +00:00
Orgad Shaneh
c9b71a268b C++: Provide better output on preprocessor test failure
Make the expected output copyable to the test.

Change-Id: I4fc61682f14d0de054a11d2ffa4a0f36ede0e500
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-13 11:28:11 +00:00
Daniel Teske
cfe69e6902 AndroidManifestWidget: Fix resizing behavior
This time for real. Change layout from
QScrollArea
 -> QStackedWidget
    -> GeneralPage
    -> EditorPage

to
QStackedWidget
  -> QScrollArea
     -> GeneralPage
  -> EditorPage

Change-Id: Id0d4baca297a5b4d58292fa72faa62b66c91a2dd
Task-number: QTCREATORBUG-14127
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-03-13 10:42:11 +00:00
Christian Stenger
c9dc686a04 CdbExt: Fix compile warning
Change-Id: I52bbf904a3a6a3cd3d5dcab34e649a44d406af98
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-13 09:53:56 +00:00
Tobias Hunger
a053724c28 Debugger: Refresh list of debuggers in kits options page on changes
Task-number: QTCREATORBUG-13991
Change-Id: I06ff6daea88e14b4193e4f1a71d768b528d80bf9
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-13 09:33:26 +00:00
David Schulz
9c5a56a38b Cdb: Reduce usage of deprecated WatchData.
Change-Id: Ie3d3355e51761cea7e0284bbb3e0177d5a443f36
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-13 09:01:15 +00:00
Christian Kandeler
4334c119cf Clear old analyzer issues on tool start.
Change-Id: I54f7791c15e05ca5c85c8b4059f80b050de57282
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-12 16:01:46 +00:00
Daniel Teske
d108a54aab QmakeProjectManager: Don't rerun qmake for debug builds
With a release Qt build. Wrong bit fiddeling.

Task-number: QTCREATORBUG-14129
Change-Id: I7021ff74c9936e6007eec863e4ebfd948e6dbe90
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 13:53:53 +00:00
Eike Ziller
d519514810 Pull 3.4 binary artifacts
To get the msvc2013 runtime installer

Change-Id: Id2c8fe8464bbd1d7ab30d265439360f8111e8b62
Task-number: QTCREATORBUG-14130
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-03-12 13:30:58 +00:00
Christian Stenger
77be0cb57e Dumper: Fix accessing None type - again
Change-Id: I265e316a1168310f220aa449528790c4bfec41d8
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-12 13:03:44 +00:00
Christian Stenger
839081dbc5 GlslEditor: Fix crash
Task-number: QTCREATORBUG-14116
Change-Id: I48549806b7108d31519dc573039496b727e7a0af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-03-12 12:55:59 +00:00
Alessandro Portale
57d2d6eb53 Help: Change OSX shortcut for bookmarks to Alt+Meta+M
The default shortcut for Help bookmarks Meta+B overrode the shortcut for
"cursor back". This patch changes it to Alt+Meta+M, which not only
removes the conflict but also makes it the same shortcut as the one for
the editor sidebar bookmarks.

Task-number: QTCREATORBUG-13093
Change-Id: I6f4f6c4891c34a3a00c39632bb0dae119d73cb99
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-12 12:23:03 +00:00
Christian Kandeler
819d3a753c QmakeProjectManager: Fix qbs build.
Change-Id: Ibc5ae05400cfc95dbcb60780accbb3907f697e32
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 11:30:14 +00:00
David Schulz
739bde079b Cdbext: Fix the expression returned for watchers.
Returning now the expression that was used to
add this watch, not a fixed up value in the
*(Type *) address format.

Change-Id: I7cb49b3f6370a6b25758c2a2240a004d1bc2f8a3
Task-number: QTCREATORBUG-12801
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-12 10:40:04 +00:00
Robert Loehning
5930ded264 Compile fixes for MSVC2010
Change-Id: I9e72edad53eff88911d5ce4e9a26905a5393d411
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-12 10:25:30 +00:00
Eike Ziller
0d10ecd668 Session: Fix that active mode was not restored
Change-Id: I3a94f1c18eb187716bfa275cfe8869c4fe046500
Task-number: QTCREATORBUG-1746
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 10:00:11 +00:00
David Schulz
faca938e35 Cdbext: Fix QDateTime dump.
Task-number: QTCREATORBUG-13263
Change-Id: I8433d5d6a18ea700db77be0ab22e01de9f0b267f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-03-12 08:44:50 +00:00
Daniel Teske
51e6fc9416 Fix importing creating additional kits on OS X
Extract the whole makefile parsing code into a separate class, to
make the code more manageable. Also fix some bugs on importing additional
flags like qt quick compiler or separate debug info.

Task-number: QTCREATORBUG-13947
Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-11 16:02:40 +00:00
Robert Loehning
cb42ff0deb Squish: Fix WELP03
Change-Id: Idf0c03b8a4746f63ab16c7391bc69d65629d7643
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-11 15:33:12 +00:00
Hugues Delorme
20a0b97e82 Vcs: fix missing icons in SubmitFileModel
In SubmitFileModel, filetype icons are missing for not "overlaid" icons in
Core::FileIconProvider. This is fixed by ensuring valid file paths are passed
to QFileInfo. VcsBase::SubmitFileModel has now a "repositoryRoot" property
so it can constructs absolute file paths.

VcsBaseSubmitEditor::setFileModel() now relies on SubmitFileModel::repositoryRoot()
instead of passing this info as annex parameter.

Change-Id: Ie045c3a7b247a5b5d48d10aaaf67cb3fdcf9fa7e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-11 13:45:16 +00:00
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
Christian Stenger
cce834aebc Dumper: Avoid accessing None type
Change-Id: I627f9ec1d2f67c2a870f9cebca89f5f7b8d67020
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-11 12:23:47 +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
Kai Koehne
63cc0b052a Installer: Install Visual Studio 2013 runtime
Change-Id: I1664aa1b1f35c4d17b373cfc5b1468299dc51e3c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-11 10:04:38 +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
Eike Ziller
83582b2d57 Merge remote-tracking branch 'origin/3.3' into 3.4 2015-03-11 10:30:30 +01: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
Eike Ziller
9bef92de92 Use Markdown for README
Change-Id: Iefc9e13d7590e1508daec82a89816adcedc054bc
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 13:50:27 +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
Thomas Hartmann
cf8d601b1d QmlDesigner.Instances: removing unused argument
Change-Id: Iff03a4659c02eb348d58957b2abb6676e5da8a7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-03-10 12:04:50 +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
a65d0f884b Changes: Mention CONFIG+=journald to enable journald support
Change-Id: Ib541ee82d5ff0c5917d6bffc96a6ea6c68065805
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-03-10 10:33:24 +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
Kai Koehne
8257331923 Replace gitorious by code.qt.io
Change-Id: I7926b8e0a7664a28540c86f26b9fa887a422fb16
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-03-10 10:06:57 +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
Christian Stenger
14a02d5081 Debugger: Tests: Fix execution of dumper tests on OSX
Change-Id: Ibe3e447d29e3834766ef067ba4424c3b08ba5eb1
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-03-10 08:55:14 +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