feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,174 Commits 108 Branches 368 Tags
b8e1860c885fe3e7cb901b96c3303dd9d70ea26c
Commit Graph

31174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurindam Jana
d3e69915da Android: Disable QML Debugging 
Quick fix. Do not merge into 2.8 or master

Task-number: QTCREATORBUG-9342

Change-Id: Ic63d5d858321e381caf9ede7615075e4923a7b35
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-05-27 10:20:24 +02:00
Thomas Hartmann
f3e749ed04 QmlDesigner.Rewriter: bug fix 
Do not show warnings if recovering from an error.

Change-Id: I748a3f7ae63eb593ddeaa5de2ebf7264a456ac7d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-27 10:18:47 +02:00
Orgad Shaneh
829357b397 Git: Only execute stash if there are changes 
...even when NoPrompt is specified

Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:00:48 +02:00
Orgad Shaneh
5d558c141c Git: Add m_ prefix to StashGuard members 
Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-27 10:00:36 +02:00
Joerg Bornemann
3eba7e44e5 rename ProductModule into Export 
This fixes a bunch of warning when building with the updated qbs
version.

Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-05-27 09:59:53 +02:00
Kai Koehne
405dbcb9ca CDB: Fix compiler warning about unsigned/signed comparison 
Change-Id: I7b842db01dcbd8faf3dc16dfb287dd5117342e1e
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-27 09:07:50 +02:00
hjk
2b93fea580 BaseTextEditor: Style fixes 
Whitespace, s/e/m_editorWidget/, remove unneeded struct, remove 'inline'
when not needed...

Change-Id: I1ce76f5c4b1febe45c4a3b6404107fed7d9c6868
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-27 09:05:35 +02:00
hjk
cfc8ce8c1b Remove changeEvent(QEvent::LanguageChange) implementation 
This was implemented only for a small set of widgets. It's unlikely that
we will ever have or even want a dynamic language selection, until then
this code is only dead freight.

Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-27 08:58:51 +02:00
hjk
4e75fc8c54 TextEditor: Simplify Utils::CommentDefinition structure 
Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4f
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-27 08:35:46 +02:00
hjk
dfc0ee6456 Editors: No need to re-implement functions identical to base 
Change-Id: Ibdd3147cc2a64407802fa237b7943d2e96c9003b
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-27 08:25:47 +02:00
jkobus
569d29dc3e Use minisplitter inside diff editor 
Change-Id: Ia2388e8c50185f80111fcf96aedb8143088e9a1c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-05-26 20:13:41 +02:00
jkobus
74604a231d React to fontSettingsChanged inside diff editor 
Change-Id: I72e5cd61ea67d87a3f82843ee1f3b42d13142dff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-26 20:13:37 +02:00
hjk
0a9665077a Debugger: Restrict use of system GDB pretty printer to version 7.4 
Reduce compatibility issues e.g. on Mac. The previous versions
are not working well anyway.

Change-Id: If6cc7c1d4a85300d9bf054966216b52b35c0d1f2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-26 15:31:02 +02:00
Petar Perisin
e835b57fc2 Gerrit - Added Shortcuts to Gerrit Dialog 
Change-Id: I048ea80b48d693b7d44769e1f538d0c0050dbe2d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-26 15:08:45 +02:00
Petar Perisin
b28ae07274 Gerrit Dialog - renamed "Apply" to "Cherry Pick" 
Cherry pick is git command that everyone who works with git knows. First
time I saw "Apply" I thought it was some git or gerrit command unknown
to me. Renaming it to "Cherry Pick" makes dialog more clear, since user
knows what command will execute when button is pressed.

Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-05-26 15:08:36 +02:00
Orgad Shaneh
bc74d936b2 Debugger: Enable core dump when choosing executable after core file 
Change-Id: I7385308c52babe8092304ffebc6c86f392c42962
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-25 22:02:59 +02:00
Aurindam Jana
e3a98141ea CustomWizard: Replace the second % delimiter 
Fixes regression introduced by
https://codereview.qt-project.org/#change,56735

Change-Id: I36f95809dd56dcea47fff9c36ad4a5429f063916
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-05-24 17:04:39 +02:00
Eike Ziller
1c34b266fb Merge remote-tracking branch 'origin/2.8' 2013-05-24 16:22:08 +02:00
Tobias Hunger
75aeb58668 Qbs: Update data in runconfigurations when state changes 
Change-Id: I40bc27d4949d64b3a068a40b6e1e1440057fd36a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 16:21:06 +02:00
Eike Ziller
16c8b9ae7c Merge branch '2.8' of ssh://codereview.qt-project.org/qt-creator/qt-creator into 2.8 2013-05-24 16:20:40 +02:00
Eike Ziller
d8bd56bcd6 Merge remote-tracking branch 'origin/2.7' into 2.8 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/qbsprojectmanager/qbscleanstep.cpp
	src/plugins/qbsprojectmanager/qbsnodes.cpp
	src/shared/qbs

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e
 2013-05-24 16:20:10 +02:00
hjk
b8ea4a9bb3 BaseTextEditor: Remove needless indirection for timer members 
Change-Id: Iace012eb2fba76438d27d80462e6357cbda73f53
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-24 15:38:16 +02:00
Daniel Teske
8b61a5da2e Android: Fix prebundled libraries use case 
Task-number: QTCREATORBUG-9319
Change-Id: Iadf4baee10d51c9cb83ef1fffd2bffd8dc3eae56
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-05-24 15:11:22 +02:00
jkobus
b43027ac38 Git - Use new diff editor also for show and diff branch 
Change-Id: I94d28dbc1cc5f753beda2284244bcd5c2c9df236
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 14:49:50 +02:00
Tobias Hunger
7debb350cf Qbs: Fix crashes in project view when reparsing 
Change-Id: I64c5e53364716db81d2b708b62da71a8e6adae67
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-24 14:37:15 +02:00
Lorenz Haas
c163f8cd66 CppEditor: Uncheck rare functions in "Insert Virtual Methods" 
By default virtual functions of QObject, QWidget and QPaintDevice are
unchecked by default.

Change-Id: I863c3f63ee92d2ddc6f533bd8a65740e87503165
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-05-24 14:33:12 +02:00
Tobias Hunger
d0d8b6aab3 ProjectNodes: Make some methods public 
This reduces the number of hoops I have to jump through...

Change-Id: I416ddb61a7ab0233d7b44619dc020caddb15aedd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-24 14:24:25 +02:00
Daniel Teske
ac93e9734d CMakeProjectManager: Only supports desktop kits 
Task-number: QTCREATORBUG-9340

Change-Id: I1e209cc96bf415fe065520caa51f90d4f5ecf134
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 14:24:10 +02:00
Przemyslaw Gorszkowski
f93758b8e1 C++: fix used template function parameters 
It was missing colorizing and follow symbol template function parameters in case of:
* returning value
* use it as qualified name

Task-number: QTCREATORBUG-6861

Change-Id: I4226199e1f296cfe5a373783ebbc633e32fc9bcd
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-24 14:23:14 +02:00
Erik Verbruggen
feff33827c C++: fix crash when failing to open non-existing file. 
Change-Id: Ie7bd3b36139ab7fac1186cefa7222dff7277eb53
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-05-24 14:17:47 +02:00
jkobus
2ddb726dd5 Add file list combobox to diff editor 
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 14:14:06 +02:00
hjk
13504eec18 Debugger: Use GdbMi convenience functions 
Change-Id: I3c9a4df6b297ddfcce09cf438e42f1d666e910aa
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-24 12:56:51 +02:00
hjk
d165b66bc9 Debugger: Introduce convenience GdbMi::{toUtf8,toLatin1} functions 
Change-Id: I10ec8cdca5aa2c54a5ed557b3c2ddbfd3855c796
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-24 12:56:35 +02:00
Kai Koehne
0a471cc4fd Set breakpoints only by filename (again) 
This essentially reverts 3aa0e50039 , which causes trouble
e.g. for network paths and other corner cases.

Change-Id: I12ceb5fbc68b7a3fc8010165acc910acd2d95e55
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-24 12:48:09 +02:00
Orgad Shaneh
5832945835 Git: Move GitSubmitHighlighter to header 
And change it to derive TextEditor::SyntaxHighlighter

Required for reusing for a BaseTextDocument

Change-Id: I034b76e03e447bcc47f11833367f7bba9cc031c1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 12:30:13 +02:00
Orgad Shaneh
7bfaf7a946 Git: Provide a commit editor for files opened externally 
Change-Id: I52fccf36cca032dda36102d4be2654eb7461de64
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 12:29:49 +02:00
Orgad Shaneh
a9d9d44494 VCS: Rename RegularCommandOutput to OtherContent 
Change-Id: I37d47c79f0efaf51eb5afd1fe529aacfadff8ee1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 12:29:34 +02:00
Orgad Shaneh
05ef32f242 Remove Nokia leftovers 
Mostly internal mimetypes

Change-Id: Ia84206f1334c1f83474cbc307e848719bb98adbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 12:29:23 +02:00
Orgad Shaneh
94148f22e9 VCS: Remove unused editors 
Change-Id: Ia931fdd07d7cf1984f34b10c9b4c20a414c93d9e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 12:29:11 +02:00
Orgad Shaneh
fd48f081c6 VCS: Remove unused extension parameter from editors 
Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-24 12:21:26 +02:00
Przemyslaw Gorszkowski
a439d12b48 C++: fix typedefed struct 
Fixed:
* replacing dot with arrow
* code completion

Task-number: QTCREATORBUG-7373
Change-Id: I6bd3781e91876567ce6f0d4160373438c756c417
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-24 11:46:48 +02:00
Przemyslaw Gorszkowski
783ec18424 C++: instantiate template functions 
Task-number: QTCREATORBUG-9170

Change-Id: I4cac9124558c1d4f0722192246f3fbeea61d3d7d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-24 11:43:52 +02:00
Lorenz Haas
bddaab248b CppEditor: Consider base class namespace in "Insert Virtual Methods" 
Change-Id: Ife5f34d410781d3c1ae75a3bf1c412f7d76dca80
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-05-24 11:40:13 +02:00
Przemyslaw Gorszkowski
80e1ae8059 C++: fix crash during code completion with base template class 
ResolveExpression has to have a reference of ContextLookup. If not there
will be a crash because of deleted instanitated base template class.

Task-number: QTCREATORBUG-9329
Change-Id: I7f8c83da0d81ac6311e76d15a897adbc70b08d75
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-05-24 11:35:11 +02:00
Lorenz Haas
20a23ec72b CppEditor: Do not show InsertDefFromDecl if triggered on a statement 
Change-Id: Ib0b110ac80d9519461a6ba6cf5b7c77925ed2ea5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-05-24 11:12:32 +02:00
hjk
e1db88e113 Debugger: Fix passing addresses to read memory with LLDB 
We need 64 bit on 64 bit machines.

Change-Id: I7efed5ffdccc5ce0aa13b1e7296137396ca28efe
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-24 10:43:59 +02:00
Lorenz Haas
276e2bccaa CppEditor: Hide "Assign to Local Variable" if signatures don't match 
Task-number: QTCREATORBUG-9321

Change-Id: I31ac75a480b30ef26f343557088c4bbe5e95c4c6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-05-24 10:22:21 +02:00
hjk
8ffb0c7c1f Debugger: Implement stack frame switching with LLDB 
Change-ID: I6efed5ffdccc5ce0aa13b1e7296137396ca28efe
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-05-24 10:16:43 +02:00
hjk
7fe9bcdb07 CppEditor: Don't try to set mimetype when opening failed 
Change-Id: Ie0823acc3dfd216c3f22a93ee39d9919bf95c0a9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-05-24 09:46:36 +02:00
Nikolai Kosjar
e6c8228820 Sort menu for adding a run configuration 
Change-Id: I16d18676a67040492e3bac6c0fd70168c6af32ee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-24 09:46:06 +02:00