feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,175 Commits 108 Branches 368 Tags
a2b47b7da274580c40df2fb474d4b65a6865a1df
Commit Graph

316 Commits

Author SHA1 Message Date
Joerg Bornemann
84df758ec6 use new base import style in qbs files 
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-03-11 14:20:22 +01:00
Oswald Buddenhagen
52bf71fbdf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146
 2014-03-11 13:39:55 +01:00
jkobus
b8046e603d Don't register mimetype for diff editor 
Task-number: QTCREATORBUG-11624

Change-Id: I9eeeeeb862e335c1a4d5cbd80d0908297ad6d1db
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-03-10 14:35:51 +01:00
jkobus
b846840c52 Move more function into diffutils, fix calculateOriginalData. 
Change-Id: Id7bbdbf7778d21cb9aa15148876db95e9228fab3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-03-10 13:01:29 +01:00
Tobias Hunger
02b3a79c5f VCS: Open diff/blame editors in other split 
... if there are other splits that is.

Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-07 16:02:14 +01:00
Tobias Hunger
c9b6897e78 EditorManager: Add OpenEditorFlags to openEditorWithContents 
This requires moving the activateEditor call into openEditorWithContents.

Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.

Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-07 15:56:43 +01:00
Eike Ziller
5dd8d7cd9c Editors: Move id() from editor to document. 
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-03-05 16:27:52 +01:00
jkobus
a746f6fb27 Move internal structures and some functions into diffutils.h 
Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-28 10:42:50 +01:00
jkobus
0ba55199b2 Prepare for patch generation, fix internals. 
Change-Id: Ib3b7c5c433f9f9230eb14d23a3029681841e2e68
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-27 16:19:00 +01:00
jkobus
9f10e8daac Refactor internal structures inside diff editor 
Move "changed" property out of TextLineData into
RowData as "equal".

Change-Id: Id9cb87d099cecb61a2774e7a4fffcc162dece604
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-27 12:26:06 +01:00
jkobus
ab9db1433a Small refactor. 
Change-Id: I8bdf3830e230b5db3d6041fae0d22c05cfc047d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-26 12:35:26 +01:00
hjk
27ae878040 DiffEditor: Remove DescriptionEditor helper class. 
With value-based ids it's just a normal BaseTextEditor.

Change-Id: Ie9d28a92c48cb222eb9173bd432f08f4fe628bed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-25 15:56:54 +01:00
hjk
6c6f47f86c Core: Make IEditor::id a value member and adjust users 
Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-25 10:36:25 +01:00
jkobus
52e166c5ae Move Gui stuff out of DiffEditorController 
Place it in DiffEditorGuiController, will be needed for
sharing gui settings between unified and sidebyside versions.

Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-24 11:43:25 +01:00
jkobus
73cf43f323 Add DiffEditorManager, refactoring. 
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).

Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-18 13:46:49 +01:00
hjk
e47acb151b Compile fix with Qt 4 
Change-Id: I28b9a63a066521cdbe67ad9b51d795450b6d070a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-14 16:36:50 +01:00
Jarek Kobus
1c76e25fdc Move some functions to Differ, add unified diff 
Change-Id: Id8178fb84f25a18fda42e02954f28359d0ef4623
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 14:37:55 +01:00
Jarek Kobus
e8482f3e49 Fix comment 
Change-Id: I0750ecae4d103d93ca20bef657b98a468bb355fc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-02-14 11:09:52 +01:00
Tobias Hunger
8c1c284789 Qbs/qmake: Fix dependencies of plugins 
... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-11 13:23:26 +01:00
Jarek Kobus
f156c3e013 Move DiffEditorController into DiffEditorDocument. 
Prepare for making diff editor splittable.

Change-Id: I285ad46d095a98f2707d385558dfda0b10b77c1f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-10 10:33:39 +01:00
Robert Loehning
50d93a6567 Provide parent to getOpenFileName() and getSaveFileName() 
Change-Id: I839de363f426a57a522700df39e4f3b4ebfbb7ea
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-31 11:15:30 +01:00
Jarek Kobus
06950359f9 Remove obsolete commented code 
Change-Id: Id7f3929407acbaf641ed25db917b37d15f268e1e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-31 06:58:02 +01:00
Jarek Kobus
edac8f082d Get rid of DiffShowEditor. 
Made DiffEditor customizable instead

Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 19:13:48 +01:00
Jarek Kobus
90e9799f14 Fix a warning about no setFontSettings() slot 
Caused by change 3fa6b6737c

Change-Id: I4b1244423dfea83b1a23f6ecb03026956f14f35d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-30 17:13:26 +01:00
Jarek Kobus
c18fa9112b Rename DiffEditorWidget -> SideBySideDiffEditorWidget 
It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 17:13:14 +01:00
Jarek Kobus
65087004de Rename DiffEditorFile -> DiffEditorDocument 
The old name had nothing to do with a file in fact.
The new name will be more appropriate for the new stuff,
which will come soon.

Change-Id: I17ad03dab5c643ff26e313a434ba86929a0f00c3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-30 14:50:31 +01:00
jkobus
a4b00160bb Refactor diff editor widget, fix whitespaces handling 
Prepare for ignoreNewLine handling

Task-number: QTCREATORBUG-11002

Change-Id: I97fc0887ef27c821252283ccbad655ac0bc79f0a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 13:43:09 +01:00
Jarek Kobus
66f8437b0e Remove unneeded stuff 
Change-Id: I2771765bd331e81e09141a2f3088fb364d4bf90d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-30 13:33:27 +01:00
Eike Ziller
3fa6b6737c TextEditors: Move font settings to document 
Change-Id: I325764cbaa9684fa2758b0ea6c6ea58de142cb73
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-24 08:00:07 +01:00
Jarek Kobus
4e320e8671 Fix empty contents in git show editor 
Task-number: QTCREATORBUG-11314

Change-Id: I8a74c174be4436797bf04904e708e26e9463ddcf
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-22 04:17:23 +01:00
Tobias Hunger
f531f16dbf DiffEditor: Fix warnings on clang/msvc 
The recent move to use classes in favor of structs missed the forward
declarations, so the build produces warnings about the mismatch when
using clang (and MSVC as far as I can tell).

Change-Id: I235f7410a5b43b14c318843c9ee4dfcb9ea88e63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-17 11:24:32 +01:00
jkobus
242ae4ce37 Fix return arg of Diff class getter 
Change-Id: I25dc6d2992831d79077e4d06f52018d6191e0bfb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 15:15:03 +01:00
jkobus
096bc3b0e1 Add default arg to Diff ctor 
Change-Id: I97d4b99250d55216ef866f7529ca423e2133db09
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 15:14:51 +01:00
jkobus
a74b59ffd6 Add DiffEditorController 
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 14:36:53 +01:00
jkobus
3b2cb038cd Fix display of inserted lines by the end of file 
Task-number: QTCREATORBUG-11281

Change-Id: I2d84584a850cf159dd0724f79bbc967848b3047b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-16 10:21:55 +01:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin 
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-14 07:43:00 +01:00
jkobus
1d954b1b2a Get rid of DiffEditor::editorWidget(); 
Change-Id: I3078002359871dad74d4a07924d5beeaeb9f82ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-01-13 13:32:10 +01:00
Eike Ziller
f9ce335a6d Editors: Remove useless parent widget argument from create/duplicate 
It was never called with a sensible value anyhow, and only complicates things.

Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-08 11:46:11 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
jkobus
0d13028440 Refactor source property 
Get rid of source property out of DiffEditorWidget,
attach dynamic property when it's needed instead.

Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-19 14:06:51 +01:00
Orgad Shaneh
4442a92729 Braces cleanup 
Change-Id: I8413252c90a1487d291f15d92837c30ab697b245
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-14 08:13:52 +01:00
Robert Loehning
0bb9ab131e Normalize connect()s 
Change-Id: I1305abd51cb6ae856215af63807e66c433982c26
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 18:27:57 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property. 
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-10-09 18:08:56 +02:00
hjk
ca15d0aa95 Apply static pattern to TextEditorSetting 
Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-20 10:28:22 +02:00
jkobus
5d15076ea1 Fix compilation of generichighlighter test on Windows 
Change-Id: I25c2f68528ede12fa900ea86973c6df39667c421
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 17:25:41 +02:00
Orgad Shaneh
f29ce3d9b9 DiffEditor: Preserve source for state recovery 
Task-number: QTCREATORBUG-10126
Change-Id: I707e7cdac84c91d52c5661718ac48e3d79fc7c91
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 15:45:36 +02:00
hjk
8098c085fe Utils: Cleanup of Tooltip interface 
Change-Id: If4908e7a5d5ce749ff1e2efc7a026604821737be
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 11:35:22 +02:00
Tobias Hunger
ad50831a77 DiffEditor: Remove dead code 
Change-Id: I57c61b7c5adb80ab6ffecd699cd78e1351509b07
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-09-12 10:30:55 +02:00
hjk
a37589d431 Apply 'static' pattern to MimeDatabase 
Also adjust and streamline using and surrounding code.

Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-03 11:41:45 +02:00