Commit Graph

31174 Commits

Author SHA1 Message Date
Tobias Hunger
4780061471 ProjectNodes: Sort based on line numbers
Sort filenodes based on filenumbers if filenames are identical.

Fall back to comparing pointers only if the line numbers are also
the same.

Change-Id: I5e53f01c2b4684307895a57a2d1b27507e218af3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-10 15:41:15 +02:00
hjk
10e01db4fb Debugger: Make autotest pass for LLDB arrays
Change-Id: I1baa4684e85d0ccd677956eeff88b4cc7d807922
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 15:40:12 +02:00
Kai Koehne
d5b48c0c92 Debugger: Only enable C++ language if project says so
Fix a regression from 2.7: A new .qmlproject did also have C++ enabled
as a debugger language by default. Instead of reviving the old, hacky
logic from 2.7 that directly manipulated the aspect object,
the aspect now checks for the actual project language, along the logic
of the QML language check.

Change-Id: I77c9323fd59079c42874dadf4dc54b9991204d9d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-06-10 12:38:41 +02:00
Thomas Hartmann
c64ae55799 QmlDesigner.Rewriter: fixing encoding issue for Qt 4
QString uses utf-16 internally. If we explicitly convert to utf-8
and then use the QByteArray implicit constructor of QString again,
Qt 4 will interpret the utf-8 encoded string as latin1.
This results in a wrong string for everything that is not pure ASCII.

With Qt 5 it works, since the assumed default encoding of QByteArray
is utf-8. Still any conversion does not make sense.

Task-number: QTCREATORBUG-9493
Change-Id: Ifbaa4684e85d0ccd677956eeff88b4cc7d807922
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-06-10 12:23:42 +02:00
Orgad Shaneh
d6da0901eb Debugger: Support gz core unpacking
Change-Id: If69b890484ea27c8c35c77936186d183b8b47b98
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 12:19:01 +02:00
Petar Perisin
7fffe3cef6 Git - Get changes actions dialog back to where it was
This dialog was before, in QtCreator 2.7, used only for show. It was in
main git menu, and available always. Although a lot of new options were
added to the dialog, I think it is good to get it back to where it was
before, so that 2.7 users can find it easier.

Also, I prefer this location for it, since it is easier to access here.

Change-Id: I510ab0efb081194e70f6297125012034103e13e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 12:07:39 +02:00
Friedemann Kleint
6e2c3c4257 tr()-fixes in fakevim.
Change-Id: I17c16616a6d28dbf08f0de8dba57bb37568aab02
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 12:04:28 +02:00
Daniel Teske
8011d0c32b Android: Use '/' in INSTALL_ROOT if sh.exe is in PATH
Task-number: QTBUG-31147

Change-Id: Ifdeef2fa96668fdb482fd613eb8766c1ff5e3afd
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-10 11:43:44 +02:00
Orgad Shaneh
96a0920440 Git: Use file directory as editor source for files opened inside git dir
* git rev-parse --show-toplevel doesn't work inside git dir.
* Only "Describe (show)" should be available for those files. show
  works when running from inside the git dir

Change-Id: If5f3d1af8da2f8d149ac1e03ffd70b530e609557
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:38:23 +02:00
Orgad Shaneh
879012a50b Git: Mark forgotten cases as expected to change
* When mergetool is done
* Stash
* Stash pop
* Continue/skip command
* executeAndHandleConflicts
* Interactive rebase

Change-Id: Ic8108b096c367c7777dae06f7ff255999d64fda9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:38:00 +02:00
Orgad Shaneh
0bd5e79bc7 Git: Disable cherry-pick and revert for commit message and int. rebase
These editors are usually opened when a process is in progress, so
it doesn't make sense to allow reverting or cherry-picking for them

Change-Id: I6f238ef973be86d07d2646bcea969f9aa2742b9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:37:47 +02:00
Orgad Shaneh
808f4492c5 VCS: Add a property to Command to indicate expected repo changes
Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:37:36 +02:00
Orgad Shaneh
aae82f0e29 Git: Add using VcsBase::VcsBasePlugin
Less noise

Change-Id: I5c13af770f04ae411b09ed824cf93d2768b8e224
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:37:29 +02:00
Orgad Shaneh
050d13726a Gerrit: Replace --remotes with -r for "git branch"
--remotes was added in 1.7.7

Change-Id: I691bfada8e0b4d2f00924caa76271ee256edf62c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:31:23 +02:00
Eike Ziller
7e5b462377 Don't resize (external) editor windows when changing editor
Change-Id: I0b46e2403e67e29151c7b02e7371eaf4569f7168
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-10 10:30:39 +02:00
Orgad Shaneh
e8c1b8b739 Git: Remove unused forward declarations
Change-Id: I1926733dc88902e75921a6bfa184e3f6b27ce98d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 10:25:43 +02:00
Orgad Shaneh
f6ec8c3342 DocumentManager: Support expect/unexpect directory changes
Change-Id: I68b69fa00dd6cc189ecfcdb9dfad09c41531883f
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-10 10:12:05 +02:00
Laurent Montel
a88c52ae0a Using double click on item to select encoding
Change-Id: If5f58467144a72d29fca7b320f55cd9c21f4457f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-10 10:10:11 +02:00
Orgad Shaneh
5b115fe9ae Debugger: Improve core unpacking
* Delete process when finished
* Handle unpack failure
* Support lzop on Windows (if available)

Change-Id: I8d95b77922c8b22b5874dffd8f935ff184902e12
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 10:06:25 +02:00
hjk
46171f5470 Debugger: Un-duplicate dumper code
Change-Id: Idf617c9ea7e13474abab6fc5dad4f8885dc7902b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 09:51:42 +02:00
Christian Stenger
9e4fa5e29e Squish: Fix installLazySignalHandler() registration
Change-Id: I3bab865726feedc6df54ad852d4aaf5f3bc1460d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-10 09:21:09 +02:00
hjk
84b72f8974 Debugger: Add option to display pointer as arrays
Task-number: QTCREATORBUG-8904

Change-Id: Ic4129bff89afb6b3f6d210cbd738c3281c174884
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 17:12:57 +02:00
Eike Ziller
14fe692933 Explicitly quit when all (relevant) windows are closed
This shouldn't be necessary, works around QTBUG-31569 (Qt5)

Change-Id: Iff157a76a896bc4d6224039ae859788818abba8b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-07 16:44:30 +02:00
Orgad Shaneh
029fd5a572 Streamline mimetypes.xml files
Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-07 16:23:19 +02:00
hjk
67c3fed2c0 QmlJSEditor: Rename QmlJSEditorEditable into QmlJSEditor
Change-Id: I710817ffd7bdf87aa6c0fed0f1f3cd4ea842fd01
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-07 16:20:38 +02:00
hjk
c5f1928efe Introduce a manual test checking for available C++11 features
The plan is to use some interesting C++11 features in the
code base as soon as they are available in all compilers
we need to support.

Change-Id: I725797bdf03c64458f7f2d9b010d1cc2cdf8cdb3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-07 15:49:10 +02:00
hjk
e40308ab1b Debugger: Remove in-plugin dumper autotest handling
It's covered by tst_dumper nowadays.

Change-Id: Id6b91e5a4ad2ac2472d598c4f0ba4c95c334af6d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-07 15:48:43 +02:00
jkobus
2ddcc0c386 Fix wrong diff output with span lines
Task-number: QTCREATORBUG-9494

Change-Id: Ica26e1448b1997e102648be58128f1be00c4905e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-07 15:36:55 +02:00
Christian Stenger
c8b478f0bd Squish: Stabilize invoking tab item widgets on Mac
Change-Id: I16a61c1215d64243238a4cfbee007a78c282eb4c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-07 15:33:55 +02:00
Nikita Baryshnikov
be5c2ea372 Mercurial: Handle HTTP authentication
Make it possible to pull and push onto online repositories with http
authorization.

Task-number: QTCREATORBUG-5104

Change-Id: Id5f5a865d301e644002e4fa8b7056d08fd9b7467
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 15:24:34 +02:00
Christian Stenger
b3dd4db044 Squish: Handle files located inside HOME or subfolders
Change-Id: I31e00cbf00e07749cf8e54732ec6cdbf623e44dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-07 13:57:46 +02:00
Peter Kümmel
84dd8dd669 gdb version string: ignore (...) content when using rubenvb's build
The often used rubenvb mingw-w64 build reports a GDB version string with
the GCC version in parentheses:
  GNU gdb (rubenvb-4.7.2-release) 7.5.50.20120920-cvs
With his patch the content within the parentheses is ignored, and is not
wrongly interpreted as GDB version.

Change-Id: I1a3c54acc81cb6d649d11ebf38dea96fc2685aa1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 13:48:21 +02:00
hjk
6168172586 Debugger: Nag user before removing all breakpoints
Change-Id: Idf68cbfee070a107be8f8daf9d6624339864dd2c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 13:37:18 +02:00
hjk
017dd240d4 Debugger: Dumper fix for Qt 4
QMap, QStringRef

Change-Id: I67fab7f78cf7718e37a9cd77af6fc9c6a9751c66
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 13:36:43 +02:00
hjk
9155e14db2 Debugger: Allow continuing debugging when switching projects.
Change-Id: If99fc8dc7697eaef50ea7bf7656c0ce788201679
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 13:33:17 +02:00
Leena Miettinen
00ac1f8918 Doc: move imageviewer docs from headers to cpp files
Use standard wording for function docs. Use valid
QDoc commands (\a instead of \param, for example).

Change-Id: I556fdbf686f2f54138617d6784c650a1d973513c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-07 11:10:55 +02:00
Christian Stenger
a83a40d7af Squish: Added verification to selectFromCombo()
Change-Id: I694163aeb7a588618207ec4064f93658e25e1917
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-07 09:54:57 +02:00
Christian Stenger
322853ec69 Squish: Don't let test run into ScriptError...
...if former verification already fails.

Change-Id: I0a5d60f6a91158ed1decdedd8aa7e98ac047a44b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-07 09:54:49 +02:00
Leena Miettinen
3ed5fc2b8f Doc: the side-by-side diff editor
Change-Id: Ia984077086dd1f6c44be08176ab846f54be05cca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-07 09:43:31 +02:00
hluk
79ae5a0f05 FakeVim: Scroll only if it's really necessary
Task-number:QTCREATORBUG-9483
Change-Id: I5836b38fd663aa5471bedd389aa786002791aa6e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 09:37:08 +02:00
hjk
17dcb6d38c FakeVim: Move .vimrc related options closer to each other
Task-number: QTCREATORBUG-9406

Change-Id: I61333e3105e8d8edb03edecdfdac9d9f11dfc3b5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-07 09:18:27 +02:00
hjk
b00bb2c57c Debugger: Make QLocale dumper test pass
Still requires an inferior call.

Change-Id: I98000f0236ec09094e7792f8d6fa3e156f324fcb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 09:16:08 +02:00
hjk
49687f7167 Debugger: Fix wrong input in QByteArray dumper test
Change-Id: I9cb717a1e92b96c12e3bd7876ad40e952c7a2c20
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 09:15:40 +02:00
Thomas Hartmann
3c1d6e7978 QmlDesigner.ItemLibrary: the state of sections should be persistent
Once a section is collapsed it should stay collapsed until
it is expanded again.
Before this patch changing the document or going to text mode
did reset the state.

Change-Id: I5d3b4164cbef75276a2e0e92fb4bfa77292f73db
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-07 08:49:25 +02:00
Tobias Hunger
9db57f3f05 Qbs: Delay reparsing of the project
Makes the whole thing feel more responsive:-)

Change-Id: I1b3941ab42bb1a281c0923e3826b00d1f1400abe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-06 18:46:33 +02:00
hjk
cbcd0bee3f Debugger: Suppress GDB's memory-changed notification
Change-Id: I266b1cef33e53250da79fac0473c3d45eb740ddb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-06 18:37:40 +02:00
Tobias Hunger
26483b6fa9 Qbs: Update to latest Qbs API
This also fixes parsing when environment variables are read in
qbs files.

Change-Id: Iad78296986f8700272d6027d2ffa645d4207bdef
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-06 18:32:22 +02:00
Tobias Hunger
531676bc27 Qbs: Remove some useless member variables
Change-Id: I648984616ebd965e51ebe6ec6f369a6dfa4fc339
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-06 18:32:09 +02:00
Tobias Hunger
4a8fc32665 Qbs: Clear compile issues on rebuild and remove useless comment
Change-Id: I705564ee422295ec467cd51a62aa71183afa0b63
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-06 18:31:51 +02:00
Marco Bubke
65b99d1d8a QmlDesigner: Remove recursive NodeInstanceMetaObject creation
Change-Id: I3e5f46413767f5d1649a0c526f69f434e897b597
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 18:01:32 +02:00