Commit Graph

31174 Commits

Author SHA1 Message Date
hjk
e8093a9e59 Debugger: Show nested arrays in LLDB
Change-Id: I0130b769e977c6ffced1a87715831386ef0d5319
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-11 18:33:04 +02:00
Daniel Teske
b696005f02 LocalRunControl: Fix wrong "exited with error code -1" output
Task-number: QTCREATORBUG-8337
Change-Id: I585b6330e6aa18891ebf0171bf6c8813761943f1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-11 18:18:21 +02:00
Tobias Hunger
f5b112c6e0 Environment: Mark hasKey(...) method as const
Change-Id: I8f355e6ead9136741af199d08935a0f3e7446110
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 18:16:42 +02:00
Daniel Teske
7ce368b3c0 Qmake: Output warning of not executable qmake once
Task-number: QTCREATORBUG-9512

Change-Id: Id5940ef8933958f994d3564dfc9b5cc7362c7dfa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-11 17:47:03 +02:00
Thomas Hartmann
30c602f458 Fixing Info.plist.in for qmlobserver and qmldump
Since we use Info.plist.in we need QMAKE_SUBSTITUTES
and cannot use QMAKE_INFO_PLIST.
We manualy replicate the target logic.

Change-Id: I5b703d09db85457ba3bdadef97fd1cc2194b618f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 16:57:38 +02:00
Erik Verbruggen
271c3f45a4 C++: Fix preprocessor blocked macro bug.
By lexing the first token after a macro call (meaning: the token after
the closing parenthesis (which was passed to handleFunctionLikeMacro
which in turn pushed it back into the token buffer)), a token buffer
might be popped, which unblocks the macro that generated the actual
param pack. The effect was that if this happens in the expansion of a
recursive macro (with parameters!), the preprocessor ended up in an
infinite loop.

Task-number: QTCREATORBUG-9015
Task-number: QTCREATORBUG-9447

Change-Id: I0d83c59188ec15c4a948970e9fa944a17d765475
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-11 16:57:07 +02:00
Marco Bubke
d0afdfcc2b QmlDesigner: Remove unused function in ObjectNodeInstance
Change-Id: I4286439082f25fa1eeaf4b90ae3d00aedd80cd51
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-11 16:44:46 +02:00
Thomas Hartmann
b13a47f566 fixing Info.plist
info was missing a $$PWD/ in .pri files.

Change-Id: I01771021595c706514786c9d7b2991cc5d9f60cb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 16:44:35 +02:00
Nikolai Kosjar
f1736b079d CppEditor: Put '{' on new line for "Add Definition Inside Class"
...to be consistent with inserting "Outside Class" and "in xxx.cpp".

Change-Id: I32a43153d5d3bdec9fae0be731484a26b108c438
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-11 16:32:34 +02:00
Nikolai Kosjar
546d297856 CppTools: Handle operator functions when reformatting */& declarations
Respect also whitespace within the operator names (e.g. "operator=" vs
"operator =").

Change-Id: Ibdfc77e9eebf7e3db31ccce7d8959b226dcda765
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-11 16:32:24 +02:00
Nikolai Kosjar
50a900e509 C++: Handle recursive using/typedef declarations
Remember using/typedef declarations we have already looked up and
stop if we try it again.

Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-11 16:30:58 +02:00
Nikolai Kosjar
8f1b665667 C++: Handle recursive auto declarations
Remember auto declarations we have already looked up and stop if we try
it again.

Task-number: QTCREATORBUG-9503

Change-Id: I989b11609c98bf197ce916d79c9d452294355053
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-11 16:30:20 +02:00
Andre Hartmann
f1ed40a02c Git: Add Gerrit to Locator
The Gerrit dialog itself was missing while Push to Gerrit was already
there.

Change-Id: Ie4b85cad9dba96beafb595c505daf28d0a1ceeb5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-06-11 16:24:47 +02:00
Daniel Teske
8127ebe244 Android: Show complete output of ant run
Change-Id: I4964e5bf22a715375a7fa080604d16692c956fc2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-06-11 16:13:14 +02:00
Tobias Hunger
0eebbf464b Qbs: Update again to fix build
Change-Id: Ica34fd300129902ad6237b832cfa4a37c565b9fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 16:11:54 +02:00
Nikolai Kosjar
f3186690bd CppEditor: Improve finding position for new includes
...by detecting include groups (separated by new lines, include types
and same dir prefix).

Task-number: QTCREATORBUG-9317
Change-Id: I73e80fdc715104901cb2d4f5b15b4cab5d04d305
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-11 15:57:10 +02:00
Nikolai Kosjar
e3bc84c414 C++: Record also unresolved paths for includes
Change-Id: Id107b6c1f34f594c5a01502c156963c964235ed7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-11 15:54:52 +02:00
Tobias Hunger
35a790fb63 Qbs: Update qbs again for even more fixes;)
Change-Id: Id1e0a1d869f44c020d1d1ab432da3fa75c528a06
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 15:52:35 +02:00
Thomas Hartmann
03e76d80a8 QmlDesigner.PropertyEditor: We fully qualify QML components
When collecting the super classes/types we did not fully
qualify QML components.
(e.g. just Button instead of QtQuick.Controls.Button)

This patch now fully qualifies the QML component.

The missing qualification broke the specifics mechanism in
the property editor (see task).

Task-number: QTCREATORBUG-9222
Change-Id: I61b6b6432493c1c440356547003269767415acb4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-11 15:52:16 +02:00
Lorenz Haas
d2faf880f3 CppEditor: Fix triggering AssignToLocalVariable
Do not trigger for functions inside a function call.

Task-number: QTCREATORBUG-9510
Change-Id: I908483fe80ff3ac0f737b21061375e206c1b1d1d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-11 15:46:44 +02:00
Thomas Hartmann
bd7150ab89 QmlDesigner: fixes warning
We get a warning if the operator is used from another module.

Change-Id: Ib798037cb6e16fbb2c3fb4fb61d9445a0d5cd93d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-11 15:44:52 +02:00
Thomas Hartmann
5e571b57d6 QmlDesigner: also assume Qt Quick 2.0
Change-Id: I93fc12690a3a0e3223992551116d36fdaa2699d4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-11 15:44:44 +02:00
Thomas Hartmann
262f67a0ab QmlDesigner.Model: removing unused files
Change-Id: I2ee68bff1100099769cb8a4413052c7f0b8f88aa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-11 15:44:36 +02:00
Robert Loehning
c2061eaae9 Squish: Updated paths to Harmattan Qt version
Paths change when updating or freshly installing the Qt SDK.

Change-Id: I18c3e5ea86be4f0ad3522cfd6e19c09b57ea56c7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-11 15:42:33 +02:00
Daniel Teske
883d6537c2 Android: Rename OpenJDK setting to JDK.
Change-Id: Ifc1ea9ccea831270a83a114eb46ade2c68995bc3
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-06-11 15:36:08 +02:00
Orgad Shaneh
eb2a359f06 Gerrit: Close write channel for fetch process
Change-Id: I1557d2e57f5838d7820bcb41190ff2bb4b9a0473
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-11 15:11:18 +02:00
Kai Koehne
b57e3552d0 Debugger: Fix compiler warning about initialization order
Got introduced in 21150df910

Change-Id: I8be4a8c01b858327b2df519195c0d3b30b5816f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-11 14:52:05 +02:00
Kai Koehne
dcaa9ff140 Make Qt version combo box on welcome screen wider
Expand the width from 140 to 200 px to make sure that usual names do
fit.

Change-Id: I311ba32a7f300e96ec6b6d183d1078467a71e26a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-11 14:36:28 +02:00
Tobias Hunger
53823c3f94 Qbs: Remove useless DEFINES from .pro file
Change-Id: Iaa79e316bf1ffcf2370689db9d1fdd3836dbfe4d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 14:12:23 +02:00
Tobias Hunger
722d75a2a4 Qbs: Update qbs code to latest version
Task-number: QTCREATORBUG-9356

Change-Id: I325fd59e5a974232f53ac5ea2d38d7c8bd3cad50
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 13:57:35 +02:00
Kai Koehne
5c824a0dd6 Welcome screen: Show real name of kit in examples combo box
Show the display name of the kit, instead of computing a generic
one out of the Qt version.

Change-Id: I9d3700bdd64a686f1761c073a47b57153c2ca10b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 13:49:11 +02:00
Orgad Shaneh
17106e69c4 Suggest configuring VCS if it is unconfigured
Change-Id: I6ef3c615070f055e688c94d6901d8c9a861b9928
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 13:34:04 +02:00
Erik Verbruggen
0f2a0d9358 C++: cache results of linksForIdentifier in HelpItem.
The method linksForIdentifier was called at least thrice when generating
a single valid tooltip in the C++ editor. Now the cached, and the cache
can be "initialised" during construction. This reduces the time spent
for creating a tooltip by 30%.

Task-number: QTCREATORBUG-8970
Change-Id: I5130b769e977c6ffced1a87715831386ef0d5319
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-11 13:03:26 +02:00
Orgad Shaneh
f6833168ac Git: Capitalize display name
Change-Id: I1274cf39ad02e214c64b0ca3308381adae2a5a80
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 12:32:33 +02:00
Orgad Shaneh
161b016aa1 Git: Fix title for Fixup Commit
Change-Id: I9d2e9f76a165a57588c29bc1db1a087fc7cb441b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 12:32:07 +02:00
hjk
5e005443eb Debugger: Save watcher history
Change-Id: I2cb838bf78a095b822540f4dd98b9b4170079f93
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-11 12:04:13 +02:00
hjk
3958a83e9f Bookmarks: Ask for confirmation before removing all bookmarks
Change-Id: Ib55d38269e6a2c5a28d320b115d3491a4e1b479b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-11 11:49:59 +02:00
Eike Ziller
8800018224 .qbs/Mac: build tools without app bundle and install to right location
Change-Id: I422835b2e85600846aec4d309249059acf1fa483
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-11 11:43:44 +02:00
hjk
0bf7854882 Debugger: Hard-code fallback path if LLDB does not handle -P
The fallback is the "standard" location for LLDB coming with XCode.

Change-Id: I1230176bc7e96476e2f748d850a5a4c93b57cafa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-11 11:24:35 +02:00
Orgad Shaneh
69d0d6cdca Git: Style fixes
Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 10:30:55 +02:00
Orgad Shaneh
5cb29aec0b Git: Initialize ConflictHandler before executing command
expectDirectoryChange is called by ConflictHandler. After the command
is executed it is too late

Change-Id: I27e82fd2a979a043932b4a838f3736cbe0f60107
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-11 10:30:43 +02:00
Thomas Hartmann
e97a565605 QmlDesigner.ItemLibrary: fix search pathes for .metainfo
Change-Id: I8f79b8ad41acc8f8aa77d78037191513596de924
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-11 10:17:16 +02:00
David Schulz
21150df910 Debugger: Enable noisy symbol loading when verbose log is enabled.
Change-Id: I0dda7f5ef471f3cb6379e4dda2900e4c8c0f87cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-11 09:47:51 +02:00
Leena Miettinen
0b6d8a1da5 Doc: new Git commands
Actions on Commits, Fixup Last Commit, Interactive Rebase,
Rename branch, Push to remote repository, and Push to Gerrit

Change-Id: I434f836944d9fa86fad73f0256b330aad9532ed0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-11 09:07:43 +02:00
hjk
fa09ad8f15 Debugger: Make Debugger path configuration dialog a bit wider
Change-Id: Iaf3202b70fdef2508259287f7c275a96aaf8f51d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 18:47:29 +02:00
Robert Loehning
cefd997e92 String fixes
Change-Id: I9dbc3d3aa8eb39ade9e801b219aea575d44b33ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-10 18:04:07 +02:00
hluk
8c944eda89 FakeVim: Fix cursor position and anchor after search
Change-Id: I1e093d042033d87f0382560e00f71d24c7f55b03
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-10 18:02:36 +02:00
Nikita Baryshnikov
f20dd4f966 Mercurial: fix typo
Changed constant name from MECURIALREPO to MERCURIALREPO.

Change-Id: If37a0e9a6034fe31d8bc15e760b6e2541fbeb8ce
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-10 17:32:35 +02:00
Tobias Hunger
61552f87ce Qbs: Fix crash when handling files not belonging to a project
Change-Id: I8631ac0677205412306cb26a85b5b04e6f82fdd2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 17:01:10 +02:00
Tobias Hunger
f5d7707188 Qbs: Allow for building products
Change-Id: Id6fcdbdb0c776458eb16c7fc6765046969c2658e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-10 15:41:26 +02:00