Commit Graph

31174 Commits

Author SHA1 Message Date
Yoann Lopes
bab3b010af Android: fixed updating Java files on Windows.
When looking for lines in Java files that are not supported by the
selected API level, it didn't take into account that line endings are
"\r\n" on Windows. toInt() was failing, trying to convert for example
"10\r" to an integer.

Change-Id: I35478abd40d5ce4621d2320b3a5f5a3514cf9591
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 13:11:45 +02:00
Nikolai Kosjar
b8a2983fd5 CppEditor: Fix sorting of quick fixes "Add {public, private, ...} declaration"
Change-Id: I43f09042a525a798d95b3365873be24eafd423e9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-04 13:10:27 +02:00
Erik Verbruggen
5e5c5bb02b C++: re-enable quick-fix sorting.
Also make sure that "Apply function signature change" gets to the top
of the list.

Task-number: QTCREATORBUG-9441

Change-Id: Iaf67f8ea9c99ddfc973e610f7e0f4c35b7967629
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-04 13:10:17 +02:00
Gunnar Sletta
b91a5bcb13 Force gray-antialiasing for text.
Subpixel antialiasing cannot be supported when rendering is done
to a transparent-cleared FBO.

Change-Id: I46eeac792416f6164521c9142a8b6cffbbddc99b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-04 12:41:33 +02:00
Marco Bubke
333cec5957 QmlDesigner: Change main.cpp in qmlpuppetmain.cpp
To better find it in the qt creator locator.

Change-Id: Icfc7b400ee972802471a7a52f8552bb0fd41acdb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 12:41:00 +02:00
Gunnar Sletta
3fbd0c6170 Force gray-antialiasing for text.
Subpixel antialiasing cannot be supported when rendering is done
to a transparent-cleared FBO.

Change-Id: I46eeac792416f6164521c9142a8b6cffbbddc99b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-04 12:23:40 +02:00
Tobias Hunger
905d0aee15 Qbs: Seriously speed up the update of the Project Tree after reparse
Do not emit an updateNode signal for all existing nodes, but only for
those that actually changed state.

Change-Id: I0a906833a6879e224df0d4be05d3813b8e130083
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 12:15:34 +02:00
Aurindam Jana
b0854e3c71 QmlConsole: Fix bug: Jump to location in editor
Since the file path starts with file:/// use QUrl to
get local file name.

Task-number: QTCREATORBUG-9337
Change-Id: Icf591fdcab8cb626cfbf844c451a2c87c07b853a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-04 12:11:36 +02:00
Christiaan Janssen
25dd94808d QmlProfiler: fix dangling pointer in Engine
Task-number: QTCREATORBUG-9391

Change-Id: Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-04 12:06:53 +02:00
Tobias Hunger
d97a7f4067 Android: Save MakeExtraSearchDirectory in settings
This will keep the setting from vanishing after the first time
creator is run.

Change-Id: Ie3f99cfbe37fc5c242e5388a87edf3f0bdc08a30
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 12:01:45 +02:00
Eike Ziller
897ea412c3 DiffEditor: Fix context lines spin box layout.
Work around a regression in Qt 5 (QTBUG-31538)
Also prefer setting left+right margins instead of all margins for the
label.

Change-Id: I108de101239145295d37002aa989a959d8041c55
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-04 11:24:51 +02:00
jkobus
aa0533c969 Move "Sync Horiz Scroll Bars" corner widget to the toolbar
Change-Id: Ie97ae07b02499b4d8d80e006aa77ca3b802f39b3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-04 11:14:06 +02:00
Petar Perisin
36bec480ae Git - execute push asynchronously
Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:59:38 +02:00
Petar Perisin
dd7c2e622e Git - refactor executeGit and remove unnecessary args
Change-Id: Idf770a20db66191b4d7fe3a704d31bdce70505c5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:59:06 +02:00
Petar Perisin
80a7107691 Git - execute fetch asynchronously
Change-Id: Ic2243adaa36444099f834676186331927f3f4588
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:58:56 +02:00
jkobus
26142b849b DiffEditor: Apply visualize whitespaces according to options
Change-Id: I5f7c57479d5342f5457159b14fb6afa087cb988f
Reviewed-by: Marcel Krems <m.krems@software-vision.eu>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:56:48 +02:00
Orgad Shaneh
1f447715b0 Git: Remove double warning for gerrit push
Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:43:54 +02:00
Orgad Shaneh
92392454b7 Git: Do not pop stash if a command is in progress
Running interactive rebase and choosing edit for a commit causes
stash pop when the commit is expected to be edited

Change-Id: I37249e8486b609dedba143bd130059444f882303
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 10:43:35 +02:00
Tobias Hunger
d96535bd23 VCS: Clear directory cache when availability of VCSes changes
We could have gotten new VCSes or existing ones might have gone,
so clear the cache of which VCS manages which directory.

Change-Id: I87a1b9c894e2867773ea4df221e463adb14f4ee9
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-04 10:38:14 +02:00
Marco Bubke
3a5597ec00 QmlDesigner: There is no textColor property in the Button
Change-Id: Ic45416d1ad187520dc4771192e621d7e44ee360f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 10:24:27 +02:00
Eike Ziller
199c13153c Bookmarks: Separate destructive actions.
Destructive actions should be separated by separator in menus to avoid
mis-clicks, we also did that for e.g. the Build menu.

Change-Id: I9dfecefb487d953a1c57ffa41c76a1542dee16c2
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-04 09:53:35 +02:00
hjk
c7ea186df9 Debugger: Always check for availability of python with GDB
Trying to avoid that round-trip on versions that are known to
not have it puts us on the mercy of detecting the version,
which is unreliable by nature, and bad in practice, as proven
by the recent MinGW builds.

Change-Id: I122eb03fe0ddcb193ed8d45e672564f7113b662f
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-04 08:29:55 +02:00
Orgad Shaneh
bde5c5c2c6 QtLocalPeer: Remove superfluous static member
Change-Id: Ib78b8459e742df6d57a52a4f3ebcd3359d8497b1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-04 08:10:42 +02:00
hjk
3814e262ff DiffEditor: Rename DiffEditorEditable to DiffEditor
More in line with current naming conventions.

Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-03 17:28:48 +02:00
hjk
76fc972277 Debugger: Add specific customization hook for dumper initialization
We need to distiguish between start of GDB itself (a.k.a .gdbinit-style
customization) and after the dumper machinery is initialized, which is
nowadays often delayed until the first stop hook.

Change-Id: I40f1e7225c2043b8bcb7d50eef948bb3c9162bb6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-03 17:27:39 +02:00
Leena Miettinen
c140442132 Doc: opening the editor in a new window
Change-Id: I9a265b10c91950754c710ee270cae4530a808ea8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-03 16:22:07 +02:00
Tobias Hunger
d09f39931f MiniProjectTargetSelector: Work with no sidebar
Fix MiniProjectTargetSelector becoming too small when no sidebar is
displayed.

Task-number: QTCREATORBUG-9423
Change-Id: I40f9093f7217448c3b29a699aa8e07710127d608
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-03 16:17:01 +02:00
hjk
34902ab6aa Debugger: Improve wording of the "Close buffers on exit" option
Change-Id: Icb94fc1123f0b1f675356e9f3c347f25a6c3cb53
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-03 15:45:05 +02:00
Erik Verbruggen
10725c086b C++: fix Q_CREATOR_RUN macro handling
Moved it from the handleIfDefDirective to the pre-defined macros, so
that #if defined() can also see it.

Task-number: QTCREATORBUG-9322
Change-Id: Icbecad5c885dd2374b559969c99631c3ddc73844
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-03 15:41:54 +02:00
Eike Ziller
ce4edd7930 Editors: "Split New Window" --> "Open in New Window"
Change-Id: Icbf27edc8b3d7bd73504b449491f70056220c99f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-03 15:38:17 +02:00
Tobias Hunger
2af8faeb91 ProjectExplorerSettings: Keep environmentId.
Make sure to not change the environmentId when editing something
in the settings page.

Task-number: QTCREATORBUG-9359
Change-Id: I7fc891cb3a69f08b1c2ea3f963a2deb01ddca9b2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-03 15:32:50 +02:00
Tobias Hunger
078942b767 ProjectExplorerSettingsPage: Do not have a const setter.
Change-Id: Ic0a71ce49b9f65894860562b8414772cd839152c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-03 15:32:42 +02:00
Erik Verbruggen
6d544bc2ca C++: handle braced return statements in indenter.
Task-number: QTCREATORBUG-9314

Change-Id: I59c026cce02b85eeb54f4d10d5c9fb0c59bfe28a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-03 15:17:16 +02:00
hjk
db4a8caf32 Debugger: Move warning of insufficent python version
It was in exactly the wrong branch.

Change-Id: I0679c18dc9c049bb89c2cba47cb0762ad81e3024
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-03 12:38:52 +02:00
hjk
39ac967d91 Debugger: Suppress listing __PRETTY_FUNCTION__
It's visible in the stack view anyway an make auto-resizing of
the L&E view ugly due to its length.

Change-Id: I722eb03fe0ddcb193ed8d45e672564f7113b662f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-03 12:37:39 +02:00
Eike Ziller
9ff6490dfc Save mode visibility in a separate property.
Instead of using the actual visibility state of the widget, which might
have screwed things up if for some reason the widget itself was not
visible the moment settings are saved.

Change-Id: I7ae89259dc925f799bca413b537b65e9e689e1b7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-03 12:35:36 +02:00
Christian Stenger
0e75e5cb61 Valgrind: Fix compile
Change-Id: I247ba4ba11fc036d0afaa70d98e89eaf2315b60a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-03 10:44:37 +02:00
Orgad Shaneh
5d39fcf7cf Git: Better wording for rebase in progress message
Change-Id: I13d002773dd81206c70b7eb91727f152d7e84507
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:41:30 +02:00
Orgad Shaneh
a91219c636 VCS: Fix context menu for custom editors
Change-Id: I44718dce73bbcd376d90fdf40f4bb5ab4c57443a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:40:50 +02:00
Orgad Shaneh
3f1901cb1f Git: Provide a real highlighter for interactive rebase
* Kate highlighter doesn't have enough colors
* It works out of the box only on Windows
* New editor support links

Change-Id: I09bbaef08574660e535ccb86c2c460d5976fc2e3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:40:32 +02:00
Orgad Shaneh
3e022beb12 Git: Move submit highlighter to a separate file
Change-Id: I61e07b2abe3b1da1b56935bb3ce528a5f571705f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:37:48 +02:00
Orgad Shaneh
bcd8c02aea Git: Prevent or close fixup editor if no local commits are found
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:36:22 +02:00
Fawzi Mohamed
5a4cdc11cb qmljs: adding qrc support
Qmljs now keeps a cache of parsed qrc files, and can resolve "qrc:" links.

This breaks the assumption that the name that the qml files has on
the filesystem is the one that qml sees, and that contents of
directories can be found just looking at file whose path starts with the
directory path.

Currently the first file is used when multiple qrc files contain the same
path, but support for strict and weak path resolving is already there.

At the moment only qrc files for projects that call updateQmljsCodeModel
are updated.

ChangeLog: QmljsSupport: Imports using qrc links are resolved.

Task-number: QTCREATORBUG-8953
Change-Id: I695fac2692af2417d49c192c580a1c2e7b4873f4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-06-03 10:32:13 +02:00
Tobias Hunger
69a9dc3f1c SVN: Document minimum required Subversion version
Change-Id: Ia689f7686b1efe30e839aa03a5a3f9c5cd801915
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-03 10:15:17 +02:00
Peter Kümmel
1d0e5f4791 KitNode ctor is called with Kit *k=0 by design
Check k before using it.

Change-Id: Ic240b7a60b0d2b89e209a795525097cd99c9518a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:09:19 +02:00
El Mehdi Fekari
db7caaa76c Qnx: Fix slog2er parsing when logs contain \n
If the logs contain a '\n' the message parts in the new lines are not displayed.
The new line messages are displayed with no buffer details and are ignored
when the parsing is processed.

Cherry-picked: a7fa0dd4b9

Change-Id: I0e174dd5283a64c4e9b0434c06dd417f1be2c810
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-03 10:08:37 +02:00
Eike Ziller
4933406f06 Use EditorManager::openEditorAt instead of duplicating code
Change-Id: I231e89849e2f06958d05a511320ec236b5702a1c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:33:23 +02:00
Eike Ziller
2125525e77 Move openEditorAt from BaseTextEditorWidget to EditorManager
More sensible place, gotoLine is a method in IEditor anyhow.

Change-Id: I420a6bf17060c16e6f1a4f45e0bef89379fb6bf8
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:33:06 +02:00
Eike Ziller
97ce8e4098 Remove IEditorFactor::open implementation with a warning
Looks very much like the current IDocumentFactory / IEditorFactory
set up does not make much sense. Should be cleaned up in a follow-up
commit.

Change-Id: I000b68fe6b6d75add713866818711545b41dfe23
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:32:51 +02:00
Eike Ziller
37c22861dc Fix showing of info bar in .ui text editor.
Removes another useless IEditorFactor::open implementation

Change-Id: I01d3c46131e8e3d6dcce1f0e338bc7d637153e98
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-03 09:32:40 +02:00